More work on x64 bit merge modules. More work needed around the commo schemas

[shibboleth/cpp-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 fa6922d..3553681 100644 (file)
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -22,44 +22,35 @@
 \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'\r
+    <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib (x86)'\r
              Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
-\r
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  \r
-         At a a later date, we may chose to make this a placed module  -->\r
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\r
 \r
     <Directory Id='TARGETDIR' Name='SourceDir'>\r
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib'>\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
-                <File KeyPath='yes' \r
-                      Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\log4shib$(var.LogForShibFileVersion).dll'/>\r
+                <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>\r
               </Component>\r
               <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>\r
-                <File KeyPath='yes' \r
-                      Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\NTEventLogAppender.dll'/>\r
+                <File KeyPath='yes' Name='NTEventLogAppender.dll'/>\r
               </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\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
-                  <File KeyPath='yes' \r
-                        Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\log4shib$(var.LogForShibFileVersion)D.dll'/>\r
+                  <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>\r
                 </Component>\r
                 <Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>\r
-                  <File Id='NTEventLogAppenderD.dll' KeyPath='yes' \r
-                        Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\NTEventLogAppender.dll'/>\r
+                  <File Id='NTEventLogAppenderD.dll' KeyPath='yes' Name='NTEventLogAppender.dll'/>\r
                 </Component>\r
               </Directory><!-- lib_debug-->\r
             </Directory><!-- lib -->\r
             <Directory Id='doc' Name='doc'>\r
-              <Directory Id='doc_shibboleth' Name='shibboleth'>\r
-                <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>\r
-                  <File KeyPath='yes' \r
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />\r
-                </Component>\r
-              </Directory><!-- doc_shibboleth-->\r
+              <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>\r
+                <File KeyPath='yes' \r
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />\r
+              </Component>\r
             </Directory><!-- doc -->\r
           </Directory><!-- shibboleth_SP -->\r
         </Directory><!-- shibboleth -->\r