[cpp-sp COMMIT] in /branches/REL_2/msi/WiX/MergeModules: Log4Shib-x64.wxs Log4Shib-x86.wxs OpenSAML-x64.wxs OpenSAML-...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Oct 22 06:36:39 2012
New Revision: 3793

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3793&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-506

Start the exbed the component GUIDS which need to change on every name change preparatory to moving them up to Versions.props


Modified:
    branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Log4Shib-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs

Modified: branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs?rev=3793&r1=3792&r2=3793&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs Mon Oct 22 06:36:39 2012
@@ -17,6 +17,8 @@
    permissions and limitations under the License.  -->
 
 <?include ..\Versions.wxi ?>
+<?define Log4ShibComponent64d='{792E6762-70FE-418A-9336-39DDF1A6BAE7}'?>
+<?define Log4ShibComponent64='{DA7E5213-363E-4E13-B05D-90905BE9FB94}'?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>
@@ -29,14 +31,14 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'>
-              <Component Id='log4shib.dll' Guid='{DA7E5213-363E-4E13-B05D-90905BE9FB94}' Win64='yes'>
+              <Component Id='log4shib.dll' Guid='$(var.Log4ShibComponent64)' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>
               </Component>
               <Component Id='NTEventLogAppender.dll' Guid='{1A559035-DCA4-4297-AE94-C3E6ABB37662}' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Debug\'>
-                <Component Id='log4shibD.dll' Guid='{792E6762-70FE-418A-9336-39DDF1A6BAE7}' Win64='yes'>
+                <Component Id='log4shibD.dll' Guid='$(var.Log4ShibComponent64d)' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>
                 </Component>
                 <Component Id='NTEventLogAppender.dll_debug' Guid='{6C23C432-EA11-4313-9F5F-DBB09A8752E8}' Win64='yes'>

Modified: branches/REL_2/msi/WiX/MergeModules/Log4Shib-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Log4Shib-x86.wxs?rev=3793&r1=3792&r2=3793&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Log4Shib-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Log4Shib-x86.wxs Mon Oct 22 06:36:39 2012
@@ -18,6 +18,9 @@
 
 <?include ..\Versions.wxi ?>
 
+<?define Log4ShibComponent32d={B8D2E797-F5A8-4E0D-B57F-9A7D4E699942} ?>
+<?define Log4ShibComponent32={2FDE8ED0-774A-4F44-88D5-C7089350D895} ?>
+
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>
     <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib (x86)'
@@ -29,14 +32,14 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
             <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\'>
-              <Component Id='log4shib.dll' Guid='{2FDE8ED0-774A-4F44-88D5-C7089350D895}'>
+              <Component Id='log4shib.dll' Guid='$(var.Log4ShibComponent32)'>
                 <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>
               </Component>
               <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>
                 <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\'>
-                <Component Id='log4shibD.dll' Guid='{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}'>
+                <Component Id='log4shibD.dll' Guid='$(var.Log4ShibComponent32d)'>
                   <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>
                 </Component>
                 <Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>

Modified: branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs

[... 111 lines stripped ...]