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

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

diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index 6bf80dd..2b21427 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -22,43 +22,30 @@
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='OpenSAMLMergeModule_x86' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
-    <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML'\r
+    <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML (x86)'\r
              Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign 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
+             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
-\r
+            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\'>\r
               <Component Id='saml2_0.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>\r
-                <File KeyPath='yes'\r
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\saml$(var.OpenSAMLFileVersion).dll' />\r
+                <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
               </Component>\r
               <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>\r
-                <File KeyPath='yes'\r
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\samlsign.exe' />\r
+                <File KeyPath='yes' Name='samlsign.exe' />\r
               </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\r
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug'>\r
                 <Component Id='saml2_0D.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>\r
-                  <File KeyPath='yes'\r
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\saml$(var.OpenSAMLFileVersion)D.dll' />\r
+                  <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
                 </Component>\r
                 <Component Id='samlsign.exe_Debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>\r
-                  <File Id='samlsign.exe_Debug' KeyPath='yes'\r
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug\samlsign.exe' />\r
+                  <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />\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_opensaml' Name='opensaml' />\r
-              </Directory><!-- xml-->\r
-            </Directory><!-- share -->\r
           </Directory><!-- shibboleth_SP -->\r
         </Directory><!-- shibboleth -->\r
       </Directory><!-- ProgramFilesFolder -->\r