From f586bc48f4a545783aa20d5dee8032c4a6d9bde9 Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Tue, 8 May 2012 15:09:02 +0000
Subject: [PATCH] Part 2 of Add a Shibboleth-schemas merge modules

---
 msi/WiX/MergeModules/Shibboleth-schemas.wxs | 87 +++++++++++++++++++++++++++++
 msi/WiX/ShibbolethSP-main-x64.wxs           |  4 +-
 msi/WiX/ShibbolethSP-main-x86.wxs           |  8 ++-
 msi/WiX/ShibbolethSP-noarch.wxs             | 30 +---------
 msi/WiX/Versions.wxi                        | 14 ++---
 5 files changed, 104 insertions(+), 39 deletions(-)
 create mode 100644 msi/WiX/MergeModules/Shibboleth-schemas.wxs

diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
new file mode 100644
index 0000000..16fd092
--- /dev/null
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -0,0 +1,87 @@
+<?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'>
+  <Module Id='Shibboleth_schemas' Language='1033' Version='$(var.ShibbolethDllVersion)'>
+    <Package Id='{5AC5161D-114D-4BFB-AF7C-4E8E7F964965}' Description='Merge Module for Shibboleth schemas'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
+        <Directory Id='Shibboleth' Name='Shibboleth' >
+          <Directory Id='SP' Name='SP' >
+            <Directory Id='xml' Name='xml' >
+              <Directory Id='xml_shibboleth' Name='shibboleth'
+                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas' >
+                <Component Id='share_xml_shibboleth' Guid='{E2740531-4A6C-43C8-9E1A-9F7CA87862B7}'>
+                  <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />
+                </Component>
+                <Component Id='catalog.xml' Guid='{C6EA59A2-0A86-4F5F-B5F8-E37A2310A793}'>
+                  <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />
+                </Component>
+                <Component Id='attributemap.xsd' Guid='{58A966DC-94E0-45FF-9A31-C67BAE0AB1C1}'>
+                  <File Name='shibboleth-2.0-attribute-map.xsd' />
+                </Component>
+                <Component Id='afp.xsd' Guid='{9672ADDF-8053-41C3-A58A-C8B99C710336}'>
+                  <File Name='shibboleth-2.0-afp.xsd' />
+                </Component>
+                <Component Id='afpmfsaml.xsd' Guid='{40B8AEF3-0A31-4204-95E7-F8079CB55979}'>
+                  <File Name='shibboleth-2.0-afp-mf-saml.xsd' />
+                </Component>
+                <Component Id='WSTrust.xsd' Guid='{91EA82B5-A19C-40C0-8D1C-40FA020A484E}'>
+                  <File Name='WS-Trust.xsd' />
+                </Component>
+                <Component Id='spnotify.xsd' Guid='{65EBC9F1-C958-4B17-9554-7F86186A15C1}'>
+                  <File Name='shibboleth-2.0-sp-notify.xsd' />
+                </Component>
+                <Component Id='nativespconfig.xsd' Guid='{5514B435-94AB-4A92-9737-0BEB78C146C8}'>
+                  <File Name='shibboleth-2.0-native-sp-config.xsd' />
+                </Component>
+                <Component Id='afpmfbasic.xsd' Guid='{D1C32485-D3DF-414C-B2FF-721F169CAC05}'>
+                  <File Name='shibboleth-2.0-afp-mf-basic.xsd' />
+                </Component>
+                <Component Id='nativespprotocols' Guid='{AE42FFFB-1A59-4F1D-9935-15D727B99929}'>
+                  <File Id='nativespprotocols' Name='shibboleth-2.0-native-sp-protocols.xsd' />
+                </Component>
+                <Component Id='shibboleth.xsd' Guid='{18F3DD83-0C0A-480E-8C87-043C9296DFE5}'>
+                  <File Name='shibboleth.xsd' KeyPath='yes' />
+                </Component>
+              </Directory><!--xml_shibboleth-->
+            </Directory><!--xml-->
+          </Directory><!--SP-->
+        </Directory><!--Shibboleth-->
+      </Directory><!--CommonAppDataFolder-->
+    </Directory><!--TargetDir-->
+
+    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />
+    <CustomAction Id='EditCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+                  Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditCatalog' Property='EditCatalog' 
+                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />
+
+    <InstallExecuteSequence>
+      <Custom Action='SetEditCatalog' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='EditCatalog' After='InstallFiles'>NOT Installed</Custom>
+    </InstallExecuteSequence>
+
+
+
+  </Module>
+</Wix>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index fa43875..50e48f0 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -23,7 +23,7 @@
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
     <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <PropertyRef Id='SHIB_OLDVERSION_64'/>
     <PropertyRef Id='SHIB_OLDVERSION'/>
