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

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

diff --git a/msi/WiX/MergeModules/XmlTooling-x86.wxs b/msi/WiX/MergeModules/XmlTooling-x86.wxs
index add03b7..38280ea 100644 (file)
--- a/msi/WiX/MergeModules/XmlTooling-x86.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-x86.wxs
@@ -22,42 +22,30 @@
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='XmlToolingMergeModule_x86' Language='1033' Version='$(var.XmlToolingVersion)'>\r
-    <Package Id='{29A047F2-DECA-45A7-97D8-801217B3C632}' Description='Merge Module for XMLTooling'\r
+    <Package Id='{29A047F2-DECA-45A7-97D8-801217B3C632}' Description='Merge Module for XMLTooling (x86)'\r
              Comments='This module is built by the Shibboleth Consortium. Includes DDLs and Schema'\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
-\r
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\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)\cvs\2.0\cpp-xmltooling\Release'>\r
               <Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>\r
-                <File Id='xmltooling.dll'\r
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
+                <File Id='xmltooling.dll' Name='xmltooling$(var.XmlToolingFileVersion).dll' />\r
               </Component>\r
               <Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>\r
-                <File Id='xmltoolinglite.dll'\r
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
+                <File Id='xmltoolinglite.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
               </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\r
+              <Directory Id='lib_debug' Name='debug' \r
+                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug'>\r
                 <Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>\r
-                  <File Id='xmltoolingD.dll'\r
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
+                  <File Id='xmltoolingD.dll' Name='xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
                 </Component>\r
                 <Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>\r
-                  <File Id='xmltoolingliteD.dll'\r
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
+                  <File Id='xmltoolingliteD.dll' Name='xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
                 </Component>\r
               </Directory><!-- lib_debug-->\r
             </Directory><!-- lib -->\r
-            <Directory Id='share' Name='share'>\r
-              <Directory Id='share_xml' Name='xml'>\r
-                <Directory Id='share_xml_xmltooling' Name='xmltooling' />\r
-              </Directory><!-- xml-->\r
-            </Directory><!-- share -->\r
           </Directory><!-- shibboleth_sp -->\r
         </Directory><!-- shibboleth -->\r
       </Directory><!-- ProgramFiles -->\r