[WinOF] redo on RC2 due to missing commits.

CustomActions.vbs - use FileDelete() as it's faster than FileMDelete() which exec() cmd.exe

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

diff --git a/branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs b/branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs
index 27131585e0c7fd5b4bdd27bda54a9c6631760dcb..7e9c5aae0d2ffb8b29260215390687efef7f9364 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs
+++ b/branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs
@@ -1112,8 +1112,8 @@ Sub Uninstall_VNIC(WshShell,devices,sInstalldir)
        remove_INF_file WshShell,devman,"qlgcvnic.sys"\r
 \r
        sDRIVERS = Session.Property("WindowsFolder") & "system32\drivers\"\r
-       FileMDelete sDRIVERS,"vnic.sys"\r
-       FileMDelete sDRIVERS,"qlgcvnic.sys"\r
+       FileDelete sDRIVERS & "vnic.sys"\r
+       FileDelete sDRIVERS & "qlgcvnic.sys"\r
 \r
 End Sub\r
 \r
@@ -1157,7 +1157,7 @@ Sub Uninstall_SRP(WshShell,devices,sInstalldir)
        remove_INF_file WshShell,devman,"ibsrp.sys"\r
 \r
        sDRIVERS = Session.Property("WindowsFolder") & "system32\drivers\"\r
-       FileMDelete sDRIVERS,"ibsrp.sys"\r
+       FileDelete sDRIVERS & "ibsrp.sys"\r
 \r
 End Sub\r
 \r

diff --git a/branches/WOF2-0/branches/WinOF/WIX/README_release.txt b/branches/WOF2-0/branches/WinOF/WIX/README_release.txt
index 2639a24d0cc61a595afb335ffa293b38a25299ce..cd6dbfb02f164d4eac11052d717274aa33bed79a 100644 (file)
--- a/branches/WOF2-0/branches/WinOF/WIX/README_release.txt
+++ b/branches/WOF2-0/branches/WinOF/WIX/README_release.txt
@@ -28,9 +28,9 @@ WinOF 2.0 Summary Changes
 3) New Functionality\r
 \r
    Windows Server 2008 and Vista are now supported:\r
-      Digitally signed Installer file (.msi) and device drivers.\r
+      Digitally signed Installer file (.msi).\r
 \r
-   Microsoft Network Direct (ND) supported for Windows Server 2008/HPC.\r
+   Microsoft Network Direct (ND) supported for Windows Server 2008 & Vista\r
 \r
    WDK (Windows Driver Kit) build environment used to construct WinOF 2.0\r
 \r

diff --git a/branches/WOF2-0/trunk/BuildRelease.bat b/branches/WOF2-0/trunk/BuildRelease.bat
index b072ea1c73171987fca6a53fc4c536ea9efc626b..a429770cb68ac2d1ac5b9ba4534032bb70221b3e 100644 (file)
--- a/branches/WOF2-0/trunk/BuildRelease.bat
+++ b/branches/WOF2-0/trunk/BuildRelease.bat
@@ -122,7 +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=1616\r
+set SVN=1620\r
 \r
 rem assumes %CD% == '...\gen1\trunk'\r
 set BSE=%CD%\r