[WinOF] allow more flexibility in label for .msi files; cmd-line overrides internal...

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

diff --git a/branches/WOF2-0/trunk/BuildRelease.bat b/branches/WOF2-0/trunk/BuildRelease.bat
index be1a0845d503441cbbae8c8ad08e3ac5381d853f..b072ea1c73171987fca6a53fc4c536ea9efc626b 100644 (file)
--- a/branches/WOF2-0/trunk/BuildRelease.bat
+++ b/branches/WOF2-0/trunk/BuildRelease.bat
@@ -122,8 +122,7 @@ set _PSDK=%SystemDrive%\progra~1\mi2578~1
 rem Special override case for WinOF 2.0 release.\r
 rem setup value for OPENIB_REV assignment.\r
 \r
-set SVN=1554\r
-set LBL=_R2.0\r
+set SVN=1616\r
 \r
 rem assumes %CD% == '...\gen1\trunk'\r
 set BSE=%CD%\r
@@ -145,6 +144,13 @@ rem WIX Installer files (.msi) destination folder - set for local environment.
 rem \r
 set IDIR=%SystemRoot%\temp\r
 \r
+rem append additional text to default label if specified.\r
+if "%2" == "" (\r
+  set LBL=_R2.0\r
+) else (\r
+  set LBL=_R2.0_%2\r
+)\r
+\r
 if "%1" == "msi-label" (\r
     pushd %IDIR%\r
     if exist WOF_wxp_x86.msi (\r