Set up a default INSTALLDIR.

[shibboleth/cpp-sp.git] / msi / WiX / ShibbolethSP-properties.wxi

diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index a2a383e..de75897 100644 (file)
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -27,25 +27,25 @@
   <Property Id='SHIB_FILE_EXTENSION' Value='.sso' Secure='yes'>\r
     <RegistrySearch Id='AppReg' Root='HKLM' Key='SOFTWARE\Shibboleth' Name='FileExtension' Type='raw' />\r
   </Property>\r
-  \r
-  <!-- Install shibd_service -->\r
-  <Property Id='INSTALL_SHIBD_SERVICE' Value='TRUE' Secure='yes' />\r
-  <!-- On 64 bit systems: 64 bit or 32bit service and DLLS, also used to swap in the 64 bit service -->\r
-  <Property Id='INSTALL_32BIT' Secure='yes' />\r
+\r
+  <!-- Information for the properties page of the msi -->\r
 \r
   <Property Id='ARPCONTACT' Value='contact@shibboleth.net' />\r
   <Property Id='ARPHELPLINK' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/Installation+and+Configuration' />\r
   <Property Id='ARPURLUPDATEINFO' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPWindowsUpgrade' />\r
-  <Property Id='ARPURLINFOABOUT' Value='http://www.shibboleth.net/' />\r
+  <Property Id='ARPURLINFOABOUT' Value='http://shibboleth.net/' />\r
+\r
+  <!-- Do we want to force the ServiceStart to happen? -->\r
+  <Property Id='ALWAYS_START_SERVICE' Value='TRUE' Secure='yes' />\r
 \r
   <!-- UPGRADINGPRODUCTCODE set in the uninstall if this is an upgrade uninstall -->\r
+  <!-- SSPCPP-568 We need a default for InstallDir -->\r
+  <Property Id='INSTALLDIR' Value='C:\opt\shibboleth-sp'/>\r
   <!-- IISMAJORVERSION if IIS installed -->\r
   <PropertyRef Id='IISMAJORVERSION' />\r
 \r
-\r
-  <!-- ALREADYINSTALLED if we are doig an upgrade -->\r
+  <!-- ALREADYINSTALLED if we are doing an upgrade -->\r
   <Upgrade Id='$(var.ShibbolethUpgradeCode)'>\r
     <UpgradeVersion ExcludeLanguages='yes' IncludeMaximum='yes' Maximum='127.255.255' Minimum='0.0.1' OnlyDetect='yes' Property='ALREADYINSTALLED'/>\r
   </Upgrade>\r
 </Include>\r
-\r