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

diff --git a/msi/WiX/Compile.bat b/msi/WiX/Compile.bat
index 2f09089..c066124 100644 (file)
--- a/msi/WiX/Compile.bat
+++ b/msi/WiX/Compile.bat
@@ -24,10 +24,10 @@ 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 ShibbolethSP-shibd-dialog.wixobj ShibbolethSP-iis-dialog.wixobj ShibbolethSP-gui.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 -ext WixIISExtension
 
 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 ShibbolethSP-shibd-dialog.wixobj ShibbolethSP-iis-dialog.wixobj ShibbolethSP-gui.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  -ext WixIISExtension
 
 

diff --git a/msi/WiX/ShibbolethSP-gui.wxs b/msi/WiX/ShibbolethSP-gui.wxs
index 15dcc9c..a5dd059 100644 (file)
--- a/msi/WiX/ShibbolethSP-gui.wxs
+++ b/msi/WiX/ShibbolethSP-gui.wxs
@@ -68,12 +68,14 @@
       <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>\r
 \r
       <Publish Dialog="ShibdDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg">1</Publish>\r
-      <Publish Dialog="ShibdDlg" Control="Next" Event="NewDialog" Value="IISDlg">1</Publish>\r
+      <Publish Dialog="ShibdDlg" Control="Next" Event="NewDialog" Value="IISDlg">IISMAJORVERSION</Publish>\r
+      <Publish Dialog="ShibdDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">NOT IISMAJORVERSION</Publish>\r
 \r
       <Publish Dialog="IISDlg" Control="Back" Event="NewDialog" Value="ShibdDlg">1</Publish>\r
       <Publish Dialog="IISDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>\r
 \r
-      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="IISDlg" Order="1">NOT Installed</Publish>\r
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="IISDlg" Order="1">(NOT Installed) AND IISMAJORVERSION </Publish>\r
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="IISDlg" Order="1">(NOT Installed) AND (NOT IISMAJORVERSION)</Publish>\r
       <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>\r
       <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>\r
 \r

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

diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index bf21477..a2a383e 100644 (file)
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -23,17 +23,15 @@
 <Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
 \r
   <!-- Are we installing IIS, if so what extension to used -->\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
+  <!-- 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
-  <Property Id='SHIBD_PORT' Value='1600' 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
@@ -41,7 +39,11 @@
   <Property Id='ARPURLINFOABOUT' Value='http://www.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
 \r
+  <!-- ALREADYINSTALLED if we are doig 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

diff --git a/msi/WiX/ShibbolethSP-shibd-dialog.wxs b/msi/WiX/ShibbolethSP-shibd-dialog.wxs
index a1485f7..1455ade 100644 (file)
--- a/msi/WiX/ShibbolethSP-shibd-dialog.wxs
+++ b/msi/WiX/ShibbolethSP-shibd-dialog.wxs
@@ -54,8 +54,8 @@
                  Property='INSTALL_SHIBD_SERVICE' Text='Install Shibd daemon' \r
                  CheckBoxValue='TRUE' TabSkip='yes' />\r
 \r
+        <!--\r
         <Control Id='ShibdPortBox' Type='GroupBox' X='131' Y='165' Width='104' Height='35' />\r
-\r
         <Control Id='ShibdPortText' Type='Text' X='146' Y='181' Width='40' Height='12' Text='Shibd port' >\r
           <Condition Action='disable'>INSTALL_SHIBD_SERVICE &lt;&gt; "TRUE"</Condition>\r
           <Condition Action='enable'>INSTALL_SHIBD_SERVICE = "TRUE"</Condition>\r
@@ -65,6 +65,7 @@
           <Condition Action='disable'>INSTALL_SHIBD_SERVICE &lt;&gt; "TRUE"</Condition>\r
           <Condition Action='enable'>INSTALL_SHIBD_SERVICE = "TRUE"</Condition>\r
         </Control>\r
+        -->\r
 \r
         <Control Id='Install32BitShibd' Type='CheckBox' X='118' Y='205' Width='140' Height='14' \r
                  Property='INSTALL_32BIT' Text='Install 32 bit shibd and plugins' \r