[WinOF]

  buildrelease.bat - added WIX .msi creation only option; assumes drivers are signed
  etc\makebin.bat - don't copy Mx tools which have been removed from the build/svn
  etc\clean-build.bat - delete build generated files to ensure a clean build.

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

diff --git a/BuildRelease.bat b/BuildRelease.bat
index 42fba41..f15bf43 100644 (file)
--- a/BuildRelease.bat
+++ b/BuildRelease.bat
@@ -6,7 +6,7 @@ rem           Binary release is constructed in ..\Branches\WinOF\Wix\OS\bin.
 rem           Processor architecture specific WIX installers are constructed\r
 rem           in %IDIR%\r
 rem\r
-rem BuildRelease {all | compile | makebin | msi}\r
+rem BuildRelease {all | compile | makebin | msi | wix}\r
 rem\r
 rem where:\r
 rem    all - recompile, install binaries to WIX tree, sign drivers and\r
@@ -15,6 +15,7 @@ rem    compile - recompile/link
 rem    makebin - assumes binaries are built, install binaries to WIX tree.\r
 rem    msi - assumes binaries are install in WIX tree, sign drivers and\r
 rem          create installers (.msi file) in IDIR.\r
+rem    wix - build .msi installers, assumes (drivers signed) .cat files exist\r
 rem\r
 rem This script is an 'example' of a one-command entire IB stack build to\r
 rem single-file installer; used to build a WinOF release.\r
@@ -31,6 +32,7 @@ if "%1" == "all" goto OK
 if "%1" == "compile" goto OK\r
 if "%1" == "makebin" goto OK\r
 if "%1" == "msi" goto OK\r
+if "%1" == "wix" goto OK\r
 echo Unknown arg '%1' ?\r
 :usage\r
 echo "usage: BuildRelease { all | compile | makebin | msi }"\r
@@ -38,9 +40,12 @@ exit /B 1
 \r
 :OK\r
 \r
