SSPCPP-506 - Start the exbed the component GUIDS which need to change on every name...

https://issues.shibboleth.net/jira/browse/SSPCPP-506

diff --git a/msi/WiX/MergeModules/Log4Shib-x64.wxs b/msi/WiX/MergeModules/Log4Shib-x64.wxs
index 9732828..6e03c74 100644 (file)
--- a/msi/WiX/MergeModules/Log4Shib-x64.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x64.wxs
@@ -17,6 +17,8 @@
    permissions and limitations under the License.  -->\r
 \r
 <?include ..\Versions.wxi ?>\r
+<?define Log4ShibComponent64d='{792E6762-70FE-418A-9336-39DDF1A6BAE7}'?>\r
+<?define Log4ShibComponent64='{DA7E5213-363E-4E13-B05D-90905BE9FB94}'?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>\r
@@ -29,14 +31,14 @@
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_SP' Name='SP'>\r
             <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'>\r
-              <Component Id='log4shib.dll' Guid='{DA7E5213-363E-4E13-B05D-90905BE9FB94}' Win64='yes'>\r
+              <Component Id='log4shib.dll' Guid='$(var.Log4ShibComponent64)' Win64='yes'>\r
                 <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>\r
               </Component>\r
               <Component Id='NTEventLogAppender.dll' Guid='{1A559035-DCA4-4297-AE94-C3E6ABB37662}' Win64='yes'>\r
                 <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Debug\'>\r
-                <Component Id='log4shibD.dll' Guid='{792E6762-70FE-418A-9336-39DDF1A6BAE7}' Win64='yes'>\r
+                <Component Id='log4shibD.dll' Guid='$(var.Log4ShibComponent64d)' Win64='yes'>\r
                   <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>\r
                 </Component>\r
                 <Component Id='NTEventLogAppender.dll_debug' Guid='{6C23C432-EA11-4313-9F5F-DBB09A8752E8}' Win64='yes'>\r

diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index ab96d28..670cfa9 100644 (file)
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -18,6 +18,9 @@
 \r
 <?include ..\Versions.wxi ?>\r
 \r
+<?define Log4ShibComponent32d={B8D2E797-F5A8-4E0D-B57F-9A7D4E699942} ?>\r
+<?define Log4ShibComponent32={2FDE8ED0-774A-4F44-88D5-C7089350D895} ?>\r
+\r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>\r
     <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib (x86)'\r
@@ -29,14 +32,14 @@
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_SP' Name='SP'>\r
             <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\'>\r
-              <Component Id='log4shib.dll' Guid='{2FDE8ED0-774A-4F44-88D5-C7089350D895}'>\r
+              <Component Id='log4shib.dll' Guid='$(var.Log4ShibComponent32)'>\r
                 <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>\r
               </Component>\r
               <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>\r
                 <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\'>\r
-                <Component Id='log4shibD.dll' Guid='{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}'>\r
+                <Component Id='log4shibD.dll' Guid='$(var.Log4ShibComponent32d)'>\r
                   <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>\r
                 </Component>\r
                 <Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>\r

diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index 047277a..35aa5a9 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -17,6 +17,12 @@
    permissions and limitations under the License.  -->\r
 \r
 <?include ..\Versions.wxi ?>\r
+<?define XMLToolingComponent64='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' ?>\r
+<?define XMLToolingComponent64d='{C380627F-9D45-4626-A249-3831FC7C83FC}' ?>\r
+<?define XMLToolingLiteComponent64='{060F61B9-36E9-4F33-9B5B-C59A43709052}' ?> \r
+<?define XMLToolingLiteComponent64d='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' ?>\r
+<?define SamlComponent64='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' ?>\r
+<?define SamlComponent64d='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6} ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='OpenSAMLMergeModule_x64' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
@@ -29,30 +35,30 @@
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_SP' Name='SP'>\r
             <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Release\'>\r
-              <Component Id='saml.dll' Guid='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' Win64='yes'>\r
+              <Component Id='saml.dll' Guid='$(var.SamlComponent64)' Win64='yes'>\r
                 <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
               </Component>\r
               <Component Id='samlsign.exe' Guid='{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}' Win64='yes'>\r
                 <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />\r
               </Component>\r
