[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: Compile.bat ShibbolethSP-Gui.wxi ShibbolethSP-gui.wxs ShibbolethSP-iis-di...

[noreply at shibboleth.net]

Author: rdw
Date: Sun May 13 17:06:35 2012
New Revision: 3658

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3658&view=rev
Log:
Complete dialog as per current installer.  More tinkering required

Added:
    branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-iis-dialog.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-shibd-dialog.wxs
Removed:
    branches/REL_2/msi/WiX/ShibbolethSP-Gui.wxi
Modified:
    branches/REL_2/msi/WiX/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/ShibbolethSP-noarch.wxs

Modified: branches/REL_2/msi/WiX/Compile.bat
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Compile.bat?rev=3658&r1=3657&r2=3658&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Compile.bat (original)
+++ branches/REL_2/msi/WiX/Compile.bat Sun May 13 17:06:35 2012
@@ -13,12 +13,21 @@
 wixcop -indent:2 ShibbolethSP-registry-x86.wxs
 candle ShibbolethSP-registry-x86.wxs
 
+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 -ext WixUtilExtension.dll -ext WixUIExtension
+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
 
 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 -ext WixUtilExtension.dll -ext WixUIExtension
+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
 
 

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=3658&r1=3657&r2=3658&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Sun May 13 17:06:35 2012
@@ -37,9 +37,13 @@
 
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
 
+
     <?include ShibbolethSP-properties.wxi?>
 
-    <?include ShibbolethSP-gui.wxi ?>
+    <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
+    <Property Id='IS64BITINSTALL' Value='TRUE'/>
+    <UIRef Id="Shib_InstallDir"/>
+
 
     <!-- Files -->
     <Directory Id='TARGETDIR' Name='SourceDir'>

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs?rev=3658&r1=3657&r2=3658&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs Sun May 13 17:06:35 2012
@@ -40,7 +40,9 @@
 
     <?include ShibbolethSP-properties.wxi?>
 
-    <?include ShibbolethSP-gui.wxi ?>
+    <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
+    <Property Id='IS64BITINSTALL' Value='FALSE'/>
+    <UIRef Id="Shib_InstallDir"/>
 
     <!-- Files -->
     <Directory Id='TARGETDIR' Name='SourceDir'>

Modified: branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs?rev=3658&r1=3657&r2=3658&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs Sun May 13 17:06:35 2012
@@ -225,9 +225,9 @@
       <!-- set service path to 64 bit one if this is an install and if we werre told to -->
 
       <Custom Action='SetServicePath64' 
-              Before='CostInitialize'>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT)</Custom>

[... 8 lines stripped ...]