[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: Compile.bat MergeModules/compile.bat ShibbolethSP-main-x64.wxs Shibboleth...

[noreply at shibboleth.net]

Author: rdw
Date: Tue May 29 08:25:55 2012
New Revision: 3682

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3682&view=rev
Log:
Less guis to compile these days

Modified:
    branches/REL_2/msi/WiX/Compile.bat
    branches/REL_2/msi/WiX/MergeModules/compile.bat
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
    branches/REL_2/msi/WiX/Versions.wxi

Modified: branches/REL_2/msi/WiX/Compile.bat
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Compile.bat?rev=3682&r1=3681&r2=3682&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Compile.bat (original)
+++ branches/REL_2/msi/WiX/Compile.bat Tue May 29 08:25:55 2012
@@ -16,18 +16,12 @@
 wixcop -indent:2 ShibbolethSP-gui.wxs
 candle ShibbolethSP-gui.wxs
 
-wixcop -indent:2 ShibbolethSP-shibd-dialog.wxs
-candle ShibbolethSP-shibd-dialog.wxs
-
-wixcop -indent:2 ShibbolethSP-iis-dialog.wxs
-candle ShibbolethSP-iis-dialog.wxs
-
 wixcop -indent:2 ShibbolethSP-main-x64.wxs
 candle ShibbolethSP-main-x64.wxs
-light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-shibd-dialog.wixobj ShibbolethSP-iis-dialog.wixobj ShibbolethSP-gui.wixobj -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
+light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-gui.wixobj -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
 
 wixcop -indent:2 ShibbolethSP-main-x86.wxs
 candle ShibbolethSP-main-x86.wxs
-light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x86.msi ShibbolethSP-main-x86.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-shibd-dialog.wixobj ShibbolethSP-iis-dialog.wixobj ShibbolethSP-gui.wixobj -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension
+light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x86.msi ShibbolethSP-main-x86.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension
 
 

Modified: branches/REL_2/msi/WiX/MergeModules/compile.bat
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/compile.bat?rev=3682&r1=3681&r2=3682&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/compile.bat (original)
+++ branches/REL_2/msi/WiX/MergeModules/compile.bat Tue May 29 08:25:55 2012
@@ -1,7 +1,7 @@
 PATH=%PATH%;"C:\Program Files (x86)\Windows Installer XML v3.5\bin"
 
 goto current
-:current
+
  wixcop -indent:2 Curl-x86.wxs
  candle Curl-x86.wxs
  light  Curl-x86.wixobj
@@ -29,7 +29,7 @@
  light  Log4Shib-x64.wixobj
  smoke  Log4Shib-x64.msm
 
-
+:current
 wixcop -indent:2 OpenSAML-x86.wxs
  candle OpenSAML-x86.wxs
  light  OpenSAML-x86.wixobj 
@@ -44,7 +44,7 @@
  candle OpenSAML-x64.wxs
  light  OpenSAML-x64.wixobj 
  smoke  OpenSAML-x64.msm
-
+goto done
 
 wixcop -indent:2 OpenSSL-x86.wxs
  candle OpenSSL-x86.wxs

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs?rev=3682&r1=3681&r2=3682&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Tue May 29 08:25:55 2012
@@ -19,7 +19,7 @@
 <?include Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' Language='1033' 
+  <Product Id='{0F65D86B-3F47-41DC-9CEC-E20538849A6C}' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
     <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'
@@ -152,6 +152,7 @@
       <ComponentRef Id='mod_shib_2464.so'/>
       <ComponentRef Id='odbc_store64.so'/>
       <ComponentRef Id='plugins64.so'/>
+      <ComponentRef Id='plugins_lite64.so'/>
       <ComponentRef Id='shibauthorizer64.exe'/>
       <ComponentRef Id='shibresponder64.exe'/>
 
@@ -162,6 +163,7 @@
       <ComponentRef Id='mod_shib_2464.so_debug'/>
       <ComponentRef Id='odbc_store64.so_debug'/>
       <ComponentRef Id='plugins64.so_debug'/>
+      <ComponentRef Id='plugins_lite64.so_debug'/>
       <ComponentRef Id='shibauthorizer64.exe_debug'/>
       <ComponentRef Id='shibresponder64.exe_debug'/>
 

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs

[... 57 lines stripped ...]