[shibboleth-sp2] 07/82: SSPCPP-689 Simplify installer dependencies

[Etienne Dysli Metref]

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

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

commit b04dca1689a4bc7f6310f151fb008bd3dfa262e0
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Tue Dec 27 16:57:02 2016 +0000

    SSPCPP-689 Simplify installer dependencies
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-689
    
    With OpenSSL V1 where we get the dlls and installers for curl and
    OpenSSL change.  It therefore is no longer reasonable to have them
    as dependencies for the installer so remove them.
---
 msi/WiX/MergeModules/MergeModules.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index 76e926d..72b3a22 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -23,7 +23,7 @@ Curl-x64.msm: Curl-x64.wixobj
 	light Curl-x64.wixobj
 	del ..\*64*.msi
 
-Curl-x64.wixobj: Curl-x64.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl5.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurl5d.dll
+Curl-x64.wixobj: Curl-x64.wxs
 	wixcop -indent:2 Curl-x64.wxs 
 	candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)
 
@@ -31,7 +31,7 @@ Curl-x86.msm: Curl-x86.wixobj
 	light Curl-x86.wixobj
 	del ..\*32*.msi
 
-Curl-x86.wixobj: Curl-x86.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl5.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurl5d.dll 
+Curl-x86.wixobj: Curl-x86.wxs
 	wixcop -indent:2 Curl-x86.wxs 
 	candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)
 
@@ -111,11 +111,11 @@ OpenSSL-x64.msm: OpenSSL-x64.wixobj
 	light OpenSSL-x64.wixobj
 	del ..\*64*.msi
 
-OpenSSL-x86.wixobj: OpenSSL-x86.wxs  $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\libeay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\ssleay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\openssl.exe $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\libeay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\ssleay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll [...]
+OpenSSL-x86.wixobj: OpenSSL-x86.wxs
 	wixcop -indent:2 OpenSSL-x86.wxs 
 	candle OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay32Component=$(LibEay32Component) -dSSlEay32Component=$(SSlEay32Component) -dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd)
 
-OpenSSL-x64.wixobj: OpenSSL-x64.wxs  $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll\libeay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll\ssleay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll\openssl.exe $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll.dbg\libeay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll.dbg\ssleay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll [...]
+OpenSSL-x64.wixobj: OpenSSL-x64.wxs
 	wixcop -indent:2 OpenSSL-x64.wxs 
 	candle OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay64Component=$(LibEay64Component) -dSSlEay64Component=$(SSlEay64Component) -dLibEay64Componentd=$(LibEay64Componentd) -dSSlEay64Componentd=$(SSlEay64Componentd)
 

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