From a753eb5b82abd24903cbc561c28f7c964dbb1ae4 Mon Sep 17 00:00:00 2001 From: stansmith Date: Wed, 25 Mar 2009 22:56:19 +0000 Subject: [PATCH] [WinOF] cleanup svn database - readd win7 without errors. git-svn-id: svn://openib.tc.cornell.edu/gen1@2061 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/WinOF/WIX/win7/build-MSI.bat | 69 + trunk/WinOF/WIX/win7/ia64/Makefile | 44 + trunk/WinOF/WIX/win7/ia64/wof.wxs | 1703 +++++++++++++++++++++++++ trunk/WinOF/WIX/win7/signDrivers.bat | 163 +++ trunk/WinOF/WIX/win7/x64/Makefile | 44 + trunk/WinOF/WIX/win7/x64/wof.wxs | 1767 ++++++++++++++++++++++++++ trunk/WinOF/WIX/win7/x86/Makefile | 40 + trunk/WinOF/WIX/win7/x86/wof.wxs | 1679 ++++++++++++++++++++++++ 8 files changed, 5509 insertions(+) create mode 100644 trunk/WinOF/WIX/win7/build-MSI.bat create mode 100644 trunk/WinOF/WIX/win7/ia64/Makefile create mode 100644 trunk/WinOF/WIX/win7/ia64/wof.wxs create mode 100644 trunk/WinOF/WIX/win7/signDrivers.bat create mode 100644 trunk/WinOF/WIX/win7/x64/Makefile create mode 100644 trunk/WinOF/WIX/win7/x64/wof.wxs create mode 100644 trunk/WinOF/WIX/win7/x86/Makefile create mode 100644 trunk/WinOF/WIX/win7/x86/wof.wxs diff --git a/trunk/WinOF/WIX/win7/build-MSI.bat b/trunk/WinOF/WIX/win7/build-MSI.bat new file mode 100644 index 00000000..90e4f033 --- /dev/null +++ b/trunk/WinOF/WIX/win7/build-MSI.bat @@ -0,0 +1,69 @@ +@echo off +setlocal +rem Build Windows 7 WIX installer (.msi) for all architectures +rem +rem usage: %0 {dest-path-for-msi-files} + +rem *** REQUIRES nmake, common invocation from Visual C or DDK command window + +set OS=win7 + +if "%1" == "" ( + set DST=%SystemRoot%\temp +) else ( + set DST=%1 +) +if NOT EXIST %DST% ( + echo %0: Installer output path %DST% not found? + exit /B +) +nmake /NOLOGO /? > %DST%\jnk.txt +if ERRORLEVEL 1 ( + echo %0 missing nmake.exe in PATH? + exit /B +) +del /Q /F %DST%\jnk.txt + +if NOT EXIST %CD%\bin\HCA\amd64 ( + echo %0 - %CD%\bin not populated correctly? see trunk\etc\makebin.bat + exit /B +) + +if EXIST ia64\WOF_%OS%_ia64.msi del /Q /F ia64\WOF_%OS%_ia64.msi +if EXIST x64\WOF_%OS%_x64.msi del /Q /F x64\WOF_%OS%_x64.msi +if EXIST x86\WOF_%OS%_x86.msi del /Q /F x86\WOF_%OS%_x86.msi + +if EXIST %DST%\WOF_%OS%_ia64.msi del /Q /F %DST%\WOF_%OS%_ia64.msi +if EXIST %DST%\WOF_%OS%_x64.msi del /Q /F %DST%\WOF_%OS%_x64.msi +if EXIST %DST%\WOF_%OS%_x86.msi del /Q /F %DST%\WOF_%OS%_x86.msi + +pushd ia64 +nmake /NOLOGO full +if ERRORLEVEL 1 exit /B +echo move /Y WOF_%OS%_ia64.msi %DST% +move /Y WOF_%OS%_ia64.msi %DST% +popd + +pushd x64 +nmake /NOLOGO full +if ERRORLEVEL 1 exit /B +echo move /Y WOF_%OS%_x64.msi %DST% +move /Y WOF_%OS%_x64.msi %DST% +popd + +pushd x86 +nmake /NOLOGO full +if ERRORLEVEL 1 exit /B +echo move /Y WOF_%OS%_x86.msi %DST% +move /Y WOF_%OS%_x86.msi %DST% +popd + +rem if run from top-level %1 will not be null, otherwise assume run from +rem cmd line. +if "%1" == "" dir %DST%\*.msi + +echo ---- +echo Done - %OS% WIX installers in %DST% +echo ---- + +endlocal diff --git a/trunk/WinOF/WIX/win7/ia64/Makefile b/trunk/WinOF/WIX/win7/ia64/Makefile new file mode 100644 index 00000000..77e75f2b --- /dev/null +++ b/trunk/WinOF/WIX/win7/ia64/Makefile @@ -0,0 +1,44 @@ +################### +# IA64/IPF Itanium makefile targets +# +S=WOF +P=$(S)_win7_ia64 + +#WIX 2.0 +# L=..\..\WIX_tools\wix-2.0.5325.0-binaries +L=..\..\WIX_tools\wix-2.0.5805.0-binaries + +# WIX 3.0 L=..\WIX_tools\wix-3.0.2925.0-binaries + +WIX_UI="$(L)\wixui.wixlib" -loc "$(L)\WixUI_en-us.wxl" + +full: clean $(P).msi + +clean: + @del /q $(P).msi 2>nul + @del /q $(S).wixobj 2>nul + @del /q license.rtf 2>nul + +MySetup: $(P).msi + +license.rtf: ..\..\license.rtf + @copy ..\..\license.rtf .\license.rtf + +$(S).wixobj: $(S).wxs + +$(P).msi: $(S).wixobj license.rtf + @echo -- + @echo Building $(P).msi + $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(WIX_UI) + @del /q $(S).wixobj 2>nul + @del /q license.rtf 2>nul + + +################### +# makefile inference rules +# +.SUFFIXES: .wxs .wixobj + +.wxs.wixobj:: + @$(L)\candle.exe /nologo -trace -v $< + diff --git a/trunk/WinOF/WIX/win7/ia64/wof.wxs b/trunk/WinOF/WIX/win7/ia64/wof.wxs new file mode 100644 index 00000000..619fadf2 --- /dev/null +++ b/trunk/WinOF/WIX/win7/ia64/wof.wxs @@ -0,0 +1,1703 @@ + + + + + + + + + Privileged + + + + + + + + + + + + + + + + Value="1" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + REG_EXISTS + + + + SC_EXISTS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OpenFabrics Windows InfiniBand + Openfabrics Alliance [www.openfabrics.org] + https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows + https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ + http://www.openfabrics.org/downloads/WinOF/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPOIB_EXISTS + + + + + + + + + + + IPOIB_EXISTS + + + DAT_CONF_EXISTS AND Not Installed + + + + + + + + + DAT1_INSTALLED + + + + + + + + + + + DAT2_INSTALLED + + + + + + + + + + + + + + + + + + + + + + + + + + + + + File where Custom Actions are defined --> + + + + + + + + + + + + + + + + + + + + + + Always executed (Install or uninstall + + + Install ONLY + + NOT Installed + + + REBOOT="FORCE" + + + Not Installed AND Not NODRV + + + Not Installed AND Not NODRV + + + ($cNetworkDirect = 3) AND Not Installed AND Not NODRV + + + Not Installed + + CHANGE ONLY + + Installed + + REMOVE ONLY + + REMOVE="ALL" + REMOVE="ALL" + + + + + + + + + diff --git a/trunk/WinOF/WIX/win7/signDrivers.bat b/trunk/WinOF/WIX/win7/signDrivers.bat new file mode 100644 index 00000000..bdd57de4 --- /dev/null +++ b/trunk/WinOF/WIX/win7/signDrivers.bat @@ -0,0 +1,163 @@ +@echo off +setlocal + +rem Sign device drivers for architectures specified + +rem usage: +rem signDrivers CrossCertFilename CertStoreName path-2-drivers {noTimeStamp} +rem CrossCertFilename - fully qualified path\filename of cross cert. +rem CertStoreName - name of certificate in 'MY' Cert store (certmgr). + +rem example: signDrivers %CD%\cse1CCFilename My bin\hca + +rem cmd.exe /V:on (delayed environment variable expansion) is required! +set F=on +set F=off +if not "!F!" == "off" ( + echo Err: cmd.exe /V:on [delayed environment variable expansion] Required! + exit /B 1 +) + +set OE=Win7 +set DU=/du http://www.openfabrics.org + +set Usage='usage: signDrivers CrossCertFilename CertStoreName path-2-drivers {noTimeStamp}' + +if "%1" == "" ( + echo %0 - missing CertFileName? + echo %0 - %Usage% + exit /B 1 +) + +if not EXIST %1 ( + echo %0 - Cert file missing? + echo %0 - %Usage% + exit /B 1 +) + +rem %2 is already quoted. +if %2 == "" ( + echo %0 - missing Cert Subject Name? + echo %0 - %Usage% + exit /B 1 +) + +if "%3" == "" ( + echo %0 - missing path-2-driver files? + echo %0 - %Usage% + exit /B 1 +) + +rem Timestamp the signed file unless instructed not to. +if "%4" == "" ( + set TS=/t http://timestamp.verisign.com/scripts/timstamp.dll +) else ( + set TS= +) + +rem make sure signtool is accessible in our path +path > jnk.txt +findstr /c:"SelfSign" jnk.txt > jnk1.txt +if %errorlevel% EQU 1 ( + path "%PATH%;C:\WinDDK\6001.18001\bin\SelfSign" +) +if exist jnk1.txt del /Q /F jnk1.txt +if exist jnk.txt del /Q /F jnk.txt + +rem move to drivers folder +cd %3 +if ERRORLEVEL 1 ( + echo %0 - missing relative path %3 + exit /B 1 +) +echo cwd %CD% + +rem sign drivers for all architectures found + +for %%d in (amd64 x86 ia64) do ( + + if not exist %%d ( + echo %0 - skipping arch folder %%d + ) else ( + pushd %%d + echo %0 - Delete existing %%d .cat files + for %%f in ( *.cat ) do ( + if exist %%f del /F /Q %%f + ) + +rem temp hack until inf2cat support /OS WIN7_xxx + if "%%d" == "amd64" set OEA=Server2008_X64 + if "%%d" == "x86" set OEA=Server2008_X86 + if "%%d" == "ia64" set OEA=Server2008_IA64 + +rem if "%%d" == "amd64" set OEA=%OE%_X64,Vista_X64 +rem if "%%d" == "x86" set OEA=%OE%_X86,Vista_X86 +rem if "%%d" == "ia64" set OEA=%OE%_IA64 + + echo %0 - Generating %%d .cat files for !OEA! + inf2cat /driver:%CD%\%%d /os:!OEA! + if ERRORLEVEL 1 ( + echo %CD% inf2cat failed + exit /B 1 + ) + echo %0 - Signing %%d .cat files + for %%f in ( *.cat ) do ( + echo %0 - Signing %%d\%%f + signtool sign /ac %1 /n %2 %TS% %DU% %%f + if ERRORLEVEL 1 ( + echo %0 signtool sign %%f failed? + echo %0 file %CD%\%%f + exit /B 1 + ) + signtool verify /kp %%f + if ERRORLEVEL 1 ( + echo %0 signtool verify %%f failed? + echo %0 file %CD%\%%f + exit /B 1 + ) + echo + + ) + + echo %0 - Signing %%d .sys files + for %%f in ( *.sys ) do ( + echo %0 - Signing %%d\%%f + signtool sign /ac %1 /n %2 %TS% %DU% %%f + if ERRORLEVEL 1 ( + echo %0 signtool sign %%f failed? + echo %0 file %CD%\%%f + exit /B 1 + ) + signtool verify /kp %%f + if ERRORLEVEL 1 ( + echo %0 signtool verify %%f failed? + echo %0 file %CD%\%%f + exit /B 1 + ) + echo + + ) + + echo %0 - Verify %%d .cat + .sys files + for %%f in ( *.sys ) do ( + set D=%%f + set C=!D:sys=cat! + if exist !C! ( + echo %0 - Verify %%d\!C! %%d\%%f + signtool verify /q /kp /c !C! %%f + if ERRORLEVEL 1 ( + echo %0 signtool verify /kp /c !C! %%f failed? + exit /B 1 + ) + signtool verify /pa /c !C! %%f + if ERRORLEVEL 1 ( + echo %0 signtool verify /pa /c !C! %%f failed? + exit /B 1 + ) + echo + + ) + ) + popd + ) +) + +endlocal +echo %0 - Finished: %0 %1 %2 %OE% diff --git a/trunk/WinOF/WIX/win7/x64/Makefile b/trunk/WinOF/WIX/win7/x64/Makefile new file mode 100644 index 00000000..e0527ea9 --- /dev/null +++ b/trunk/WinOF/WIX/win7/x64/Makefile @@ -0,0 +1,44 @@ +################### +# makefile targets +# +S=WOF +P=$(S)_win7_x64 + +#WIX 2.0 +# L=..\..\WIX_tools\wix-2.0.5325.0-binaries +L=..\..\WIX_tools\wix-2.0.5805.0-binaries + +# WIX 3.0 L=..\WIX_tools\wix-3.0.2925.0-binaries + +WIX_UI="$(L)\wixui.wixlib" -loc "$(L)\WixUI_en-us.wxl" + +full: clean $(P).msi + +clean: + @del /q $(P).msi 2>nul + @del /q $(S).wixobj 2>nul + @del /q license.rtf 2>nul + +MySetup: $(P).msi + +license.rtf: ..\..\license.rtf + @copy ..\..\license.rtf .\license.rtf + +$(S).wixobj: $(S).wxs + +$(P).msi: $(S).wixobj license.rtf + @echo -- + @echo Building $(P).msi + $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(WIX_UI) + @del /q $(S).wixobj 2>nul + @del /q license.rtf 2>nul + + +################### +# makefile inference rules +# +.SUFFIXES: .wxs .wixobj + +.wxs.wixobj:: + @$(L)\candle.exe /nologo -trace -v $< + diff --git a/trunk/WinOF/WIX/win7/x64/wof.wxs b/trunk/WinOF/WIX/win7/x64/wof.wxs new file mode 100644 index 00000000..84d4b0a3 --- /dev/null +++ b/trunk/WinOF/WIX/win7/x64/wof.wxs @@ -0,0 +1,1767 @@ + + + + + + + + + Privileged + + + + + + + + + + + + + + + + Value="1" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + REG_EXISTS + + + + SC_EXISTS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OpenFabrics Windows InfiniBand + Openfabrics Alliance [www.openfabrics.org] + https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows + https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ + http://www.openfabrics.org/downloads/WinOF/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPOIB_EXISTS + + + + + + IPOIB_EXISTS + + + + + + + + IPOIB_EXISTS + + + Not Installed AND DAT_CONF_EXISTS + + + + + + + + + DAT1_INSTALLED + + + + + + + + + + + DAT2_INSTALLED + + + + + + + + + + + + + + + + + + + + + + + + + + + + + File where Custom Actions are defined --> + + + + + + + + + + + + + + + + + + + + + + Always executed (Install or uninstall + + + Install ONLY + + NOT Installed + + + REBOOT="FORCE" + + + Not Installed AND Not NODRV + + + Not Installed AND Not NODRV + + + ($cNetworkDirect = 3) AND Not Installed AND Not NODRV + + + Not Installed + + CHANGE ONLY + + Installed + + REMOVE ONLY + + REMOVE="ALL" + REMOVE="ALL" + + + + + + + + + diff --git a/trunk/WinOF/WIX/win7/x86/Makefile b/trunk/WinOF/WIX/win7/x86/Makefile new file mode 100644 index 00000000..db2cf5c5 --- /dev/null +++ b/trunk/WinOF/WIX/win7/x86/Makefile @@ -0,0 +1,40 @@ +################### +# makefile targets +# +S=WOF +P=$(S)_win7_x86 +# L=..\..\WIX_tools\wix-2.0.5325.0-binaries +L=..\..\WIX_tools\wix-2.0.5805.0-binaries + +WIX_UI="$(L)\wixui.wixlib" -loc "$(L)\WixUI_en-us.wxl" + +full: clean $(P).msi + +clean: + @del /q $(S).wixobj 2>nul + @del /q $(P).msi 2>nul + @del /q license.rtf 2>nul + +MySetup: $(P).msi + +license.rtf: ..\..\license.rtf + @copy ..\..\license.rtf .\license.rtf + +$(S).wixobj: $(S).wxs + +$(P).msi: $(S).wixobj license.rtf + @echo -- + @echo Building $(P).msi + $(L)\light.exe /nologo -out $(P).msi $(S).wixobj $(WIX_UI) + @del /q $(S).wixobj 2>nul + @del /q license.rtf 2>nul + + +################### +# makefile inference rules +# +.SUFFIXES: .wxs .wixobj + +.wxs.wixobj:: + @$(L)\candle.exe /nologo -trace -v $< + diff --git a/trunk/WinOF/WIX/win7/x86/wof.wxs b/trunk/WinOF/WIX/win7/x86/wof.wxs new file mode 100644 index 00000000..091ade78 --- /dev/null +++ b/trunk/WinOF/WIX/win7/x86/wof.wxs @@ -0,0 +1,1679 @@ + + + + + + + + + + Privileged + + + + + + + + + + Value="1" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + REG_EXISTS + + + SC_EXISTS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OpenFabrics Windows InfiniBand + Openfabrics Alliance [www.openfabrics.org] + https://wiki.openfabrics.org/tiki-index.php?page=OpenIB%20Windows + https://wiki.openfabrics.org/tiki-index.php?page=Windows+FAQ + http://www.openfabrics.org/downloads/WinOF/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPOIB_EXISTS + + + DAT_CONF_EXISTS AND Not Installed + + + + + + + + + DAT1_INSTALLED + + + + + + + + + + + DAT2_INSTALLED + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + File where Custom Actions are defined --> + + + + + + + + + + + + + + + + + + + + + + + + + Install ONLY + + NOT Installed + + + REBOOT="FORCE" + + + Not Installed AND Not NODRV + + + Not Installed AND Not NODRV + + + ($cNetworkDirect = 3) AND Not Installed AND Not NODRV + + + Not Installed + + CHANGE ONLY + + Installed + + REMOVE ONLY + + REMOVE="ALL" + REMOVE="ALL" + + + + + + + + + + -- 2.41.0