From: Stan Smith <stan.smith@intel.com>
Date: Fri, 10 Sep 2010 20:39:32 +0000 (+0000)
Subject: [WIX] target_path cmd-line arg was not correctly processed; make it so.
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9d3c7249fd205b7205ec5e8897def6e650ee55c4;p=~shefty%2Frdma-win.git

[WIX] target_path cmd-line arg was not correctly processed; make it so.

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

diff --git a/trunk/OFED/WIX/build-OFA-dist.bat b/trunk/OFED/WIX/build-OFA-dist.bat
index 8f1f5457..8e44de1e 100644
--- a/trunk/OFED/WIX/build-OFA-dist.bat
+++ b/trunk/OFED/WIX/build-OFA-dist.bat
@@ -35,7 +35,7 @@ if not "!F!" == "off" (
 
 if "%1" == "" (
   echo "Missing release ID, example %0 1-1"
-  echo "usage: %0 release_ID {target_path, default: %SystemRoot%\temp}
+  echo "usage: %0 release_ID {Full_target_path, default: %windir%\temp}
   exit /B 1
 )
 
@@ -45,7 +45,24 @@ rem Final zip archive name
 set ZIP=OFED_dist_v%ID%.zip
 
 rem where gen1\trunk\buildRelease.bat created the .msi installer files.
+rem or where specified. goto's resultant of MSI not correctly set inside
+rem of if clause?
+
+if Not "%2" == ""  goto non_std_msi
+
 set MSI=%SystemRoot%\temp
+goto msk_ok
+
+:non_std_msi
+set MSI=%2
+
+:msi_ok:
+
+if NOT EXIST "%MSI%" (
+    echo Folder %MSI% does not exist?
+    exit /B 1
+)
+
 set MSI_DST=%MSI%\v%ID%
 
 rem start fresh