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

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

diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index 6e2a674..09e2e1a 100644 (file)
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -23,52 +23,40 @@
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>\r
-    <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL'\r
+    <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL (x86)'\r
              Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'\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
     <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)\openssl-$(var.OpenSSLDirVersion)\out32dll\'>\r
               <Component Id='libeay32.dll' Guid='{38378D46-4CF2-4DE5-A30D-79F92AD6DD06}'>\r
-                <File KeyPath='yes'\r
-                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\libeay32_$(var.OpenSSLFileVersion).dll' />\r
+                <File KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
               </Component>\r
               <Component Id='ssleay32.dll' Guid='{9C1CAE5E-F8E9-4EBA-961B-1DD149097702}'>\r
-                <File KeyPath='yes'\r
-                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\ssleay32_$(var.OpenSSLFileVersion).dll' />\r
+                <File KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\r
               </Component>\r
               <Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>\r
-                <File KeyPath='yes'\r
-                      Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\openssl.exe' />\r
+                <File KeyPath='yes' Name='openssl.exe' />\r
               </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\r
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\' >\r
                 <Component Id='libeay32.dll_debug' Guid='{86C4099A-1E75-4676-8F6D-BF5748F657B6}'>\r
-                  <File Id='libeay32.dll_debug' KeyPath='yes'\r
-                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
+                  <File Id='libeay32.dll_debug' KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
                 </Component>\r
                 <Component Id='ssleay32.dll_debug' Guid='{2097A37D-650E-45F4-96C0-94C748DEA49C}'>\r
-                  <File Id='ssleay32.dll_debug' KeyPath='yes'\r
-                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
+                  <File Id='ssleay32.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
                 </Component>\r
                 <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>\r
-                  <File Id='openssl.exe_debug'\r
-                        Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\openssl.exe' />\r
+                  <File Id='openssl.exe_debug' Name='openssl.exe' />\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='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>\r
-                  <File KeyPath='yes' \r
-                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />\r
-                </Component>\r
-              </Directory><!-- doc_shibboleth-->\r
+              <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>\r
+                <File KeyPath='yes' \r
+                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />\r
+              </Component>\r
             </Directory><!-- doc -->\r
           </Directory><!-- shibboleth_sp -->\r
         </Directory><!-- shibboleth -->\r