@@ -53,6 +53,7 @@
                SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />
         <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />
         <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />
         <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />
         <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />
         <Merge Id='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />
@@ -108,6 +109,7 @@
       <MergeRef Id='OpenSAMLMergeModule_schemas'/>
       <MergeRef Id='OpenSSLMergeModule_x86'/>
       <MergeRef Id='ShibbolethMergeModule_x86'/>
+      <MergeRef Id='ShibbolethMergeModule_schemas'/>
       <MergeRef Id='XercesMergeModule_x86'/>
       <MergeRef Id='XmlSecMergeModule_x86'/>
       <MergeRef Id='XmlToolingMergeModule_x86'/>
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 9c19fc4..8fa8f30 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -23,15 +23,15 @@
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
     <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
 
     <PropertyRef Id='SHIB_OLDVERSION'/>
 
     <Condition Message='Shibboleth requires Windows XP SP2 or later.'>NOT VersionNT OR (VersionNT &gt;= 501)</Condition>
     <Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>
-    <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the &quot;Change&quot; option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>(SHIB_OLDVERSION = "none") AND (SHIB_OLDVERSION_64 = "none")</Condition>
+    <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the &quot;Change&quot; option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>SHIB_OLDVERSION = "none"</Condition>
 
-    <Condition Message='For a 32 installation on a 64 target, install the 64 msi and specify a 32 bit shibd'>NOT VersionNT64</Condition>
+    <Condition Message='For a 32 installation on a 64 architecture, install the 64bit msi but specify a 32 bit shibd'>NOT VersionNT64</Condition>
 
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
 
@@ -54,6 +54,7 @@
                SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />
         <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />
         <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />
         <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />
         <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />
         <Merge Id='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />
@@ -82,6 +83,7 @@
       <MergeRef Id='OpenSAMLMergeModule_schemas'/>
       <MergeRef Id='OpenSSLMergeModule_x86'/>
       <MergeRef Id='ShibbolethMergeModule_x86'/>
+      <MergeRef Id='ShibbolethMergeModule_schemas'/>
       <MergeRef Id='XercesMergeModule_x86'/>
       <MergeRef Id='XmlSecMergeModule_x86'/>
       <MergeRef Id='XmlToolingMergeModule_x86'/>
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 835173e..bd72978 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -31,6 +31,7 @@
       <Directory Id='doc' Name='doc' >
         <Directory Id='doc_shibboleth' Name='shibboleth' 
                    FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc' >
+          <!-- TODO seperate components -->
           <Component Id='doc_shibboleth' Guid='{8239E994-8295-4E26-8708-DDF240B486BF}'>
             <File Name='main.css' KeyPath='yes'/>
             <File Name='logo.jpg' />
@@ -45,6 +46,7 @@
       <Directory Id='etc' Name='etc' >
         <Directory Id='etc_shibboleth' Name='shibboleth' 
                    FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs' >
+          <!-- TODO seperate components -->
           <Component Id='etc_shibboleth_perm' Guid='{1F1B9F9B-6437-46F1-ACE8-8D135612336C}' Permanent='yes'>
             <File KeyPath='yes' 
                   Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\apps\openssl.cnf' />
