<!-- ShibbolethSP-noarch -->\r
\r
<ComponentRef Id='main.css'/>\r
- <ComponentRef Id='logo.jpg'/>\r
<ComponentRef Id='CREDITS.txt'/>\r
<ComponentRef Id='LICENSE.txt'/>\r
<ComponentRef Id='NOTICE.txt'/>\r
\r
<!-- ShibbolethSP-registry-x32 -->\r
<ComponentRef Id='TargetDir'/>\r
- <ComponentRef Id='InstallShibd'/>\r
<ComponentRef Id='InstallIsapi'/>\r
<ComponentRef Id='file_extension'/>\r
<ComponentRef Id='shib.ico' />\r
\r
<!-- This Dialog sets up:\r
- INSTALLDIR\r
- - INSTALL_SHIBD_SERVICE\r
- INSTALL_32BIT (if a 64bit machine)\r
- INSTALL_ISAPI_FILTER (if IIS about)\r
- SHIB_FILE_EXTENSION (if IIS about)\r
</Control>\r
\r
<!-- Service? -->\r
- <Control Id='InstallShibd' Type='CheckBox' X='25' Y='146' Height='17' Width='160' \r
- Property='INSTALL_SHIBD_SERVICE' CheckBoxValue='TRUE' \r
- Text='Install shibd as Service' />\r
+ <Control Id='InstallShibd' Type='Text' X='25' Y='148' Height='17' Width='235' \r
+ Text='The Shibboleth daemon will be installed as service shibd_default.' />\r
\r
<!-- 32 Bits? -->\r
- <Control Id='Install32Bit' Type='CheckBox' X='185' Y='146' Height='17' Width='160'\r
+ <Control Id='Install32Bit' Type='CheckBox' X='265' Y='146' Height='17' Width='80'\r
Property='INSTALL_32BIT' CheckBoxValue='TRUE' \r
Text='Run as 32-Bit'>\r
<Condition Action='show'>IS64BITINSTALL = "TRUE"</Condition>\r
\r
<!-- ShibbolethSP-registry-x64 -->\r
<ComponentRef Id='TargetDir64'/>\r
- <ComponentRef Id='InstallShibd64'/>\r
<ComponentRef Id='InstallIsapi64'/>\r
<ComponentRef Id='Install32Bit64'/>\r
<ComponentRef Id='file_extension64'/>\r
<CustomAction Id='InheritInstallDir' Property='INSTALLDIR' Value='[OLD_INSTALLDIR]' />\r
<CustomAction Id='InheritInstallDir64' Property='INSTALLDIR' Value='[OLD_INSTALLDIR64]' />\r
\r
- <!-- Set INSTALL_SHIBD correctly -->\r
- <CustomAction Id='ClearInstallShibd' Property='INSTALL_SHIBD_SERVICE' Value='FALSE' />\r
-\r
<InstallUISequence>\r
<!-- All we need to sequence here is setting up inherited INSTALLDIR -->\r
\r
<!-- set service path to 64 bit one if this is an install and if we were told to -->\r
\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
+ (NOT Installed) 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
+ (NOT Installed) AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")\r
</Custom>\r
\r
<!-- Duplicate actions from the UI case -->\r
(NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64\r
</Custom>\r
\r
- <!-- Clear out INSTALL_SHIBD_SERVICE (Set it to FALSE) if\r
- - This is an update\r
- - We didn't see an appropriate registryEntry\r
- - TODO - we don't need this here I think\r
- -->\r
- <Custom Action='ClearInstallShibd' After='AppSearch'>\r
- ALREADYINSTALLED AND (NOT OLD_SERVICEINSTALLED)\r
- </Custom>\r
-\r
<!-- Do not mess with SCM if this is an upgrade -->\r
\r
- <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED) AND (INSTALL_SHIBD_SERVICE = "TRUE")</InstallServices>\r
- <StartServices>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE")</StartServices>\r
+ <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED)</InstallServices>\r
+ <StartServices>(NOT Installed)</StartServices>\r
<DeleteServices>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</DeleteServices>\r
\r
</InstallExecuteSequence>\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
Name='InstallDir' Type='directory' Win64='yes'/>\r
</Property>\r
\r
- <Property Id='OLD_INSTALL_SHIBD_SERVICE64' Secure='yes'>\r
- <RegistrySearch Id='OldInstallShibd64' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
- Name='InstallShibd' Type='raw' Win64='yes'/>\r
- </Property>\r
-\r
<Property Id='OLD_INSTALL_ISAPI_FILTER64' Secure='yes'>\r
<RegistrySearch Id='OldInstallIsapi64' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
Name='InstallIsapi' Type='raw' Win64='yes'/>\r
Name='InstallDir' Value='[INSTALLDIR]' Type='string' KeyPath='yes' />\r
</Component>\r
\r
- <Component Id='InstallShibd64' Guid='{7834C30C-DCAB-4C7E-9C75-396EFB759AC9}' Win64='yes'>\r
- <RegistryValue Id='InstallShibd64' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
- Name='InstallShibd' Value='[INSTALL_SHIBD_SERVICE]' Type='string' KeyPath='yes' />\r
- </Component>\r
-\r
<Component Id='Install32Bit64' Guid='{9A0181FE-6252-4C2E-8828-70281DCC3825}' Win64='yes'>\r
<RegistryValue Id='Install32Bit64' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
Name='Install32Bit' Value='[INSTALL_32BIT]' Type='string' KeyPath='yes' />\r
Name='InstallDir' Type='directory' />\r
</Property>\r
\r
- <Property Id='OLD_INSTALL_SHIBD_SERVICE' Secure='yes'>\r
- <RegistrySearch Id='OldInstallShibd' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
- Name='InstallShibd' Type='raw' />\r
- </Property>\r
-\r
<Property Id='OLD_INSTALL_ISAPI_FILTER' Secure='yes'>\r
<RegistrySearch Id='OldInstallIsapi' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
Name='InstallIsapi' Type='raw' />\r
Name='InstallDir' Value='[INSTALLDIR]' Type='string' KeyPath='yes' />\r
</Component>\r
\r
- <Component Id='InstallShibd' Guid='{67ABE9AB-5ACF-44FE-8620-AEA676E88187}' >\r
- <RegistryValue Id='InstallShibd' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
- Name='InstallShibd' Value='[INSTALL_SHIBD_SERVICE]' Type='string' KeyPath='yes' />\r
- </Component>\r
-\r
<Component Id='InstallIsapi' Guid='{4F81E47D-B406-42B6-A702-90ACA666075E}' >\r
<Condition>IISMAJORVERSION</Condition>\r
<RegistryValue Id='InstallIsapi' Root='HKLM' Key='SOFTWARE\Shibboleth' \r