[WinOF] WDK build env; good to go.

git-svn-id: svn://openib.tc.cornell.edu/gen1@1231 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/BuildRelease.bat b/trunk/BuildRelease.bat
index 8630576feeee565c9d101cd608ef92274c091c1b..2aa1d686e2d353362ce049a644e85dfd2daba165 100644 (file)
--- a/trunk/BuildRelease.bat
+++ b/trunk/BuildRelease.bat
@@ -48,9 +48,9 @@ rem assumes %CD% == '...\gen1\trunk'
 set BSE=%CD%\r
 set WIX=%CD:trunk=Branches\WinOF\WIX%\r
 \r
-set RBIN_WLH=%CD:trunk=Branches\WinOF\Wix\wlh\bin%\r
-set RBIN_WNET=%CD:trunk=Branches\WinOF\Wix\wnet\bin%\r
-set RBIN_WXP=%CD:trunk=Branches\WinOF\Wix\wxp\bin%\r
+set RBIN_WLH=%WIX%\wlh\bin%\r
+set RBIN_WNET=%WIX%\wnet\bin%\r
+set RBIN_WXP=%WIX%\wxp\bin%\r
 \r
 if NOT EXIST "..\branches\WinOF\WIX\build-all-MSI.bat" (\r
     echo Missing .msi installer build script\r
@@ -77,8 +77,8 @@ rem http://sourceforge.net/project/showfiles.php?group_id=105970&package_id=1141
 rem   select wix-2.0.5325.0-binaries.zip download and unzip to\r
 rem   ..\branches\WinOF\WIX\WIX_tools\\r
 rem\r
-if NOT EXIST ..\branches\WinOF\WIX\WIX_tools\wix-2.0.5325.0-binaries (\r
-    echo Missing WIX tools @ ..\branches\WinOF\WIX\WIX_tools \r
+if NOT EXIST %WIX%\WIX_tools\wix-2.0.5325.0-binaries (\r
+    echo Missing WIX tools @ %WIX%\WIX_tools \r
     exit /B 1\r
 )\r
 \r
@@ -179,14 +179,14 @@ if EXIST "%BSE%\etc\makebin.bat" (
     call %BSE%\etc\makebin.bat %BSE% %RBIN_WXP% wxp\r
 )\r
 \r
-echo %0 - Binary release built in\r
+echo %0 - Binary releases built in\r
 echo     %RBIN_WLH%\r
 echo     %RBIN_WNET%\r
 echo     %RBIN_WXP%\r
 \r
 rem build WIX installers --> see ..\branches\WinOF\WIX\r
 \r
-%COMSPEC% /C "%_DDK%\bin\setenv.bat %_DDK% fre X64 WNET & cd /D %WIX% & build-ALL-MSI %IDIR%" \r
+%COMSPEC% /C "%_DDK%\bin\setenv.bat %_DDK% fre X64 WNET & cd /D %WIX% & build-all-MSI %IDIR%" \r
 \r
 endlocal\r
 @echo on\r