Adjust lib/include for memcache files

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

diff --git a/msi/WiX/MergeModules/compile.bat b/msi/WiX/MergeModules/compile.bat
index 451ba8d..2e891d7 100644 (file)
--- a/msi/WiX/MergeModules/compile.bat
+++ b/msi/WiX/MergeModules/compile.bat
@@ -1,5 +1,6 @@
-goto current
-:current
+PATH=%PATH%;"C:\Program Files (x86)\Windows Installer XML v3.5\bin"
+
+rem goto current
 
  wixcop -indent:2 Curl-x86.wxs
  candle Curl-x86.wxs
@@ -28,7 +29,7 @@ wixcop -indent:2 Log4Shib-x64.wxs
  light  Log4Shib-x64.wixobj
  smoke  Log4Shib-x64.msm
 
-
+:current
 wixcop -indent:2 OpenSAML-x86.wxs
  candle OpenSAML-x86.wxs
  light  OpenSAML-x86.wixobj 
@@ -43,15 +44,16 @@ wixcop -indent:2 OpenSAML-x64.wxs
  candle OpenSAML-x64.wxs
  light  OpenSAML-x64.wixobj 
  smoke  OpenSAML-x64.msm
-goto continue
+rem goto done
+
 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,24 +90,6 @@ rem smoke  OpenSSL-x64.msm
  light  XmlSec-x64.wixobj
  smoke  XmlSec-x64.msm
 
-:continue
- 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
@@ -113,6 +102,4 @@ rem smoke  OpenSSL-x64.msm
 
 goto done
 :done
-candle tes.wxs
-light tes.wixobj
-smoke tes.msi
+