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

[shibboleth/cpp-sp.git] / msi / WiX / MergeModules / Log4Shib-x64.wxs

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