Do not even think about IIS if it isn't there. Say goodbye to SHIBD_PORT (leaving...

[shibboleth/cpp-sp.git] / msi / WiX / ShibbolethSP-noarch.wxs

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 462a111..3f20e94 100644 (file)
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -168,7 +168,7 @@
 \r
     <CustomAction Id='EditConfigFiles' \r
                   BinaryKey='EditConfigFileSrc' VBScriptCall='' Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR];@;[SHIBD_PORT];@;[OUR_DLL_PATH]' />\r
+    <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR]' />\r
 \r
     <CustomAction Id='KeyGen' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />\r
     <CustomAction Id='SetKeyGen' Property='KeyGen' Value='&quot;[INSTALLDIR]etc\shibboleth\keygen.bat&quot;' />\r
@@ -207,12 +207,15 @@
            - AND we were told to\r
            - AND this is NOT an upgrade\r
         -->\r
-      <Custom Action='SetShibInstallISAPIFilter32' \r
-              Before='CostInitialize'>(NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND (INSTALL_32BIT)</Custom>\r
-      <Custom Action='SetShibInstallISAPIFilter64' \r
-              Before='CostInitialize'>(NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT)</Custom>\r
-      <Custom Action='ShibInstallISAPIFilter' \r
-              After='InstallFiles'>(NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED)</Custom>\r
+      <Custom Action='SetShibInstallISAPIFilter32' Before='CostInitialize'>\r
+        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND (INSTALL_32BIT) AND IISMAJORVERSION\r
+      </Custom>\r
+      <Custom Action='SetShibInstallISAPIFilter64' Before='CostInitialize'>\r
+        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND IISMAJORVERSION\r
+      </Custom>\r
+      <Custom Action='ShibInstallISAPIFilter' After='InstallFiles'>\r
+        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED)  AND IISMAJORVERSION\r
+      </Custom>\r
 \r
       <!-- (try to) Uninstall IIS if\r
            - this is an uninstall\r
@@ -224,10 +227,12 @@
               Before='RemoveFiles'>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</Custom>\r
       <!-- set service path to 64 bit one if this is an install and if we werre told to -->\r
 \r
-      <Custom Action='SetServicePath64' \r
-              Before='CostInitialize'>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")</Custom>\r
-      <Custom Action='ServicePath64' \r
-              After='InstallServices'>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")</Custom>\r
+      <Custom Action='SetServicePath64' Before='CostInitialize'>\r
+        (NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")\r
+      </Custom>\r
+      <Custom Action='ServicePath64' After='InstallServices'>\r
+        (NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")\r
+      </Custom>\r
 \r
 \r
       <!-- Do not mess with SCM if this is an upgrade -->\r