Remover versions.wxi and inline component IDs from wxs files.
[shibboleth/cpp-sp.git] / msi / WiX / ShibbolethSP-registry-x86.wxs
index ee2f548..75d3afc 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
-    <!-- Previous version search -->\r
-    <Property Id='SHIB_OLDVERSION' Value='none' Secure='yes'>\r
-      <RegistrySearch Id='SP2_2_1' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2A19CDBC-E0DA-452C-8B38-1AA9DB4D579F}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_4_1_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A5D2DE8D-2A4A-4D74-98B5-BA448DD4DC39}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_4_2_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8280E58C-D290-42CD-9425-BCC0BA439649}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_4_3_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7B9F4513-3141-4270-B1F5-43A467235B6B}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_2_0_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EAAAD296-3942-4535-B39B-81A57E94FCF7}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_3_0_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{790EE9BA-BB63-43D3-9080-F9AF7AC43114}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_1_0_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E80BF81-72BC-4E9C-8A79-D7D7EA20AAE4}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='AppReg2' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A9A0D770-C658-4659-BC75-6F8289DDEAA3}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_4_0_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{56028A6A-D5A3-47C5-9494-092E1C840A8F}' \r
-                      Name='DisplayName' Type='raw' />\r
-      <RegistrySearch Id='AppReg1' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{6E62498D-162E-45AA-87C7-157308552043}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_0_0_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D62F990B-2A8A-442B-BF85-7FE075B2CE0C}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <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_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
-    </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='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
-                       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
-                       Name='DisplayIcon' Value='[#shib.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.  -->
+
+<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' Value='none' Secure='yes'>
+      <RegistrySearch Id='SP2_2_1' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2A19CDBC-E0DA-452C-8B38-1AA9DB4D579F}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_1_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A5D2DE8D-2A4A-4D74-98B5-BA448DD4DC39}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_2_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8280E58C-D290-42CD-9425-BCC0BA439649}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_3_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7B9F4513-3141-4270-B1F5-43A467235B6B}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_2_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EAAAD296-3942-4535-B39B-81A57E94FCF7}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_3_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{790EE9BA-BB63-43D3-9080-F9AF7AC43114}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_1_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E80BF81-72BC-4E9C-8A79-D7D7EA20AAE4}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='AppReg2' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A9A0D770-C658-4659-BC75-6F8289DDEAA3}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{56028A6A-D5A3-47C5-9494-092E1C840A8F}' 
+                      Name='DisplayName' Type='raw' />
+      <RegistrySearch Id='AppReg1' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{6E62498D-162E-45AA-87C7-157308552043}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_0_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D62F990B-2A8A-442B-BF85-7FE075B2CE0C}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_3_1' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E4FA3B6C-6347-4B58-A07D-F9E388B3944B}' 
+                      Name='DisplayVersion' Type='raw' />
+    </Property>
+
+    <Property Id='OLD_INSTALLDIR' Secure='yes'>
+      <RegistrySearch Id='OldInstallDir' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallDir' Type='directory' />
+    </Property>
+
+    <Property Id='OLD_INSTALL_ISAPI_FILTER' Secure='yes'>
+      <RegistrySearch Id='OldInstallIsapi' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallIsapi' Type='raw' />
+    </Property>
+
+    <!-- non virtualized registry setting -->
+    <Property Id='OLD_SERVICEINSTALLED' Secure='yes'>
+      <RegistrySearch Id='OldServiceInstalled' Root='HKLM' Key='SYSTEM\CurrentControlSet\services\shibd_Default'
+                      Name='ImagePath' Type='raw' />
+    </Property>
+
+    <DirectoryRef Id='bin'>
+      <!-- Save the Captured parameters into the registry -->
+      <Component Id='TargetDir' Guid='{F02FB6E5-1146-4EC5-9D59-07BA6732C4DD}' >
+        <RegistryValue Id='TargetDir'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallDir' Value='[INSTALLDIR]' 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' 
+                       Name='InstallIsapi' Value='[INSTALL_ISAPI_FILTER]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='file_extension' Guid='{88D0BEF3-6E15-4688-8492-9FF23B6221DF}'>
+        <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
+        <RegistryValue Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <!-- pretty icon for the "install programs" page -->
+      <Component Id='shib.ico' Guid='{FA0F86A1-0731-4D66-8216-BC74D231B598}'>
+        <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico' />
+        <RegistryValue Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' 
+                       Name='DisplayIcon' Value='[#shib.ico],0' Type='string' />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+</Wix>