+rem set CERTNAME=noCert\r
+set CERTNAME=cse1CStore\r
+\r
 rem A Digital driver signing certificate store name may be required.\r
 if "%1" == "all" (\r
-    if "%CERTNAME%" == "" set /P CERTNAME=[Enter Certificate Store Name] \r
+    if "%CERTNAME%" == "noCert" set /P CERTNAME=[Enter Certificate Store Name] \r
     if "%CERTNAME%" == "" (\r
         echo %0\r
         echo %0: Err - driver signing certificate store name required.\r
@@ -48,8 +53,9 @@ if "%1" == "all" (
         exit /B 1\r
     )\r
 )\r
+\r
 if "%1" == "msi" (\r
-    if "%CERTNAME%" == "" set /P CERTNAME=[Enter Certificate Store Name] \r
+    if "%CERTNAME%" == "noCert" set /P CERTNAME=[Enter Certificate Store Name] \r
     if "%CERTNAME%" == "" (\r
         echo %0\r
         echo %0: Err - driver signing certificate store name required.\r
@@ -66,7 +72,7 @@ if NOT EXIST %_DDK% (
     echo Missing WDK @ %_DDK%\r
     exit /B 1\r
 )\r
-echo Building with DDK @ %_DDK%\r
+echo Building with WDK @ %_DDK%\r
 \r
 rem Platform SDK path - watchout for missing LoadPerf.h (installsp.c)\r
 set _PSDK=C:\progra~1\mi2578~1\r
@@ -126,15 +132,26 @@ if NOT EXIST etc\makebin.bat (
     echo Missing etc\makebin.bat, script must run from gen1\trunk\r
     exit /B 1\r
 )\r
+set STIME=%TIME%\r
 \r
 rem skip build - assumes binaries already built.\r
 \r
-if "%1" == "msi" goto InstallBin\r
+if "%1" == "wix" (\r
+    set CERTNAME=nosign\r
+    goto mk_msi\r
+)\r
+\r
+if "%1" == "msi" (\r
+    if not EXIST "%RBIN_WLH%"  goto InstallBin\r
+    if not EXIST "%RBIN_WNET%" goto InstallBin\r
+    if not EXIST "%RBIN_WXP%"  goto InstallBin\r
+    goto mk_msi\r
+)\r
 if "%1" == "makebin" goto InstallBin\r
 \r
-rem set OPS=-wgcM 3\r
-set OPS=-wg\r
+rem Compile everything\r
 \r
+set OPS=-wgcM 3\r
 \r
 rem ********* WLH - Windows Server 2008 & Vista\r
 \r
@@ -238,17 +255,20 @@ if "%1" == "makebin" (
     exit /B 0\r
 )\r
 \r
-echo %0 - Binary releases built in\r
+:mk_msi\r
+\r
+echo %0 - Drivers Signed with %CERTNAME% , 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 %CERTNAME% %IDIR%"\r
+%COMSPEC% /V:on /E:on /C "%_DDK%\bin\setenv.bat %_DDK% fre X64 WNET & cd /D %WIX% & build-all-MSI %CERTNAME% %IDIR%"\r
 \r
 echo .\r
 echo %0: Finished %0 %*\r
+echo %0: started %STIME% end %TIME%\r
 \r
 endlocal\r
 @echo on\r

diff --git a/etc/clean-build.bat b/etc/clean-build.bat
new file mode 100644 (file)
index 0000000..601be54
--- /dev/null
+++ b/etc/clean-build.bat
@@ -0,0 +1,29 @@
+@echo off\r
+setlocal\r
+\r
+rem delete OS flavor {wlh,wxp,wnet} specific build files to ensure a clean build\r
+\r
+for /f %%f in ( 'dir /b /s *_wxp_*' ) do (\r
+       del /F /S /Q %%f >jnk.log\r
+)\r
+for /f %%f in ( 'dir /b /s *_wxp_*' ) do (\r
+       rmdir /S /Q %%f >jnk.log\r
+)\r
+\r
+for /f %%f in ( 'dir /b /s *_wnet_*' ) do (\r
+       del /F /S /Q %%f >jnk.log\r
+)\r
+for /f %%f in ( 'dir /b /s *_wnet_*' ) do (\r
+       rmdir /S /Q %%f >jnk.log\r
+)\r
+\r
+for /f %%f in ( 'dir /b /s *_wlh_*' ) do (\r
+       del /F /S /Q %%f >jnk.log\r
+)\r
+\r
+for /f %%f in ( 'dir /b /s *_wlh_*' ) do (\r
+       rmdir /S /Q %%f >jnk.log\r
+)\r
+\r
+if exist jnk.log  del /Q jnk.log\r
+endlocal\r

diff --git a/etc/makebin.bat b/etc/makebin.bat
index 82524b9..14578f3 100644 (file)
--- a/etc/makebin.bat
+++ b/etc/makebin.bat
@@ -251,10 +251,6 @@ xcopy %bin_dir%\dat2.dll  %2\DAPL2\amd64\ /yq
 xcopy %bin_dir%\dat2.lib  %2\DAPL2\amd64\ /yq\r
 xcopy %bin_dir%\dat2.pdb  %2\DAPL2\amd64\ /yq\r
 \r
-xcopy %bin_dir%\mtcr.dll %2\FwTools\amd64\ /y\r
-xcopy %bin_dir%\flint.exe %2\FwTools\amd64\ /y\r
-xcopy %bin_dir%\mst.exe %2\FwTools\amd64\ /y\r
-\r
 rem Copy Free IA64 dlls\r
 \r
 set bin_dir=%1\bin\user\objfre_%OSE%_ia64\ia64\r
@@ -284,10 +280,6 @@ xcopy %bin_dir%\dat2.dll  %2\DAPL2\ia64\ /yq
 xcopy %bin_dir%\dat2.lib  %2\DAPL2\ia64\ /yq\r
 xcopy %bin_dir%\dat2.pdb  %2\DAPL2\ia64\ /yq\r
 \r
-xcopy %bin_dir%\mtcr.dll %2\FwTools\ia64\ /y\r
-xcopy %bin_dir%\flint.exe %2\FwTools\ia64\ /y\r
-xcopy %bin_dir%\mst.exe %2\FwTools\ia64\ /y\r
-\r
 rem Copy Free x86 drivers\r
 \r
 :wxp_free_drv\r
@@ -316,9 +308,6 @@ xcopy %bin_dir%\dat2.dll  %2\DAPL2\x86\ /yq
 xcopy %bin_dir%\dat2.lib  %2\DAPL2\x86\ /yq\r
 xcopy %bin_dir%\dat2.pdb  %2\DAPL2\x86\ /yq\r
 \r
-xcopy %bin_dir%\mtcr.dll %2\FwTools\x86\ /y\r
-xcopy %bin_dir%\flint.exe %2\FwTools\x86\ /y\r
-xcopy %bin_dir%\mst.exe %2\FwTools\x86\ /y\r
 \r
 if /I "%OSE%" == "wxp" goto inf_files\r
 \r