Split up more multifile components, this time the config files

diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 07c14dd..2c5c47a 100644 (file)
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -2,10 +2,37 @@
 <Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <!-- ShibbolethSP-noarch -->\r
 \r
-  <ComponentRef Id='doc_shibboleth'/>\r
-  <ComponentRef Id='etc_shibboleth_perm'/>\r
+  <ComponentRef Id='main.css'/>\r
+  <ComponentRef Id='logo.jpg'/>\r
+  <ComponentRef Id='CREDITS.txt'/>\r
+  <ComponentRef Id='LICENSE.txt'/>\r
+  <ComponentRef Id='NOTICE.txt'/>\r
+  <ComponentRef Id='README.txt'/>\r
+  <ComponentRef Id='RELEASE.txt'/>\r
+\r
+  <ComponentRef Id='openssl.cnf'/>\r
+  <ComponentRef Id='upgrade.xsl'/>\r
+  <ComponentRef Id='examplemetadata.xml'/>\r
+  <ComponentRef Id='exampleshibboleth2.xml'/> \r
+\r
   <ComponentRef Id='etc_shibboleth_nonperm'/>\r
+\r
   <ComponentRef Id='dist_noperm'/>\r
+  <ComponentRef Id='sslError.html'/>\r
+  <ComponentRef Id='xsltproc.js'/>\r
+  <ComponentRef Id='bindingTemplate.html'/>\r
+  <ComponentRef Id='globalLogout.html'/>\r
+  <ComponentRef Id='localLogout.html'/>\r
+  <ComponentRef Id='attributemap'/>\r
+  <ComponentRef Id='attributepolicy'/>\r
+  <ComponentRef Id='shibboleth2.xml'/>\r
+  <ComponentRef Id='console.logger'/>\r
+  <ComponentRef Id='discoveryTemplate.html'/>\r
+  <ComponentRef Id='postTemplate.html'/>\r
+  <ComponentRef Id='partialLogout.html'/>\r
+  <ComponentRef Id='protocols.xml'/>\r
+  <ComponentRef Id='securitypolicy.xml'/>\r
+\r
   <ComponentRef Id='accessError.html'/>\r
   <ComponentRef Id='apache.config'/>\r
   <ComponentRef Id='apache2.config'/>\r
@@ -14,8 +41,7 @@
   <ComponentRef Id='sessionError.html'/>\r
   <ComponentRef Id='shibd.logger'/>\r
   <ComponentRef Id='var_log_shibboleth_folder'/>\r
-  <ComponentRef Id='share_xml_shibboleth'/>\r
-  <ComponentRef Id='share_xml_shibboleth_xsd'/>\r
+  <ComponentRef Id='var_run_shibboleth_folder'/>\r
 \r
   <!-- ShibbolethSP-exe-x64-->\r
 \r

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 50e48f0..1164ceb 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -19,7 +19,7 @@
 <?include Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' \r
+  <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' Language='1033' \r
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' \r
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
     <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'\r

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index bd72978..27ed33d 100644 (file)
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -1,20 +1,20 @@
 <?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
+     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
+     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
@@ -22,7 +22,7 @@
   <!-- 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
   <Fragment>\r
     <!-- Files First -->\r
     <!-- Configuration, licenses and documentation -->\r
@@ -31,14 +31,25 @@
       <Directory Id='doc' Name='doc' >\r
         <Directory Id='doc_shibboleth' Name='shibboleth' \r
                    FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc' >\r
-          <!-- TODO seperate components -->\r
-          <Component Id='doc_shibboleth' Guid='{8239E994-8295-4E26-8708-DDF240B486BF}'>\r
+          <Component Id='main.css' Guid='{EA1366EE-0FD1-42E7-9F3F-C19E6C0D12D6}'>\r
             <File Name='main.css' KeyPath='yes'/>\r
+          </Component>\r
+          <Component Id='logo.jpg' Guid='{7F05E91A-A390-4A72-B4DC-1A4FE950B30A}'>\r
             <File Name='logo.jpg' />\r
