[ofw] etc\makebin changes to support Windows 7

[Smith, Stan]

Signed off by stan.smith at intel.com

diff U3 C:/Documents and Settings/scsmith/Local Settings/Temp/makebin.bat-revBASE.svn001.tmp.bat C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/etc/makebin.bat
--- C:/Documents and Settings/scsmith/Local Settings/Temp/makebin.bat-revBASE.svn001.tmp.bat    Tue Mar 24 16:11:31 2009
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/etc/makebin.bat        Tue Mar 24 16:11:05 2009
@@ -1,12 +1,15 @@
 @echo off
 setlocal

-rem usage: makebin src dst [wlh | wnet | wxp]
+rem usage:
+rem   makebin src dst [win7 | wlh | wnet | wxp] DDK_version WdfCoInstaler_Ver
 rem
 rem  src(%1) - OpenIB src path ...\gen1\trunk
 rem  dst(%2) - full path tp where binaries are copied, 'bin\' created here.
 rem  OSE(%3) - (Operating System Environment) which windows version
-rem            {wxp,wlh,wnet} representing {XP, server 2008 & server 2003}
+rem            {win7,wxp,wlh,wnet} representing {XP, server 2008 & server 2003}
+rem  DDK_Version  - {blank == 6001.1801} assumes \WinDDK\%4\redist\wdf
+rem  WdfCoInstall_ver - 5 digit WdfCoInstallerVersion # (blank == 01007}

 rem makebin is designed to take an openIB build tree path and produce a folder
 rem tree of binaries suitable for input to a WIX builder which procduces
@@ -24,6 +27,7 @@
 if "%2"=="" goto usage

 if "%3"=="" goto usage
+if /I "%3"=="win7" goto os_ok
 if /I "%3"=="wlh" goto os_ok
 if /I "%3"=="wnet" goto os_ok
 if /I "%3"=="wxp" goto os_ok
@@ -36,7 +40,19 @@
 set DBG=TRUE

 set OSE=%3
-set WdfCoInstaller=%systemdrive%\WinDDK\6001.18001\redist\wdf
+
+if /I "%4"=="" (
+       set _DDK=6001.18001
+) else (
+       set _DDK=%4
+)
+set WdfCoInstaller=%systemdrive%\WinDDK\%_DDK%\redist\wdf
+
+if /I "%5"=="" (
+       set CoInstallVer=01007
+) else (
+       set CoInstallVer=%5
+)

 if not exist %1 goto usage
 if not exist %2 goto usage
@@ -77,7 +93,7 @@
         exit /B 1
     )
 )
-xcopy %WdfCoInstaller%\amd64\WdfCoInstaller01007.dll %dest_dir% /yq
+xcopy %WdfCoInstaller%\amd64\WdfCoInstaller%CoInstallVer%.dll %dest_dir% /yq

 xcopy %bin_dir%\ipoib.sys %2\net\amd64\ /yq
 xcopy %bin_dir%\qlgcvnic.sys %2\net\amd64\ /yq
@@ -105,7 +121,7 @@
         exit /B 1
     )
 )
-xcopy %WdfCoInstaller%\ia64\WdfCoInstaller01007.dll %dest_dir% /yq
+xcopy %WdfCoInstaller%\ia64\WdfCoInstaller%CoInstallVer%.dll %dest_dir% /yq

 xcopy %bin_dir%\ipoib.sys %2\net\ia64\ /yq
 xcopy %bin_dir%\qlgcvnic.sys %2\net\ia64\ /yq
@@ -136,7 +152,7 @@
         exit /B 1
     )
 )
-xcopy %WdfCoInstaller%\x86\WdfCoInstaller01007.dll %dest_dir% /yq
+xcopy %WdfCoInstaller%\x86\WdfCoInstaller%CoInstallVer%.dll %dest_dir% /yq

 xcopy %bin_dir%\ipoib.sys %2\net\x86\ /yq
 xcopy %bin_dir%\qlgcvnic.sys %2\net\x86\ /yq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: makebin.bat.patch
Type: application/octet-stream
Size: 2773 bytes
Desc: makebin.bat.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090324/52c9e893/attachment.obj>