-              <Component Id='xmltooling.dll' Guid='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' Win64='yes'>\r
+              <Component Id='xmltooling.dll' Guid='$(var.XMLToolingComponent64)' Win64='yes'>\r
                 <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
               </Component>\r
-              <Component Id='xmltooling_lite.dll' Guid='{060F61B9-36E9-4F33-9B5B-C59A43709052}' Win64='yes'>\r
+              <Component Id='xmltooling_lite.dll' Guid='$(var.XMLToolingLiteComponent64)' Win64='yes'>\r
                 <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Debug\'>\r
-                <Component Id='samlD.dll' Guid='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' Win64='yes'>\r
+                <Component Id='samlD.dll' Guid='$(var.SamlComponent64d)' Win64='yes'>\r
                   <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
                 </Component>\r
                 <Component Id='samlsign.exe_debug' Guid='{A6588914-93E1-4FAF-B237-39C0240EECB1}' Win64='yes'>\r
                   <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />\r
                 </Component>\r
-                <Component Id='xmltoolingD.dll' Guid='{C380627F-9D45-4626-A249-3831FC7C83FC}' Win64='yes'>\r
+                <Component Id='xmltoolingD.dll' Guid='$(var.XMLToolingComponent64d)' Win64='yes'>\r
                   <File KeyPath='yes' Checksum='yes'\r
                     Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
                 </Component>\r
-                <Component Id='xmltooling_liteD.dll' Guid='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' Win64='yes'>\r
+                <Component Id='xmltooling_liteD.dll' Guid='$(var.XMLToolingLiteComponent64d)' Win64='yes'>\r
                   <File KeyPath='yes' Checksum='yes'\r
                     Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
                 </Component>\r

diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index 3964ee1..ccd44c6 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -17,6 +17,12 @@
    permissions and limitations under the License.  -->\r
 \r
 <?include ..\Versions.wxi ?>\r
+<?define SamlComponent32='{B52F8C71-2042-4CDF-A250-BD773985A2AB}' ?>\r
+<?define XMLToolingComponent32='{53533A59-A563-439D-B13D-A4D7090C42D3}' ?>\r
+<?define XMLToolingLiteComponent32='{5045A722-D6D6-4E55-9196-CB7C50B4446F}' ?>\r
+<?define SamlComponent32d='{7B934257-5F7F-428E-930E-A793A11573D7}' ?>\r
+<?define XMLToolingComponent32d='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}' ?>\r
+<?define XMLToolingLiteComponent32d='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}' ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='OpenSAMLMergeModule_x86' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
@@ -29,30 +35,30 @@
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_SP' Name='SP'>\r
             <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Release\'>\r
-              <Component Id='saml.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>\r
+              <Component Id='saml.dll' Guid='$(var.SamlComponent32)'>\r
                 <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
               </Component>\r
               <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>\r
                 <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />\r
               </Component>\r
-              <Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>\r
+              <Component Id='xmltooling.dll' Guid='$(var.XMLToolingComponent32)'>\r
                 <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
               </Component>\r
-              <Component Id='xmltooling_lite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>\r
+              <Component Id='xmltooling_lite.dll' Guid='$(var.XMLToolingLiteComponent32)'>\r
                 <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Debug\'>\r
-                <Component Id='samlD.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>\r
+                <Component Id='samlD.dll' Guid='$(var.SamlComponent32d)'>\r
                   <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
                 </Component>\r
                 <Component Id='samlsign.exe_debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>\r
                   <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />\r
                 </Component>\r
-                <Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>\r
+                <Component Id='xmltoolingD.dll' Guid='$(var.XMLToolingComponent32d)'>\r
                   <File KeyPath='yes' Checksum='yes'\r
                     Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
                 </Component>\r
-                <Component Id='xmltooling_liteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>\r
+                <Component Id='xmltooling_liteD.dll' Guid='$(var.XMLToolingLiteComponent32d)'>\r
                   <File KeyPath='yes' Checksum='yes'\r
                     Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
                 </Component>\r