[WINOF] Change makebin.bat to expect a full pathname for the DDK root instead of...

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

diff --git a/etc/makebin.bat b/etc/makebin.bat
index 846a7a6..241a27f 100644 (file)
--- a/etc/makebin.bat
+++ b/etc/makebin.bat
@@ -2,13 +2,13 @@
 setlocal\r
 \r
 rem usage:\r
-rem   makebin src dst [win7 | wlh | wnet | wxp] DDK_version WdfCoInstaler_Ver\r
+rem   makebin src dst [win7 | wlh | wnet | wxp] DDK_ROOT WdfCoInstaler_Ver\r
 rem\r
 rem  src(%1) - OpenIB src path ...\gen1\trunk\r
 rem  dst(%2) - full path tp where binaries are copied, 'bin\' created here.\r
 rem  OSE(%3) - (Operating System Environment) which windows version\r
 rem            {win7,wxp,wlh,wnet} representing {XP, server 2008 & server 2003}\r
-rem  DDK_Version  - {blank == 6001.1801} assumes \WinDDK\%4\redist\wdf\r
+rem  DDK_ROOT  - {blank == assumes %SystemDrive%\WinDDK\6001.1801}\r
 rem  WdfCoInstall_ver - 5 digit WdfCoInstallerVersion # (blank == 01007} \r
 \r
 rem makebin is designed to take an openIB build tree path and produce a folder\r
@@ -41,12 +41,18 @@ set DBG=TRUE
 \r
 set OSE=%3\r
 \r
+rem setup DDK root path\r
 if /I "%4"=="" (\r
-       set _DDK=6001.18001\r
+       set _DDK=%systemdrive%\WinDDK\6001.18001\r
 ) else (\r
        set _DDK=%4\r
 )\r
-set WdfCoInstaller=%systemdrive%\WinDDK\%_DDK%\redist\wdf\r
+if not exist "%_DDK%" (\r
+       echo Missing file %_DDK% ?\r
+       exit /B 1\r
+)\r
+\r
+set WdfCoInstaller=%_DDK%\redist\wdf\r
 \r
 if /I "%5"=="" (\r
        set CoInstallVer=01007\r
@@ -111,6 +117,7 @@ for %%i in ( %CORE_DRV_FRE% ) do (
         exit /B 1\r
     )\r
 )\r
+\r
 xcopy %WdfCoInstaller%\amd64\WdfCoInstaller%CoInstallVer%.dll %dest_dir% /yq \r
 \r
 xcopy %bin_dir%\ipoib.sys %2\net\amd64\ /yq\r