Fixes and cleanups, successful 2.5 build.

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3668 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
index 68f80ee..e24a52c 100644 (file)
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -31,7 +31,7 @@
             <Directory Id='lib' Name='lib'>\r
               <Component Id='libcurl.dll' Guid='{14BDB19A-B7F1-4038-B114-8388F3FF07F0}' Win64='yes'>\r
                 <File KeyPath='yes' Checksum='yes'\r
-                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.64\libcurl.dll'/>\r
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll'/>\r
               </Component>\r
               <Component Id='curl.exe' Guid='{52103377-AEF6-4533-B0CE-D3A786D2D17E}' Win64='yes'>\r
                 <File KeyPath='yes' Checksum='yes'\r
@@ -40,7 +40,7 @@
               <Directory Id='lib_debug' Name='debug'>\r
                 <Component Id='libcurld.dll' Guid='{6F225F9F-25CD-4F6D-8A8F-01C6DD0F0959}' Win64='yes'>\r
                   <File KeyPath='yes' Checksum='yes'\r
-                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.64\libcurld.dll'/>\r
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll'/>\r
                 </Component>\r
                 <Component Id='curl.exe_debug' Guid='{F363D42B-8CB6-4ED8-B2D3-3637B6110E38}' Win64='yes'>\r
                   <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'\r
@@ -49,7 +49,7 @@
               </Directory><!-- lib_debug-->\r
             </Directory><!-- lib -->\r
             <Directory Id='doc' Name='doc'>\r
-              <Component Id='CURL.LICENSE' Guid='{838175A6-8CC3-45D3-9A5E-C4C4147076E9}'>\r
+              <Component Id='CURL.LICENSE' Guid='{838175A6-8CC3-45D3-9A5E-C4C4147076E9}' Win64='yes'>\r
                 <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />\r
               </Component>\r
             </Directory><!-- doc -->\r

diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index fceaed0..047277a 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -56,7 +56,7 @@
                   <File KeyPath='yes' Checksum='yes'\r
                     Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
                 </Component>\r
-              </Directory> <!-- lib_debug -->\r
+              </Directory><!-- lib_debug -->\r
             </Directory><!-- lib -->\r
             <Directory Id='doc' Name='doc'>\r
               <Component Id='doc' Guid='{F858AC39-4C24-4255-A86E-4747FE45624E}' Win64='yes'>\r
@@ -64,7 +64,7 @@
                 <File Name='OPENSAML.NOTICE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt' />\r
                 <File Name='OPENSAML.README' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt' />\r
               </Component>\r
-            </Directory> <!-- doc -->\r
+            </Directory><!-- doc -->\r
           </Directory><!--shibboleth_SP-->\r
         </Directory><!--shibboleth-->\r
       </Directory><!--ProgramFiles64Folder-->\r

diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index e3893f5..57f6d25 100644 (file)
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -40,7 +40,7 @@
               </Directory><!-- lib_debug-->\r
             </Directory><!-- lib -->\r
             <Directory Id='doc' Name='doc'>\r
-              <Component Id='XERCES.LICENSE' Guid='{12731F0B-681B-4154-9B02-BEB219954D44}'>\r
+              <Component Id='XERCES.LICENSE' Guid='{12731F0B-681B-4154-9B02-BEB219954D44}' Win64='yes'>\r
                 <File KeyPath='yes' Name='XERCES.LICENSE'\r
                     Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\LICENSE' />\r
               </Component>\r

diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index 57552a8..bd02f99 100644 (file)
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -76,7 +76,7 @@
               </Directory><!-- lib_debug-->\r
             </Directory><!-- lib -->\r
             <Directory Id='doc' Name='doc'>\r
-              <Component Id='SANTUARIO.LICENSE' Guid='{07288B10-ED5A-443F-BC90-CFD987C798C4}'>\r
+              <Component Id='SANTUARIO.LICENSE' Guid='{07288B10-ED5A-443F-BC90-CFD987C798C4}' Win64='yes'>\r
                 <File KeyPath='yes' Name='SANTUARIO.LICENSE'\r
                   Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE.txt' />\r
               </Component>\r

diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 6c24535..7ce0f8e 100644 (file)
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -31,8 +31,8 @@
   <ComponentRef Id='protocols.xml'/>\r
   <ComponentRef Id='security_policy.xml'/>\r
   <ComponentRef Id='accessError.html'/>\r
-  <ComponentRef Id='apache.config'/>\r
-  <ComponentRef Id='apache2.config'/>\r
+  <ComponentRef Id='apache.config.in'/>\r
+  <ComponentRef Id='apache2.config.in'/>\r
   <ComponentRef Id='apache22.config.in'/>\r
   <ComponentRef Id='apache24.config.in'/>\r
   <ComponentRef Id='metadataError.html'/>\r
@@ -51,7 +51,7 @@
   <ComponentRef Id='mdquery.exe_debug'/>\r
 \r
   <ComponentRef Id='adfs.so'/>\r
-  <ComponentRef Id='adfslite.so'/>\r
+  <ComponentRef Id='adfs_lite.so'/>\r
   <ComponentRef Id='isapi_shib.dll'/>\r
   <ComponentRef Id='mod_shib_13.so'/>\r
   <ComponentRef Id='mod_shib_20.so'/>\r

diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
index 5b6903e..ef3962b 100644 (file)
--- a/msi/WiX/ShibbolethSP-exe-x64.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x64.wxs
@@ -44,7 +44,7 @@
           <Component Id='adfs64.so' Guid='{2891ECDC-F507-4CEC-8A65-8B20FB93F4B7}' Win64='yes'>\r
             <File KeyPath='yes' Checksum='yes' Id='adfs64.so' Name='adfs.so' />\r
           </Component>\r
-          <Component Id='adfslite64.so' Guid='{1162CDA0-C3F8-4599-B01E-9EDAA73B2C0B}' Win64='yes'>\r
+          <Component Id='adfs_lite64.so' Guid='{1162CDA0-C3F8-4599-B01E-9EDAA73B2C0B}' Win64='yes'>\r
             <File KeyPath='yes' Checksum='yes' Id='adfslite64.so' Name='adfs-lite.so' />\r
           </Component>\r
           <Component Id='isapi_shib64.dll' Guid='{3BC7260B-D035-4F79-A39E-EDA0181BBB1B}' Win64='yes'>\r

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 31a32ed..857bac5 100644 (file)
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -83,7 +83,7 @@
             <Component Id='apache22.config.in' Guid='{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}'>\r
               <File KeyPath='yes' Name='apache22.config.in' />\r
             </Component>\r
-            <Component Id='apache24.config.in' Guid='{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}'>\r
+            <Component Id='apache24.config.in' Guid='{3562B68A-E54A-4F1B-9F10-BDACB5FFE8CB}'>\r
               <File KeyPath='yes' Name='apache24.config.in' />\r
             </Component>\r
             <Component Id='sslError.html' Guid='{A74BA230-C49F-4151-BBF4-AA80D554D099}'>\r