+          </Component>\r
+          <Component Id='CREDITS.txt' Guid='{9A792E0C-61F1-4D08-9672-BE82FFB6B7F1}'>\r
             <File Name='CREDITS.txt' />\r
+          </Component>\r
+          <Component Id='LICENSE.txt' Guid='{404E7A3C-22C2-4A02-8DC0-7D5C0B25DED1}'>\r
             <File Name='LICENSE.txt' />\r
+          </Component>\r
+          <Component Id='NOTICE.txt' Guid='{80619251-6754-480A-AFAA-D7398482053C}'>\r
             <File Name='NOTICE.txt' />\r
+          </Component>\r
+          <Component Id='README.txt' Guid='{2E5A28EE-B70B-402B-8E6F-72E8EC1EEF0D}'>\r
             <File Name='README.txt'/>\r
+          </Component>\r
+          <Component Id='RELEASE.txt' Guid='{5822AF4E-BE53-4952-B662-6BE2D3913D31}'>\r
             <File Name='RELEASE.txt' />\r
           </Component>\r
         </Directory><!-- doc_shibboleth -->\r
@@ -46,36 +57,70 @@
       <Directory Id='etc' Name='etc' >\r
         <Directory Id='etc_shibboleth' Name='shibboleth' \r
                    FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs' >\r
-          <!-- TODO seperate components -->\r
-          <Component Id='etc_shibboleth_perm' Guid='{1F1B9F9B-6437-46F1-ACE8-8D135612336C}' Permanent='yes'>\r
+          <Component Id='openssl.cnf' Guid='{1F1B9F9B-6437-46F1-ACE8-8D135612336C}' Permanent='yes'>\r
             <File KeyPath='yes' \r
                   Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\apps\openssl.cnf' />\r
+          </Component>\r
+          <Component Id='upgrade.xsl' Guid='{D8D1270C-2F85-4465-8EC0-F5F30A2B3EDD}' Permanent='yes'>\r
             <File Name='upgrade.xsl' />\r
+          </Component>\r
+          <Component Id='examplemetadata.xml' Guid='{D9852008-249D-405D-8059-5DAD307D2723}' \r
+                     Permanent='yes'>\r
             <File Name='example-metadata.xml' />\r
+          </Component>\r
+          <Component Id='exampleshibboleth2.xml' Guid='{85415A41-2B4E-406F-9CFC-63CFC360A9C7}' \r
+                     Permanent='yes'>\r
             <File Name='example-shibboleth2.xml' />\r
           </Component>\r
           <Component Id='etc_shibboleth_nonperm' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'>\r
             <File Name='keygen.bat' KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs\keygen.bat-wix'/>\r
+          </Component>\r
+          <Component Id='xsltproc.js' Guid='{B87F4A53-3C37-45DA-BE6F-C46790FA7C2D}'>\r
             <File Name='xsltproc.js' />\r
           </Component>\r
           <Directory Id='etc_shibboleth_dist' Name='dist' \r
                      FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs' >\r
             <Component Id='dist_noperm' Guid='{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}'>\r
-              <!-- Note that the dir creation here is an accident caused by the inhertited Installer -->\r
-              <CreateFolder Directory='var_run_shibboleth' />\r
+\r
               <File Name='apache22.config.in' KeyPath='yes' />\r
+            </Component>\r
+            <Component Id='sslError.html' Guid='{A74BA230-C49F-4151-BBF4-AA80D554D099}'>\r
               <File Name='sslError.html' />\r
+            </Component>\r
+            <Component Id='bindingTemplate.html' Guid='{F5A3A434-9209-43EC-9314-1F705055DDEC}'>\r
               <File Name='bindingTemplate.html' />\r
+            </Component>\r
+            <Component Id='globalLogout.html' Guid='{E65F580D-5489-4D79-A8FC-F9FFED666FC1}'>\r
               <File Name='globalLogout.html' />\r
