[shibboleth-sp2] 19/23: SSPCPP-765 Share ZLIB install dir location with dll build

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi pushed a commit to branch master
in repository shibboleth-sp2.

commit ddfa4bbf940a60502be03d5b07dddef4c1b7369d
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Sat Dec 9 11:18:54 2017 -0500

    SSPCPP-765 Share ZLIB install dir location with dll build
    
        https://issues.shibboleth.net/jira/browse/SSPCPP-765
---
 msi/WiX/MergeModules/MergeModules.make | 19 ++++++++++---------
 msi/WiX/MergeModules/Zlib-x64.wxs      |  4 ++--
 msi/WiX/MergeModules/Zlib-x86.wxs      |  4 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index 27d04a3..1c23d4f 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -80,7 +80,7 @@ Log4Shib-x86.wixobj: Log4Shib-x86.wxs\
 			$(BuildSP)\$(log4shib)\ms$(MsVCVersion)\Debug\log4shib$(Log4ShibFileVersion)D.dll\
 			$(BuildSP)\$(log4shib)\ms$(MsVCVersion)\Release\log4shib$(Log4ShibFileVersion).dll
 	wixcop -indent:2 Log4Shib-x86.wxs
-	candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dlog4shib=$(log4shib)\ 
+	candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dlog4shib=$(log4shib)\
 							-dLog4ShibFileVersion=$(Log4ShibFileVersion)\
                             -dLog4ShibComponent32=$(Log4ShibComponent32) -dLog4ShibComponent32d=$(Log4ShibComponent32d)\
                             -dShibbolethMsVersion=$(MsVCVersion)
@@ -90,7 +90,7 @@ Log4Shib-x64.wixobj: Log4Shib-x64.wxs\
 			$(BuildSP)\$(log4shib)\ms$(MsVCVersion)\x64\Release\log4shib$(Log4ShibFileVersion).dll
 	wixcop -indent:2 Log4Shib-x64.wxs
 	candle Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion)\
-                            -dlog4shib=$(log4shib)\ 
+                            -dlog4shib=$(log4shib)\
                             -dLog4ShibComponent64=$(Log4ShibComponent64) -dLog4ShibComponent64d=$(Log4ShibComponent64d) -dShibbolethMsVersion=$(MsVCVersion)
 
 #
@@ -289,15 +289,16 @@ zlib-x64.msm: zlib-x64.wixobj
 	light zlib-x64.wixobj
 	del ..\*64*.msi
 
-zlib-x86.wixobj: zlib-x86.wxs $(BuildSP)\zlib-$(ZlibVersion)\Release\zlib$(ZlibFileVersion).dll $(BuildSP)\zlib-$(ZlibVersion)\Debug\zlib$(ZlibFileVersion)d.dll
+zlib-x86.wixobj: zlib-x86.wxs $(BuildSP)\$(zlib)\Release\zlib$(ZlibFileVersion).dll \
+                              $(BuildSP)\$(zlib)\Debug\zlib$(ZlibFileVersion)d.dll
 	wixcop -indent:2 zlib-x86.wxs
-	candle zlib-x86.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib32Component=$(Zlib32Component)\
-                        -dZlib32Componentd=$(Zlib32Componentd)
+	candle zlib-x86.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) \
+						-dZlib32Component=$(Zlib32Component) -dZlib32Componentd=$(Zlib32Componentd) -dzlib=$(zlib)
 
-zlib-x64.wixobj: zlib-x64.wxs $(BuildSP)\zlib-$(ZlibVersion)\x64\Release\zlib$(ZlibFileVersion).dll\
-                              $(BuildSP)\zlib-$(ZlibVersion)\x64\Debug\zlib$(ZlibFileVersion)d.dll
+zlib-x64.wixobj: zlib-x64.wxs $(BuildSP)\$(zlib)\x64\Release\zlib$(ZlibFileVersion).dll\
+                              $(BuildSP)\$(zlib)\x64\Debug\zlib$(ZlibFileVersion)d.dll
 	wixcop -indent:2 zlib-x64.wxs
-	candle zlib-x64.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib64Component=$(Zlib64Component)\
-                        -dZlib64Componentd=$(Zlib64Componentd)
+	candle zlib-x64.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) \
+                        -dZlib64Component=$(Zlib64Component) -dZlib64Componentd=$(Zlib64Componentd)  -dzlib=$(zlib)
 
 #
diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
index e23ad4f..beca9c0 100644
--- a/msi/WiX/MergeModules/Zlib-x64.wxs
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs
@@ -28,12 +28,12 @@
             <Directory Id='lib' Name='lib'>
               <Component Id='zlib1.dll' Guid='$(var.Zlib64Component)' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes'
-                      Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\x64\Release\zlib$(var.ZlibFileVersion).dll'/>
+                      Source='$(var.BuildDirectory)\$(var.zlib)\x64\Release\zlib$(var.ZlibFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='zlib1d.dll' Guid='$(var.Zlib64Componentd)' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes'
-                        Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\x64\Debug\zlib$(var.ZlibFileVersion)d.dll'/>
+                        Source='$(var.BuildDirectory)\$(var.zlib)\x64\Debug\zlib$(var.ZlibFileVersion)d.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/Zlib-x86.wxs b/msi/WiX/MergeModules/Zlib-x86.wxs
index 56c7318..396154f 100644
--- a/msi/WiX/MergeModules/Zlib-x86.wxs
+++ b/msi/WiX/MergeModules/Zlib-x86.wxs
@@ -28,12 +28,12 @@
             <Directory Id='lib' Name='lib'>
               <Component Id='zlib1.dll' Guid='$(var.Zlib32Component)'>
                 <File KeyPath='yes' Checksum='yes'
-                      Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Release\zlib$(var.ZlibFileVersion).dll'/>
+                      Source='$(var.BuildDirectory)\$(var.zlib)\Release\zlib$(var.ZlibFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='zlib1d.dll' Guid='$(var.Zlib32Componentd)'>
                   <File KeyPath='yes' Checksum='yes'
-                        Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Debug\zlib$(var.ZlibFileVersion)d.dll'/>
+                        Source='$(var.BuildDirectory)\$(var.zlib)\Debug\zlib$(var.ZlibFileVersion)d.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git