From 66d504e0457256ca1396c7528daaec0628cf44ff Mon Sep 17 00:00:00 2001
From: rdw <rdw@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Mon, 9 Jul 2012 10:09:16 +0000
Subject: [PATCH] Remove the option of not installing shibd_default

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3725 cb58f699-b61c-0410-a6fe-9272a202ed29
---
 msi/WiX/ShibbolethSP-defs-x86.wxi     |  2 --
 msi/WiX/ShibbolethSP-install-dlg.wxs  |  8 +++-----
 msi/WiX/ShibbolethSP-main-x64.wxs     |  1 -
 msi/WiX/ShibbolethSP-noarch.wxs       | 20 ++++----------------
 msi/WiX/ShibbolethSP-properties.wxi   |  2 --
 msi/WiX/ShibbolethSP-registry-x64.wxs | 10 ----------
 msi/WiX/ShibbolethSP-registry-x86.wxs | 10 ----------
 7 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 94bc4fa..5c0b157 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -3,7 +3,6 @@
   <!-- ShibbolethSP-noarch -->
 
   <ComponentRef Id='main.css'/>
-  <ComponentRef Id='logo.jpg'/>
   <ComponentRef Id='CREDITS.txt'/>
   <ComponentRef Id='LICENSE.txt'/>
   <ComponentRef Id='NOTICE.txt'/>
@@ -82,7 +81,6 @@
 
   <!-- ShibbolethSP-registry-x32 -->
   <ComponentRef Id='TargetDir'/>
-  <ComponentRef Id='InstallShibd'/>
   <ComponentRef Id='InstallIsapi'/>
   <ComponentRef Id='file_extension'/>
   <ComponentRef Id='shib.ico' />
diff --git a/msi/WiX/ShibbolethSP-install-dlg.wxs b/msi/WiX/ShibbolethSP-install-dlg.wxs
index f353f2f..71c184e 100644
--- a/msi/WiX/ShibbolethSP-install-dlg.wxs
+++ b/msi/WiX/ShibbolethSP-install-dlg.wxs
@@ -25,7 +25,6 @@
 
       <!-- This Dialog sets up:
            - INSTALLDIR
-           - INSTALL_SHIBD_SERVICE
            - INSTALL_32BIT (if a 64bit machine)
            - INSTALL_ISAPI_FILTER (if IIS about)
            - SHIB_FILE_EXTENSION (if IIS about)
@@ -58,12 +57,11 @@
         </Control>
 
         <!-- Service? -->
-        <Control Id='InstallShibd' Type='CheckBox' X='25' Y='146' Height='17' Width='160' 
-                 Property='INSTALL_SHIBD_SERVICE' CheckBoxValue='TRUE' 
-                 Text='Install shibd as Service' />
+        <Control Id='InstallShibd' Type='Text' X='25' Y='148' Height='17' Width='235' 
+                 Text='The Shibboleth daemon will be installed as service shibd_default.' />
 
         <!-- 32 Bits? -->
-        <Control Id='Install32Bit' Type='CheckBox' X='185' Y='146' Height='17' Width='160'
+        <Control Id='Install32Bit' Type='CheckBox' X='265' Y='146' Height='17' Width='80'
                  Property='INSTALL_32BIT' CheckBoxValue='TRUE' 
                  Text='Run as 32-Bit'>
           <Condition Action='show'>IS64BITINSTALL = "TRUE"</Condition>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index aaa9f12..001dfb0 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -172,7 +172,6 @@
 
       <!-- ShibbolethSP-registry-x64 -->
       <ComponentRef Id='TargetDir64'/>
-      <ComponentRef Id='InstallShibd64'/>
       <ComponentRef Id='InstallIsapi64'/>
       <ComponentRef Id='Install32Bit64'/>
       <ComponentRef Id='file_extension64'/>
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 0768644..ca7ab67 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -204,9 +204,6 @@
     <CustomAction Id='InheritInstallDir' Property='INSTALLDIR' Value='[OLD_INSTALLDIR]' />
     <CustomAction Id='InheritInstallDir64' Property='INSTALLDIR' Value='[OLD_INSTALLDIR64]' />
 
-    <!-- Set INSTALL_SHIBD correctly -->
-    <CustomAction Id='ClearInstallShibd' Property='INSTALL_SHIBD_SERVICE' Value='FALSE' />
-
     <InstallUISequence>
       <!-- All we need to sequence here is setting up inherited INSTALLDIR -->
 
@@ -254,10 +251,10 @@
       <!-- set service path to 64 bit one if this is an install and if we were told to -->
 
       <Custom Action='SetServicePath64' Before='CostInitialize'>
