Cleanups and adjustments

[shibboleth/sp.git] / msi / WiX / MergeModules / compile.bat

diff --git a/msi/WiX/MergeModules/compile.bat b/msi/WiX/MergeModules/compile.bat
index b83cf66..368a1fd 100644 (file)
--- a/msi/WiX/MergeModules/compile.bat
+++ b/msi/WiX/MergeModules/compile.bat
@@ -1,3 +1,5 @@
+PATH=%PATH%;"C:\Program Files (x86)\Windows Installer XML v3.5\bin"
+
 goto current
 :current
  wixcop -indent:2 Curl-x86.wxs
@@ -45,13 +47,13 @@ wixcop -indent:2 OpenSAML-x64.wxs
 
 
 wixcop -indent:2 OpenSSL-x86.wxs
-candle OpenSSL-x86.wxs
-light  OpenSSL-x86.wixobj
-rem smoke  OpenSSL-x86.msm
+ candle OpenSSL-x86.wxs
+ light  OpenSSL-x86.wixobj
+ smoke  OpenSSL-x86.msm
 wixcop -indent:2 OpenSSL-x64.wxs
-candle OpenSSL-x64.wxs
-light  OpenSSL-x64.wixobj
-rem smoke  OpenSSL-x64.msm
+ candle OpenSSL-x64.wxs
+ light  OpenSSL-x64.wixobj
+ smoke  OpenSSL-x64.msm
 
  wixcop -indent:2 Shibboleth-x86.wxs
  candle Shibboleth-x86.wxs
@@ -63,6 +65,11 @@ rem smoke  OpenSSL-x64.msm
  light  Shibboleth-x64.wixobj
  smoke  Shibboleth-x64.msm
 
+ wixcop -indent:2 Shibboleth-schemas.wxs
+ candle Shibboleth-schemas.wxs
+ light  Shibboleth-schemas.wixobj
+ smoke  Shibboleth-schemas.msm
+
  wixcop -indent:2  Xerces-x86.wxs
  candle Xerces-x86.wxs
  light  Xerces-x86.wixobj
@@ -83,23 +90,6 @@ rem smoke  OpenSSL-x64.msm
  light  XmlSec-x64.wixobj
  smoke  XmlSec-x64.msm
 
- wixcop -indent:2  XmlTooling-x86.wxs
- candle XmlTooling-x86.wxs
- wixcop -indent:2  XmlTooling-schemas.wxs
- candle XmlTooling-schemas.wxs
- light  XmlTooling-x86.wixobj 
- smoke  XmlTooling-x86.msm
-
- wixcop -indent:2  XmlTooling-schemas.wxs
- candle XmlTooling-schemas.wxs
- light  XmlTooling-schemas.wixobj
- smoke  XmlTooling-schemas.msm
-
- wixcop -indent:2  XmlTooling-x64.wxs
- candle XmlTooling-x64.wxs
- light  XmlTooling-x64.wixobj
- smoke  XmlTooling-x64.msm
-
  wixcop -indent:2  Zlib-x86.wxs
  candle Zlib-x86.wxs
  light  Zlib-x86.wixobj