+            </Component>\r
+            <Component Id='localLogout.html' Guid='{70FA3A47-A950-4074-BC13-C56D94497BD9}'>\r
               <File Name='localLogout.html' />\r
+            </Component>\r
+            <Component Id='attributemap' Guid='{878C9456-E65F-4541-A0FA-975379EAC6B6}'>\r
               <File Name='attribute-map.xml' />\r
+            </Component>\r
+            <Component Id='attributepolicy' Guid='{55B88F7B-E2EA-4B70-87B7-33C566B9F992}'>\r
               <File Name='attribute-policy.xml'/>\r
+            </Component>\r
+            <Component Id='shibboleth2.xml' Guid='{E520FEDE-3F0E-47C6-9345-47223B82825A}'>\r
               <File Name='shibboleth2.xml' />\r
+            </Component>\r
+            <Component Id='console.logger' Guid='{8AC85980-32B9-4EA2-9245-167FB1AB2570}'>\r
               <File Name='console.logger' />\r
+            </Component>\r
+            <Component Id='discoveryTemplate.html' Guid='{A9573113-4387-46DD-A636-84482AF2C672}'>\r
               <File Name='discoveryTemplate.html' />\r
+            </Component>\r
+            <Component Id='postTemplate.html' Guid='{5B7111E8-8E04-42F1-AB02-E47AFB7C3D28}'>\r
               <File Name='postTemplate.html' />\r
+            </Component>\r
+            <Component Id='partialLogout.html' Guid='{E1F6208B-3C70-4632-B84C-C7D141DC4192}'>\r
               <File Name='partialLogout.html' />\r
+            </Component>\r
+            <Component Id='protocols.xml' Guid='{B226CAAC-2D18-411A-9FBF-3FE237EBEF4D}'>\r
               <File Name='protocols.xml' />\r
+            </Component>\r
+            <Component Id='securitypolicy.xml' Guid='{0EC04525-FCCF-4B60-8797-9B0CEC222B8C}'>\r
               <File Name='security-policy.xml' />\r
             </Component>\r
             <Component Id='accessError.html' Guid='{6FAA81A0-A020-4E60-A37D-1EC4D0D5FD06}' Permanent='yes'>\r
@@ -105,19 +150,21 @@
       <Directory Id='var' Name='var'>\r
         <Directory Id='var_log' Name='log'>\r
           <Directory Id='var_log_shibboleth' Name='shibboleth'>\r
-            <Component Id='var_log_shibboleth_folder' Guid='{2BFC84E4-634B-4D70-910A-D5640739C8C8}' KeyPath='yes'>\r
+            <Component Id='var_log_shibboleth_folder' Guid='{2BFC84E4-634B-4D70-910A-D5640739C8C8}'>\r
               <CreateFolder />\r
             </Component>\r
           </Directory><!-- var_log_shibboleth -->\r
         </Directory><!-- var_log -->\r
         <Directory Id='var_run' Name='run'>\r
-          <Directory Id='var_run_shibboleth' Name='shibboleth' />\r
+          <Directory Id='var_run_shibboleth' Name='shibboleth'>\r
+            <Component Id='var_run_shibboleth_folder' Guid='{35E176B1-965A-4571-B24E-E0C8E69B0459}'>\r
+              <CreateFolder />\r
+            </Component>\r
+          </Directory>\r
         </Directory><!-- var_run -->\r
       </Directory><!-- var -->\r
     </DirectoryRef>\r
-\r
-    <!-- The actions to perform after the files have been copied\r
-      TODO optionally add in the set64shibd set32shibd -->\r
+    \r
     <Binary Id='EditConfigFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix' />\r
     <Binary Id='KeyGenSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_keygen.vbs' />\r
     <CustomAction Id='EditConfigFiles' \r