-        (NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
+        (NOT Installed) AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
       </Custom>
       <Custom Action='ServicePath64' After='InstallServices'>
-        (NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
+        (NOT Installed) AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
       </Custom>
 
       <!-- Duplicate actions from the UI case -->
@@ -268,19 +265,10 @@
         (NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64
       </Custom>
 
-      <!-- Clear out INSTALL_SHIBD_SERVICE (Set it to FALSE) if
-           - This is an update
-           - We didn't see an appropriate registryEntry
-           - TODO - we don't need this here I think
-        -->
-      <Custom Action='ClearInstallShibd' After='AppSearch'>
-        ALREADYINSTALLED AND (NOT OLD_SERVICEINSTALLED)
-      </Custom>
-
       <!-- Do not mess with SCM if this is an upgrade -->
 
-      <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED) AND (INSTALL_SHIBD_SERVICE = "TRUE")</InstallServices>
-      <StartServices>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE")</StartServices>
+      <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED)</InstallServices>
+      <StartServices>(NOT Installed)</StartServices>
       <DeleteServices>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</DeleteServices>
 
     </InstallExecuteSequence>
diff --git a/msi/WiX/ShibbolethSP-properties.wxi b/msi/WiX/ShibbolethSP-properties.wxi
index 7230847..0f455ca 100644
--- a/msi/WiX/ShibbolethSP-properties.wxi
+++ b/msi/WiX/ShibbolethSP-properties.wxi
@@ -28,8 +28,6 @@
     <RegistrySearch Id='AppReg' Root='HKLM' Key='SOFTWARE\Shibboleth' Name='FileExtension' Type='raw' />
   </Property>
   
-  <!-- Install shibd_service -->
-  <Property Id='INSTALL_SHIBD_SERVICE' Value='TRUE' Secure='yes' />
   <!-- On 64 bit systems: 64 bit or 32bit service and DLLS, also used to swap in the 64 bit service -->
   <Property Id='INSTALL_32BIT' Secure='yes' />
 
diff --git a/msi/WiX/ShibbolethSP-registry-x64.wxs b/msi/WiX/ShibbolethSP-registry-x64.wxs
index 5d8360a..99e1cf2 100644
--- a/msi/WiX/ShibbolethSP-registry-x64.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x64.wxs
@@ -62,11 +62,6 @@
                       Name='InstallDir' Type='directory' Win64='yes'/>
     </Property>
 
-    <Property Id='OLD_INSTALL_SHIBD_SERVICE64' Secure='yes'>
-      <RegistrySearch Id='OldInstallShibd64' Root='HKLM' Key='SOFTWARE\Shibboleth' 
-                      Name='InstallShibd' Type='raw' Win64='yes'/>
-    </Property>
-
     <Property Id='OLD_INSTALL_ISAPI_FILTER64' Secure='yes'>
       <RegistrySearch Id='OldInstallIsapi64' Root='HKLM' Key='SOFTWARE\Shibboleth' 
                       Name='InstallIsapi' Type='raw' Win64='yes'/>
@@ -85,11 +80,6 @@
                        Name='InstallDir' Value='[INSTALLDIR]' Type='string' KeyPath='yes' />
       </Component>
 
-      <Component Id='InstallShibd64' Guid='{7834C30C-DCAB-4C7E-9C75-396EFB759AC9}' Win64='yes'>
-        <RegistryValue Id='InstallShibd64'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
-                       Name='InstallShibd' Value='[INSTALL_SHIBD_SERVICE]' Type='string' KeyPath='yes' />
-      </Component>
-
       <Component Id='Install32Bit64' Guid='{9A0181FE-6252-4C2E-8828-70281DCC3825}' Win64='yes'>
         <RegistryValue Id='Install32Bit64'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
                        Name='Install32Bit' Value='[INSTALL_32BIT]' Type='string' KeyPath='yes' />
diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
index ee2f548..c9b4906 100644
--- a/msi/WiX/ShibbolethSP-registry-x86.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x86.wxs
@@ -70,11 +70,6 @@
                       Name='InstallDir' Type='directory' />
     </Property>
 
-    <Property Id='OLD_INSTALL_SHIBD_SERVICE' Secure='yes'>
-      <RegistrySearch Id='OldInstallShibd' Root='HKLM' Key='SOFTWARE\Shibboleth' 
-                      Name='InstallShibd' Type='raw' />
-    </Property>
-
     <Property Id='OLD_INSTALL_ISAPI_FILTER' Secure='yes'>
       <RegistrySearch Id='OldInstallIsapi' Root='HKLM' Key='SOFTWARE\Shibboleth' 
                       Name='InstallIsapi' Type='raw' />
@@ -93,11 +88,6 @@
                        Name='InstallDir' Value='[INSTALLDIR]' Type='string' KeyPath='yes' />
       </Component>
 
-      <Component Id='InstallShibd' Guid='{67ABE9AB-5ACF-44FE-8620-AEA676E88187}' >
-        <RegistryValue Id='InstallShibd'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
-                       Name='InstallShibd' Value='[INSTALL_SHIBD_SERVICE]' Type='string' KeyPath='yes' />
-      </Component>
-
       <Component Id='InstallIsapi' Guid='{4F81E47D-B406-42B6-A702-90ACA666075E}' >
         <Condition>IISMAJORVERSION</Condition>
         <RegistryValue Id='InstallIsapi'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
-- 
2.1.4