Set native EOL on all wxs, make and vcxproj files. Revert the ones which had become...
[shibboleth/sp.git] / msi / WiX / ShibbolethSP-registry-x64.wxs
index 5d8360a..fa04af6 100644 (file)
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the 'License'); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an 'AS IS' BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\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
-    <Property Id='SHIB_OLDVERSION_64' Value='none' Secure='yes'>\r
-      <RegistrySearch Id='SP_2_2_1_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_4_1_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_4_2_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP_2_4_3_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_3_0_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_4_0_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}' \r
-                      Name='DisplayName' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_1_0_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_2_0_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_3_1_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}' \r
-                      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'  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
-  </Fragment>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the 'License'); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!--
+    This is where we put all the architecture neutral bits of the
+    Shibboleth install.  It turns out that it may not be all the
+    architecture insenstive stuff since some GUIDS may have moved
+  -->
+  <Fragment>
+
+    <!-- Previous version search -->
+    <Property Id='SHIB_OLDVERSION_64' Value='none' Secure='yes'>
+      <RegistrySearch Id='SP_2_2_1_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_4_1_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_4_2_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP_2_4_3_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_3_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_4_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}' 
+                      Name='DisplayName' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_1_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_2_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_3_1_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+    </Property>
+
+    <Property Id='OLD_INSTALLDIR64' Secure='yes'>
+      <RegistrySearch Id='OldInstallDir64' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallDir' Type='directory' 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'/>
+    </Property>
+
+    <!-- 64 bit only -->
+    <Property Id='OLD_INSTALL_32BIT' Secure='yes'>
+      <RegistrySearch Id='OldInstall32Bit' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='Install32Bit' Type='raw' Win64='yes'/>
+    </Property>
+
+    <DirectoryRef Id='bin64'>
+      <!-- Save the Captured parameters into the registry -->
+      <Component Id='TargetDir64' Guid='{E89D3028-5415-4874-9CBC-806A2064C613}' Win64='yes'>
+        <RegistryValue Id='TargetDir64'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallDir' Value='[INSTALLDIR]' 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' />
+      </Component>
+
+      <Component Id='InstallIsapi64' Guid='{288F97F5-E2E8-48DB-8291-B8445B77BA45}' Win64='yes'>
+        <Condition>IISMAJORVERSION</Condition>
+        <RegistryValue Id='InstallIsapi64'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallIsapi' Value='[INSTALL_ISAPI_FILTER]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='file_extension64' Guid='{F17BED16-5988-4F9E-82E0-1D4DCB69EC26}' Win64='yes'>
+        <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
+        <RegistryValue Id='FileExtension64' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'  Permanent='yes'>
+        <File Id='shib64.ico' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico'/>
+        <RegistryValue Id='DisplayIcon64' Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' 
+                       Name='DisplayIcon' Value='[#shib64.ico],0' Type='string' />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+</Wix>