From 2f34cbedae5092e0c84558b70eb2fa989e7c98b9 Mon Sep 17 00:00:00 2001
From: Immo Landwerth <immo@landwerth.net>
Date: Sat, 22 Dec 2012 19:23:35 -0800
Subject: [PATCH] Remove environment variable workaround

The new version of SHFB supports passing SHFBCOMPONENTROOT via an
MSBuild property.
---
 Build/Build.bat  |  4 ----
 Build/Build.proj | 12 ++++++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Build/Build.bat b/Build/Build.bat
index d46b52f..77ac793 100644
--- a/Build/Build.bat
+++ b/Build/Build.bat
@@ -1,9 +1,5 @@
 @echo off
 
-:: Workaround: MSBuild apparently snapshots the variables. Setting the environment
-::             variable from within the build process doesn't work.
-set SHFBCOMPONENTROOT=%~dp0..\Output\Bin
-
 "%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" %~dp0\Build.proj /t:Build
 
 PAUSE
\ No newline at end of file
diff --git a/Build/Build.proj b/Build/Build.proj
index a7bd2dc..ea1beab 100644
--- a/Build/Build.proj
+++ b/Build/Build.proj
@@ -121,7 +121,8 @@
     <MSBuild Projects="$(HelpDir)Help.shfbproj"
              Properties="OutputPath=$(GeneratedHelp);
                          HelpFileVersion=$(XsdDocVersion);
-                         CopyrightText=[v{%40HelpFileVersion}] $(XsdDocCopyright); />
+                         CopyrightText=[v{%40HelpFileVersion}] $(XsdDocCopyright);
+                         SHFBCOMPONENTROOT=$(GeneratedBinaries)" />
   </Target>
 
   <!-- Generate Setup -->
@@ -176,13 +177,16 @@
 
     <MSBuild Projects="@(SampleProjectCloneDetective)"
              Properties="OutputPath=$(GeneratedSamples)CloneDetective;
-                         HelpFileVersion=$(XsdDocVersion);" />
+                         HelpFileVersion=$(XsdDocVersion);
+                         SHFBCOMPONENTROOT=$(GeneratedBinaries)" />
     <MSBuild Projects="@(SampleProjectWiX)"
              Properties="OutputPath=$(GeneratedSamples)WiX;
-                         HelpFileVersion=$(XsdDocVersion);" />
+                         HelpFileVersion=$(XsdDocVersion);
+                         SHFBCOMPONENTROOT=$(GeneratedBinaries)" />
     <MSBuild Projects="@(SampleProjectXml)"
              Properties="OutputPath=$(GeneratedSamples)Xml;
-                         HelpFileVersion=$(XsdDocVersion);" />
+                         HelpFileVersion=$(XsdDocVersion);
+                         SHFBCOMPONENTROOT=$(GeneratedBinaries)" />
 
     <!-- Delete all non CHM files -->