[winverbs] use correct .exe name

[mirror/winof/.git] / WinOF / BuildRelease.bat

diff --git a/WinOF/BuildRelease.bat b/WinOF/BuildRelease.bat
index 69f78b4..73cb5ff 100644 (file)
--- a/WinOF/BuildRelease.bat
+++ b/WinOF/BuildRelease.bat
@@ -74,10 +74,34 @@ if not "%WDM_INC_PATH%" == "" (
     exit /B 1\r
 )\r
 \r
+rem assumes %CD% == '<...>\gen1\trunk'\r
+set BSE=%CD%\r
+set WIX=%CD%\WinOF\WIX\r
+\r
+rem Use Wix V2 binaries.\r
+rem set WIX_BIN=wix-2.0.5325.0-binaries\r
+set WIX_BIN=wix-2.0.5805.0-binaries\r
+\r
+set RBIN_WLH=%WIX%\wlh\bin%\r
+set RBIN_WNET=%WIX%\wnet\bin%\r
+set RBIN_WXP=%WIX%\wxp\bin%\r
+\r
 rem remove build artifacts\r
 if "%1" == "clean" (\r
     echo Removing build artifacts and folders...\r
     call %CD%\etc\clean-build.bat\r
+    if exist %WIX%\wlh\bin (\r
+               echo Removing %WIX%\wlh\bin\r
+               rmdir /Q /S %WIX%\wlh\bin\r
+    )\r
+    if exist %WIX%\wnet\bin (\r
+               echo Removing %WIX%\wnet\bin\r
+               rmdir /Q /S %WIX%\wnet\bin\r
+    )\r
+    if exist %WIX%\wxp\bin (\r
+               echo Removing %WIX%\wxp\bin\r
+               rmdir /Q /S %WIX%\wxp\bin\r
+    )\r
     exit /B 0\r
 )\r
 \r
@@ -120,8 +144,10 @@ rem Platform SDK path - watchout for missing LoadPerf.h (installsp.c)
 set _PSDK=%SystemDrive%\progra~1\mi2578~1\r
 \r
 rem set this to be the current svn commit number; overrides svn in path\r
-rem processing.\r
-set USE_SVN=1748\r
+rem processing. Additionally if set to 'latest' code expects ..\..\..\latest.txt\r
+rem to contain the SVN number to use.\r
+rem set USE_SVN=1748\r
+set USE_SVN=latest\r
 \r
 rem setup value for OPENIB_REV assignment.\r
 if "%2" == "" (\r
@@ -134,7 +160,12 @@ if "%2" == "" (
     if "%USE_SVN%" == "" (\r
         set SVN=%CD:~22,4%\r
     ) else (\r
-        set SVN=%USE_SVN%\r
+       if "%USE_SVN%" == "latest" (\r
+rem                    set /P SVN=<F:\openIB-windows-svn\latest.txt\r
+                       set /P SVN=< ..\..\..\latest.txt\r
+               ) else (\r
+                       set SVN=%USE_SVN%\r
+               )\r
     )\r
     set LBL=_svn.!SVN!\r
 ) else (\r
@@ -142,18 +173,6 @@ if "%2" == "" (
     set LBL=%2\r
 )\r
 \r
-rem assumes %CD% == '<...>\gen1\trunk'\r
-set BSE=%CD%\r
-set WIX=%CD%\WinOF\WIX\r
-\r
-rem Use Wix V2 binaries.\r
-rem set WIX_BIN=wix-2.0.5325.0-binaries\r
-set WIX_BIN=wix-2.0.5805.0-binaries\r
-\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 "%WIX%\build-all-MSI.bat" (\r
     echo %0 - Missing .msi installer build script\r
     echo    %WIX%\build-all-MSI.bat\r
@@ -287,6 +306,18 @@ if "%1" == "compilenoforce" (
 if "%1" == "all" (\r
     echo Removing build artifacts and folders...\r
     call %CD%\etc\clean-build.bat\r
+    if exist %WIX%\wlh\bin (\r
+               echo Removing %WIX%\wlh\bin\r
+               rmdir /Q /S %WIX%\wlh\bin\r
+    )\r
+    if exist %WIX%\wnet\bin (\r
+               echo Removing %WIX%\wnet\bin\r
+               rmdir /Q /S %WIX%\wnet\bin\r
+    )\r
+    if exist %WIX%\wxp\bin (\r
+               echo Removing %WIX%\wxp\bin\r
+               rmdir /Q /S %WIX%\wxp\bin\r
+    )\r
 )\r
 \r
 rem ************ Setup Env for Building \r