Remove SHIBSP_SCHEMAS on any type of 2.5 install

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

diff --git a/msi/WiX/ShibbolethSP-registry-x64.wxs b/msi/WiX/ShibbolethSP-registry-x64.wxs
index 789afdc..5d8360a 100644 (file)
--- a/msi/WiX/ShibbolethSP-registry-x64.wxs
+++ b/msi/WiX/ShibbolethSP-registry-x64.wxs
@@ -19,10 +19,11 @@
 <?include Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <!-- This is where we put all the architecture neutral bits of the\r
-       Shibboleth install.  It turns out that it may not be all the\r
-       architecture insenstive stuff since some GUIDS may have moved\r
-       -->\r
+  <!--\r
+    This is where we put all the architecture neutral bits of the\r
+    Shibboleth install.  It turns out that it may not be all the\r
+    architecture insenstive stuff since some GUIDS may have moved\r
+  -->\r
   <Fragment>\r
 \r
     <!-- Previous version search -->\r
@@ -56,23 +57,61 @@
                       Name='DisplayVersion' Type='raw' Win64='yes' />\r
     </Property>\r
 \r
+    <Property Id='OLD_INSTALLDIR64' Secure='yes'>\r
+      <RegistrySearch Id='OldInstallDir64' Root='HKLM' Key='SOFTWARE\Shibboleth' \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
+    </Property>\r
+\r
+    <!-- 64 bit only -->\r
+    <Property Id='OLD_INSTALL_32BIT' Secure='yes'>\r
+      <RegistrySearch Id='OldInstall32Bit' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
+                      Name='Install32Bit' Type='raw' Win64='yes'/>\r
+    </Property>\r
+\r
     <DirectoryRef Id='bin64'>\r
+      <!-- Save the Captured parameters into the registry -->\r
+      <Component Id='TargetDir64' Guid='{E89D3028-5415-4874-9CBC-806A2064C613}' Win64='yes'>\r
+        <RegistryValue Id='TargetDir64'  Root='HKLM' Key='SOFTWARE\Shibboleth' \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
+      </Component>\r
+\r
+      <Component Id='InstallIsapi64' Guid='{288F97F5-E2E8-48DB-8291-B8445B77BA45}' Win64='yes'>\r
+        <Condition>IISMAJORVERSION</Condition>\r
+        <RegistryValue Id='InstallIsapi64'  Root='HKLM' Key='SOFTWARE\Shibboleth' \r
+                       Name='InstallIsapi' Value='[INSTALL_ISAPI_FILTER]' Type='string' KeyPath='yes' />\r
+      </Component>\r
+\r
       <Component Id='file_extension64' Guid='{F17BED16-5988-4F9E-82E0-1D4DCB69EC26}' Win64='yes'>\r
         <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>\r
         <RegistryValue Id='FileExtension64' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
                        Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />\r
       </Component>\r
 \r
-      <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'>\r
-        <File Id='shib64.ico' KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\shib.ico'/>\r
+      <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'  Permanent='yes'>\r
+        <File Id='shib64.ico' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico'/>\r
         <RegistryValue Id='DisplayIcon64' Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' \r
                        Name='DisplayIcon' Value='[#shib64.ico],0' Type='string' />\r
       </Component>\r
     </DirectoryRef>\r
-  <!--\r
-     <ComponentRef Id='file_extension64'/>\r
-     <ComponentRef Id='shib64.ico' />\r
-     -->\r
-\r
   </Fragment>\r
 </Wix>\r