[WinOF]

   buildrelease.bat - cleanup error message
   CustomActions.vbs - use msgbox() title
   WIX_tools\README.txt - cleanup tools download explaination.

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

diff --git a/WinOF/BuildRelease.bat b/WinOF/BuildRelease.bat
index 73cb5ff..f77b026 100644 (file)
--- a/WinOF/BuildRelease.bat
+++ b/WinOF/BuildRelease.bat
@@ -256,7 +256,8 @@ if exist %windir%\system32\timeout.exe (
 )\r
 \r
 if NOT EXIST "%IDIR%" (\r
-    echo %0 - Missing Installer file destination folder %IDIR%\r
+    echo %0 - Missing Installer file destination folder\r
+       echo %0     %IDIR%\r
     exit /B 1\r
 )\r
 \r

diff --git a/WinOF/WIX/CustomActions.vbs b/WinOF/WIX/CustomActions.vbs
index b010abd..f74fac7 100644 (file)
--- a/WinOF/WIX/CustomActions.vbs
+++ b/WinOF/WIX/CustomActions.vbs
@@ -722,8 +722,8 @@ Function devman_Install_SRP(WshShell,sInstalldir)
                                rc = WshShell.Run (devmanSRP & "update ib_srp.inf " & ID,0,true)\r
                                ' Display error number and description if applicable\r
                                If rc <> 0 Then\r
-                                       msgbox "Install_SRP Err(" & rc _\r
-                                                       & ") devman update ib_srp.inf " & ID\r
+                                       msgbox "Err(" & rc & ") devman update ib_srp.inf " & _\r
+                                                       ID,,"devman_Install_SRP"\r
                                ElseIf sDBG >= "1" Then\r
                                        msgbox "SRP install OK.",,"devman_Install_SRP"\r
                                End If\r

diff --git a/WinOF/WIX/WIX_tools/README.txt b/WinOF/WIX/WIX_tools/README.txt
index 5b1ca35..c50670a 100644 (file)
--- a/WinOF/WIX/WIX_tools/README.txt
+++ b/WinOF/WIX/WIX_tools/README.txt
@@ -1,10 +1,10 @@
 \r
-[1-13-09]\r
+[1-29-09]\r
 \r
 Creating the WIX tool set\r
 -------------------------\r
 \r
-Download the WIX v2 (stable) tool set to \91WIX_tools\\92.\r
+Download the WIX v2 (stable) tool set to \91WinOF\WIX\WIX_tools\\92.\r
 \r
 http://sourceforge.net/project/showfiles.php?group_id=105970&package_id=114109&release_id=574429\r
 \r
@@ -16,7 +16,7 @@ tool set.
 Something like unzip wix-2.0.5805.0-binaries.zip into wix-2.0.5805.0-binaries\.\r
 \r
 You should now have the following structure:\r
-       trunk\WinOF\WIX\WIX_tools\wix-2.0.5805.0-binaries\{candle.exe, light.exe,...}\r
+       trunk\WinOF\WIX\WIX_tools\wix-2.0.5805.0-binaries\{candle.exe,light.exe,...}\r
 \r
 The path to the WIX binaries is referenced in files:\r
     trunk\WinOF\buildrelease.bat\r