From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Thu, 25 Sep 2008 15:57:42 +0000 (+0000)
Subject: [WinOF] redo on RC2 due to missing commits.
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=66d7fdccdb6da8692e7042482c4076d244f7a511;p=~shefty%2Frdma-win.git

[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 27131585..7e9c5aae 100644
--- 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"
 
 	sDRIVERS = Session.Property("WindowsFolder") & "system32\drivers\"
-   	FileMDelete sDRIVERS,"vnic.sys"
-   	FileMDelete sDRIVERS,"qlgcvnic.sys"
+   	FileDelete sDRIVERS & "vnic.sys"
+   	FileDelete sDRIVERS & "qlgcvnic.sys"
 
 End Sub
 
@@ -1157,7 +1157,7 @@ Sub Uninstall_SRP(WshShell,devices,sInstalldir)
 	remove_INF_file WshShell,devman,"ibsrp.sys"
 
 	sDRIVERS = Session.Property("WindowsFolder") & "system32\drivers\"
-   	FileMDelete sDRIVERS,"ibsrp.sys"
+   	FileDelete sDRIVERS & "ibsrp.sys"
 
 End Sub
 
diff --git a/branches/WOF2-0/branches/WinOF/WIX/README_release.txt b/branches/WOF2-0/branches/WinOF/WIX/README_release.txt
index 2639a24d..cd6dbfb0 100644
--- 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
 
    Windows Server 2008 and Vista are now supported:
-      Digitally signed Installer file (.msi) and device drivers.
+      Digitally signed Installer file (.msi).
 
-   Microsoft Network Direct (ND) supported for Windows Server 2008/HPC.
+   Microsoft Network Direct (ND) supported for Windows Server 2008 & Vista
 
    WDK (Windows Driver Kit) build environment used to construct WinOF 2.0
 
diff --git a/branches/WOF2-0/trunk/BuildRelease.bat b/branches/WOF2-0/trunk/BuildRelease.bat
index b072ea1c..a429770c 100644
--- 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.
 rem setup value for OPENIB_REV assignment.
 
-set SVN=1616
+set SVN=1620
 
 rem assumes %CD% == '...\gen1\trunk'
 set BSE=%CD%