From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Fri, 2 Nov 2012 14:58:55 +0000 (+0000)
Subject: Missed dependency on the common properties include file
X-Git-Tag: 2.5.1~18
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=62f7c873dd629234c6df38f99f8ea0329b4b4a98

Missed dependency on the common properties include file
---

diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make
index 58f2c68..b64b73f 100644
--- a/msi/WiX/Installer.make
+++ b/msi/WiX/Installer.make
@@ -67,10 +67,10 @@ ShibbolethSP-install-dlg.wixobj: ShibbolethSP-install-dlg.wxs
 	wixcop -indent:2 ShibbolethSP-install-dlg.wxs
 	candle ShibbolethSP-install-dlg.wxs
 
-ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm MergeModules\FastCGI-x64.msm MergeModules\Log4Shib-x64.msm MergeModules\OpenSAML-x64.msm MergeModules\OpenSSL-x64.msm MergeModules\Shibboleth-x64.msm MergeModules\Xerces-x64.msm MergeModules\XmlSec-x64.msm MergeModules\Zlib-x64.msm
+ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs ShibbolethSP-properties.wxi MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm MergeModules\FastCGI-x64.msm MergeModules\Log4Shib-x64.msm MergeModules\OpenSAML-x64.msm MergeModules\OpenSSL-x64.msm MergeModules\Shibboleth-x64.msm MergeModules\Xerces-x64.msm MergeModules\XmlSec-x64.msm MergeModules\Zlib-x64.msm
 	wixcop -indent:2 ShibbolethSP-main-x64.wxs
 	candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x64.wxs
 
-ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm
+ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs ShibbolethSP-properties.wxi MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm
 	wixcop -indent:2 ShibbolethSP-main-x86.wxs
 	candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x86.wxs
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 25254b4..4d746fb 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -270,7 +270,7 @@
       <!-- Do not mess with SCM if this is an upgrade -->
 
       <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED)</InstallServices>
-      <StartServices>(NOT Installed)</StartServices>
+      <StartServices>(NOT Installed) AND (ALWAYS_START_SERVICE = "TRUE")</StartServices>
       <DeleteServices>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</DeleteServices>
 
     </InstallExecuteSequence>
diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index 07f8027..0e16c28 100644
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -35,6 +35,9 @@
   <Property Id='ARPURLUPDATEINFO' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPWindowsUpgrade' />
   <Property Id='ARPURLINFOABOUT' Value='http://shibboleth.net/' />
 
+  <!-- Do we want to force the ServiceStart to happen? -->
+  <Property Id='ALWAYS_START_SERVICE' Value='TRUE' Secure='yes' />
+
   <!-- UPGRADINGPRODUCTCODE set in the uninstall if this is an upgrade uninstall -->
   <!-- IISMAJORVERSION if IIS installed -->
   <PropertyRef Id='IISMAJORVERSION' />