Move editing for config.xml into the merge modules. Add a Shibboleth-schemas merge...

[shibboleth/cpp-sp.git] / msi / WiX / MergeModules / Zlib-x64.wxs

diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
index e2a6740..7729850 100644 (file)
--- a/msi/WiX/MergeModules/Zlib-x64.wxs
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs
@@ -15,15 +15,13 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define ZlibVersion='1.2.5' ?>\r
-<?define ZlibFileVersion='1' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>\r
     <Package Id='{68821F70-8952-4778-8149-85A93E4BF426}' Description='Merge Module for Zlib (x64)'\r
              Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x64'/>\r
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
 \r
     <Directory Id='TARGETDIR' Name='SourceDir'>\r
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
@@ -32,12 +30,12 @@
             <Directory Id='lib' Name='lib'>\r
               <Component Id='zlib1.dll' Guid='{792D44C3-3DCE-465D-AAFF-520AB2F20DA2}' Win64='yes'>\r
                 <File KeyPath='yes'\r
-                      Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'/>\r
+                      Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win64_DLL_Release\zlib$(var.ZlibFileVersion).dll'/>\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug'>\r
                 <Component Id='zlib1d.dll' Guid='{74D67C6F-655E-4E4D-A147-39F32DB6E796}' Win64='yes'>\r
                   <File Id='zlib1d.dll' KeyPath='yes' \r
-                        Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
+                        Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win64_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
                 </Component>\r
               </Directory><!-- lib_debug-->\r
             </Directory><!-- lib -->\r