@@ -112,34 +114,6 @@
           <Directory Id='var_run_shibboleth' Name='shibboleth' />
         </Directory><!-- var_run -->
       </Directory><!-- var -->
-      <!-- Schemas -->
-      <!-- TODO Move to a merge module -->
-      <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
-        <Directory Id='Shibboleth' Name='Shibboleth' >
-          <Directory Id='SP' Name='SP' >
-            <Directory Id='xml' Name='xml' >
-              <Directory Id='xml_shibboleth' Name='shibboleth'
-                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas' >
-                <Component Id='share_xml_shibboleth' Guid='{69FCD385-B31D-43FB-B8A7-6F8D30391661}'>
-                  <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />
-                  <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />
-                  <File Name='shibboleth-2.0-attribute-map.xsd' />
-                  <File Name='shibboleth-2.0-afp.xsd' />
-                  <File Name='shibboleth-2.0-afp-mf-saml.xsd' />
-                  <File Name='WS-Trust.xsd' />
-                  <File Name='shibboleth-2.0-sp-notify.xsd' />
-                  <File Name='shibboleth-2.0-native-sp-config.xsd' />
-                  <File Name='shibboleth-2.0-afp-mf-basic.xsd' />
-                  <File Name='shibboleth-2.0-native-sp-protocols.xsd' />
-                </Component>
-                <Component Id='share_xml_shibboleth_xsd' Guid='{8C5B6416-5BE3-4D4D-BF8B-B677365DA58C}'>
-                  <File Name='shibboleth.xsd' KeyPath='yes' />
-                </Component>
-              </Directory><!--xml_shibboleth-->
-            </Directory><!--xml-->
-          </Directory><!--SP-->
-        </Directory><!--Shibboleth-->
-      </Directory><!--CommonAppDataFolder-->
     </DirectoryRef>
 
     <!-- The actions to perform after the files have been copied
diff --git a/msi/WiX/Versions.wxi b/msi/WiX/Versions.wxi
index a4cc1bf..25c5997 100644
--- a/msi/WiX/Versions.wxi
+++ b/msi/WiX/Versions.wxi
@@ -11,30 +11,30 @@
 
   <?define FastCGIVersion='2.4.0' ?>
 
-  <?define LogForShibVersion='1.0.5' ?>
+  <?define LogForShibVersion='1.0.5' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
   <?define LogForShibFileVersion='1_0' ?> <!-- '$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'> -->
 
-  <?define OpenSAMLVersion='2.4.3' ?> 
+  <?define OpenSAMLVersion='2.4.3' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
   <?define OpenSAMLFileVersion='2_4' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->
 
   <?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->
   <?define OpenSSLDirVersion='1.0.0a' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->
-  <?define OpenSSLFileVersion='1_0_0' ?><!-- 'libeay32_$(var.OpenSSLFileVersion)D.dll' -->
+  <?define OpenSSLFileVersion='1_0_0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
   <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->
-  <?define ShibbolethDllFileVersion='1_4' ?><!-- 'shibsp-lite$(var.ShibbolethSPFileVersion).dll'  -->
+  <?define ShibbolethDllFileVersion='1_4' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
   <?define ShibbolethDllVersion='1.4.2' ?>
 
   <?define XercesVersion='3.1.1' ?><!-- $(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll' -->
-  <?define XercesFileVersion='3_1' ?>
+  <?define XercesFileVersion='3_1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
   <?define XmlSecVersion='1.6.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->
-  <?define XmlSecFileVersion='1_6' ?><!--'xsec_$(var.XmlSecFileVersion).dll'-->
+  <?define XmlSecFileVersion='1_6' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 
   <?define XmlToolingVersion='1.4.2' ?>
   <?define XmlToolingFileVersion='1_4' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->
 
   <?define ZlibVersion='1.2.5' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'-->
-  <?define ZlibFileVersion='1' ?>
+  <?define ZlibFileVersion='1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->
 </Include>
-- 
2.1.4