Remove the option of not installing shibd_default

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

diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index ccb2a50..0f455ca 100644 (file)
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -16,34 +16,32 @@
      implied.  See the License for the specific language governing\r
      permissions and limitations under the License.  -->\r
 \r
-<!-- <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-   This is where we put all the configuration properties we will\r
-       used to drive the install.  The GUI will change them as required,\r
-       but the GUI is not required.  -->\r
-<Include>\r
+<!-- This is where we put all the configuration properties we will\r
+     used to drive the install.  The GUI will change them as required,\r
+     but the GUI is not required.  -->\r
+\r
+<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
 \r
   <!-- Are we installing IIS, if so what extension to used -->\r
-  <Property Id="SHIB_FILE_EXTENSION" Value=".sso" Secure="yes">\r
-    <RegistrySearch Id="AppReg" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="FileExtension" Type="raw" />\r
+  <Property Id='INSTALL_ISAPI_FILTER' Value='TRUE' Secure='yes' />\r
+  <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
-  <!-- IIS install -->\r
-  <Property Id="INSTALL_ISAPI_FILTER" Value="TRUE" Secure="yes" />\r
-  <!-- Install shibd_service -->\r
-  <Property Id="INSTALL_SHIBD_SERVICE" Value="TRUE" Secure="yes" />\r
-  <!-- 64 bit or 32bit service and DLLS, also used to swap in the 64 bit service -->\r
-  <Property Id="INSTALL_32BIT" Secure="yes" />\r
-  <Property Id="SHIBD_PORT" Value="1600" 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
-  <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='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://shibboleth.net/' />\r
 \r
   <!-- UPGRADINGPRODUCTCODE set in the uninstall if this is an upgrade uninstall -->\r
+  <!-- IISMAJORVERSION if IIS installed -->\r
+  <PropertyRef Id='IISMAJORVERSION' />\r
 \r
+  <!-- ALREADYINSTALLED if we are doing an upgrade -->\r
   <Upgrade Id='$(var.ShibbolethUpgradeCode)'>\r
-    <UpgradeVersion ExcludeLanguages="yes" IncludeMaximum="yes" Maximum="2.5.0" Minimum="0.0.1" OnlyDetect="yes" Property="ALREADYINSTALLED"/>\r
+    <UpgradeVersion ExcludeLanguages='yes' IncludeMaximum='yes' Maximum='127.255.255' Minimum='0.0.1' OnlyDetect='yes' Property='ALREADYINSTALLED'/>\r
   </Upgrade>\r
 </Include>\r
-\r