X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=msi%2FWiX%2FMergeModules%2FLog4Shib-x86.wxs;h=355368192125ed0da604e18e2ea4a17afdaacf57;hb=a0ecb351fef7987d5dafd700099afae83bce6678;hp=fa6922dab1715490383b6d2a1f5fd92ec9c1990e;hpb=2b7f2fa612124ec54c4c2277ac600a58602939e0;p=shibboleth%2Fcpp-sp.git

diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
index fa6922d..3553681 100644
--- a/msi/WiX/MergeModules/Log4Shib-x86.wxs
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -22,44 +22,35 @@
 
 <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'
+    <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='200' Platform='x86'/>
-
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
-         At a a later date, we may chose to make this a placed module  -->
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_SP' Name='SP'>
-            <Directory Id='lib' Name='lib'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\'>
               <Component Id='log4shib.dll' Guid='{2FDE8ED0-774A-4F44-88D5-C7089350D895}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\log4shib$(var.LogForShibFileVersion).dll'/>
+                <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>
               </Component>
               <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>
-                <File KeyPath='yes' 
-                      Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\NTEventLogAppender.dll'/>
+                <File KeyPath='yes' Name='NTEventLogAppender.dll'/>
               </Component>
-              <Directory Id='lib_debug' Name='debug'>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\'>
                 <Component Id='log4shibD.dll' Guid='{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}'>
-                  <File KeyPath='yes' 
-                        Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\log4shib$(var.LogForShibFileVersion)D.dll'/>
+                  <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>
                 </Component>
                 <Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>
-                  <File Id='NTEventLogAppenderD.dll' KeyPath='yes' 
-                        Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\NTEventLogAppender.dll'/>
+                  <File Id='NTEventLogAppenderD.dll' KeyPath='yes' Name='NTEventLogAppender.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
-              <Directory Id='doc_shibboleth' Name='shibboleth'>
-                <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>
-                  <File KeyPath='yes' 
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />
-                </Component>
-              </Directory><!-- doc_shibboleth-->
+              <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>
+                <File KeyPath='yes' 
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\LOG4CPP.LICENSE' />
+              </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->
         </Directory><!-- shibboleth -->