@@ -126,24 +173,50 @@
     <!-- TODO use QtExecCmdLine -->\r
     <CustomAction Id='KeyGen' BinaryKey='KeyGenSrc' VBScriptCall='' Execute='deferred' Impersonate='no' />\r
     <CustomAction Id='SetKeyGen' Property='KeyGen' Value='[INSTALLDIR]' />\r
-\r
+    \r
     <!-- TODO IIS Install (if not ALREADYINSTALLED)\r
-         IIS Uninstalll (if UGRADINGPRODUCTCODE) -->\r
+         TODO IIS Uninstalll (if UGRADINGPRODUCTCODE) -->\r
     <InstallExecuteSequence>\r
       <Custom Action='SetEditConfigFiles' Before='CostInitialize'>NOT Installed</Custom>\r
-      <!--TODO move editing of the catalog files to the merge module-->\r
       <Custom Action='EditConfigFiles' After='InstallFiles'>NOT Installed</Custom>\r
       <Custom Action='SetKeyGen' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='KeyGen' After='WriteEnvironmentStrings'>NOT Installed</Custom><!--After WriteEnvironmentStrings so the path is set -->\r
-\r
+      <!-- Run KeyGen after WriteEnvironmentStrings so the path is set -->\r
+      <Custom Action='KeyGen' After='WriteEnvironmentStrings'>NOT Installed</Custom>\r
     </InstallExecuteSequence>\r
-\r
+    \r
     <!-- Components\r
+         <ComponentRef Id='main.css'/>\r
+         <ComponentRef Id='logo.jpg'/>\r
+         <ComponentRef Id='CREDITS.txt'/>\r
+         <ComponentRef Id='LICENSE.txt'/>\r
+         <ComponentRef Id='NOTICE.txt'/>\r
+         <ComponentRef Id='README.txt'/>\r
+         <ComponentRef Id='RELEASE.txt'/>\r
+         \r
+         <ComponentRef Id='openssl.cnf'/>\r
+         <ComponentRef Id='upgrade.xsl'/>\r
+         <ComponentRef Id='examplemetadata.xml'/>\r
+         <ComponentRef Id='exampleshibboleth2.xml' \r
 \r
-         <ComponentRef Id='doc_shibboleth'/>\r
-         <ComponentRef Id='etc_shibboleth_perm'/>\r
          <ComponentRef Id='etc_shibboleth_nonperm'/>\r
+\r
          <ComponentRef Id='dist_noperm'/>\r
+         <ComponentRef Id='xsltproc.js'/>\r
+         <ComponentRef Id='sslError.html'/>\r
+         <ComponentRef Id='xsltproc.js'/>\r
+         <ComponentRef Id='bindingTemplate.html'/>\r
+         <ComponentRef Id='globalLogout.html'/>\r
+         <ComponentRef Id='localLogout.html'/>\r
+         <ComponentRef Id='attributemap'/>\r
+         <ComponentRef Id='attributepolicy'/>\r
+         <ComponentRef Id='shibboleth2.xml'/>\r
+         <ComponentRef Id='console.logger'/>\r
+         <ComponentRef Id='discoveryTemplate.html'/>\r
+         <ComponentRef Id='postTemplate.html'/>\r
+         <ComponentRef Id='partialLogout.html'/>\r
+         <ComponentRef Id='protocols.xml'/>\r
+         <ComponentRef Id='security-policy.xml'\r
+\r
          <ComponentRef Id='accessError.html'/>\r
          <ComponentRef Id='apache.config'/>\r
          <ComponentRef Id='apache2.config'/>\r
@@ -152,9 +225,7 @@
          <ComponentRef Id='sessionError.html'/>\r
          <ComponentRef Id='shibd.logger'/>\r
          <ComponentRef Id='var_log_shibboleth_folder'/>\r
-         <ComponentRef Id='share_xml_shibboleth'/>\r
-         <ComponentRef Id='share_xml_shibboleth_xsd'/>\r
+         <ComponentRef Id='var_run_shibboleth_folder'/>  \r
          -->\r
-\r
   </Fragment>\r
 </Wix>\r