Remove the option of not installing shibd_default

[shibboleth/sp.git] / msi / WiX / ShibbolethSP-registry-x86.wxs

diff --git a/msi/WiX/ShibbolethSP-registry-x86.wxs b/msi/WiX/ShibbolethSP-registry-x86.wxs
index ac988a4..c9b4906 100644 (file)
--- a/msi/WiX/ShibbolethSP-registry-x86.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x86.wxs
@@ -63,15 +63,44 @@
       <RegistrySearch Id='SP2_3_1' Root='HKLM' \r
                       Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E4FA3B6C-6347-4B58-A07D-F9E388B3944B}' \r
                       Name='DisplayVersion' Type='raw' />\r
+    </Property>\r
+\r
+    <Property Id='OLD_INSTALLDIR' Secure='yes'>\r
+      <RegistrySearch Id='OldInstallDir' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
+                      Name='InstallDir' Type='directory' />\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
+    </Property>\r
 \r
+    <!-- non virtualized registry setting -->\r
+    <Property Id='OLD_SERVICEINSTALLED' Secure='yes'>\r
+      <RegistrySearch Id='OldServiceInstalled' Root='HKLM' Key='SYSTEM\CurrentControlSet\services\shibd_Default'\r
+                      Name='ImagePath' Type='raw' />\r
     </Property>\r
+\r
     <DirectoryRef Id='bin'>\r
+      <!-- Save the Captured parameters into the registry -->\r
+      <Component Id='TargetDir' Guid='{F02FB6E5-1146-4EC5-9D59-07BA6732C4DD}' >\r
+        <RegistryValue Id='TargetDir'  Root='HKLM' Key='SOFTWARE\Shibboleth' \r
+                       Name='InstallDir' Value='[INSTALLDIR]' 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
+                       Name='InstallIsapi' Value='[INSTALL_ISAPI_FILTER]' Type='string' KeyPath='yes' />\r
+      </Component>\r
+\r
       <Component Id='file_extension' Guid='{88D0BEF3-6E15-4688-8492-9FF23B6221DF}'>\r
         <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>\r
         <RegistryValue Root='HKLM' Key='SOFTWARE\Shibboleth' \r
                        Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />\r
       </Component>\r
 \r
+      <!-- pretty icon for the "install programs" page -->\r
       <Component Id='shib.ico' Guid='{FA0F86A1-0731-4D66-8216-BC74D231B598}'>\r
         <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico' />\r
         <RegistryValue Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' \r