Remove all inline (changeable) components and reference to Versions.wxi.

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

diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index 85135c3..815bea2 100644 (file)
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -16,13 +16,8 @@
    implied.  See the License for the specific language governing
    permissions and limitations under the License.  -->
 
-<?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)'>
+  <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.Log4ShibVersion)'>
     <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib (x86)'
              Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
@@ -31,16 +26,16 @@
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
-            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.Log4ShibVersion)\msvc10\Release\'>
               <Component Id='log4shib.dll' Guid='$(var.Log4ShibComponent32)'>
-                <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>
+                <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.Log4ShibFileVersion).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\'>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.Log4ShibVersion)\msvc10\Debug\'>
                 <Component Id='log4shibD.dll' Guid='$(var.Log4ShibComponent32d)'>
-                  <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>
+                  <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.Log4ShibFileVersion)D.dll'/>
                 </Component>
                 <Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>
                   <File Id='NTEventLogAppender.dll_debug' KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
@@ -49,7 +44,7 @@
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>
-                <File KeyPath='yes' Name='LOG4SHIB.LICENSE' Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\COPYING' />
+                <File KeyPath='yes' Name='LOG4SHIB.LICENSE' Source='$(var.BuildDirectory)\log4shib-$(var.Log4ShibVersion)\COPYING' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->