[cpp-sp] 02/02: SSPCPP-758 Uniquify Curl DLL file name.

Rod Widdowson rdw at steadingsoftware.com
Fri Jan 19 08:05:06 EST 2018 

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

rdw pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=ae8e5ed9665d4f4351221c772bfc72d959d2d7d0

commit ae8e5ed9665d4f4351221c772bfc72d959d2d7d0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jan 19 12:22:09 2018 +0000

    SSPCPP-758 Uniquify Curl DLL file name.
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-758
    
    Future proofing against api-creep inspired "DLL hell".
---
 Projects/vc15/wix/MergeModules.vcxproj | 8 ++++----
 msi/WiX/MergeModules/Curl-x64.wxs      | 8 ++++----
 msi/WiX/MergeModules/Curl-x86.wxs      | 8 ++++----
 msi/WiX/MergeModules/MergeModules.make | 6 ++++--
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Projects/vc15/wix/MergeModules.vcxproj b/Projects/vc15/wix/MergeModules.vcxproj
index 883b00e..2989ee0 100644
--- a/Projects/vc15/wix/MergeModules.vcxproj
+++ b/Projects/vc15/wix/MergeModules.vcxproj
@@ -58,7 +58,7 @@ nmake /f MergeModules.make clean</NMakeReBuildCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <NMakeBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) log4shib=$(log4shib) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLT [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) CurlFileVersion=$(CurlFileVersion) LibCurlGuid32=$(LibCurlGuid32) LibCurlGuid64=$(LibCurlGuid64) LibCurlGuid32d=$(LibCurlGuid32d) LibCurlGuid64d=$(LibCurlGuid64d) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) log4shib=$(log4shib) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ O [...]
     <NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
 del *86.wixobj
 del *86.msm
@@ -67,14 +67,14 @@ del OpenSAML-schemas.wixpdb
 del OpenSAML-schemas.wixobj
 del OpenSAML-schemas.msm</NMakeCleanCommandLine>
     <NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion)  log4shib=$(log4shib) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d)  SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) X [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) CurlFileVersion=$(CurlFileVersion) LibCurlGuid32=$(LibCurlGuid32) LibCurlGuid64=$(LibCurlGuid64) LibCurlGuid32d=$(LibCurlGuid32d) LibCurlGuid64d=$(LibCurlGuid64d) FastCGIVersion=$(FastCGIVersion)  log4shib=$(log4shib) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d)  SolutionDir=$(SolutionDir)..\..\ [...]
     <NMakePreprocessorDefinitions>
     </NMakePreprocessorDefinitions>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <NMakeBuildCommandLine>
 cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion) log4shib=$(log4shib) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XML [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) CurlFileVersion=$(CurlFileVersion) LibCurlGuid32=$(LibCurlGuid32) LibCurlGuid64=$(LibCurlGuid64) LibCurlGuid32d=$(LibCurlGuid32d) LibCurlGuid64d=$(LibCurlGuid64d) FastCGIVersion=$(FastCGIVersion) log4shib=$(log4shib) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ O [...]
     <NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
 del *64.wixobj
 del *64.msm 
@@ -83,7 +83,7 @@ del OpenSAML-schemas.wixpdb
 del OpenSAML-schemas.wixobj
 del OpenSAML-schemas.msm</NMakeCleanCommandLine>
     <NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) log4shib=$(log4shib) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLT [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) CurlFileVersion=$(CurlFileVersion) LibCurlGuid32=$(LibCurlGuid32) LibCurlGuid64=$(LibCurlGuid64) LibCurlGuid32d=$(LibCurlGuid32d) LibCurlGuid64d=$(LibCurlGuid64d) FastCGIVersion=$(FastCGIVersion) log4shib=$(log4shib) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ O [...]
     <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
   </PropertyGroup>
diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
index 804b1c4..313d80b 100644
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -33,18 +33,18 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
-              <Component Id='libcurl5.dll' Guid='{2A1FBA83-FA2B-4E89-8C58-F1753B878B57}' Win64='yes'>
+              <Component Id='libcurl5.dll' Guid='$(var.LibCurlGuid64)' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes'
-                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseDllDir)\libcurl5.dll'/>
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseDllDir)\libcurl$(var.CurlFileVersion).dll'/>
               </Component>
               <Component Id='curl.exe' Guid='{52103377-AEF6-4533-B0CE-D3A786D2D17E}' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseExeDir)\curl.exe'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
-                <Component Id='libcurl5d.dll' Guid='{0F38951E-CB25-417C-918D-54D62851EBC7}' Win64='yes'>
+                <Component Id='libcurl5d.dll' Guid='$(var.LibCurlGuid64d)' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes'
-                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugDllDir)\libcurl5d.dll'/>
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugDllDir)\libcurl$(var.CurlFileVersion)d.dll'/>
                 </Component>
                 <Component Id='curl.exe_debug' Guid='{F363D42B-8CB6-4ED8-B2D3-3637B6110E38}' Win64='yes'>
                   <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index a3a9001..c0f4fc1 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -32,18 +32,18 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
-              <Component Id='libcurl5.dll' Guid='{2497836C-20B2-4218-A53A-CD9E091FB9AC}'>
+              <Component Id='libcurl5.dll' Guid='$(var.LibCurlGuid32)'>
                 <File KeyPath='yes' Checksum='yes'
-                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseDllDir)\libcurl5.dll'/>
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseDllDir)\libcurl$(var.CurlFileVersion).dll'/>
               </Component>
               <Component Id='curl.exe' Guid='{67A6F011-9715-43C2-92F1-70FE53E935AD}'>
                 <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.ReleaseExeDir)\curl.exe'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
-                <Component Id='libcurl5d.dll' Guid='{0F97DFC6-87F4-45DE-81A7-51D189603FCF}'>
+                <Component Id='libcurl5d.dll' Guid='$(var.LibCurlGuid32d)'>
                   <File KeyPath='yes' Checksum='yes'
-                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugDllDir)\libcurl5d.dll'/>
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\$(var.DebugDllDir)\libcurl$(var.CurlFileVersion)d.dll'/>
                 </Component>
                 <Component Id='curl.exe_debug' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>
                   <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index 57e825e..0614b2d 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -30,7 +30,8 @@ Curl-x64.msm: Curl-x64.wixobj
 Curl-x64.wixobj: Curl-x64.wxs
 	wixcop -indent:2 Curl-x64.wxs
 	candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\
-			 -dShibbolethMsVersion=$(MsVCVersion)
+			 -dShibbolethMsVersion=$(MsVCVersion) -dCurlFileVersion=$(CurlFileVersion)\
+             -dLibCurlGuid64=$(LibCurlGuid64) -dLibCurlGuid64d=$(LibCurlGuid64d)
 
 Curl-x86.msm: Curl-x86.wixobj
 	light Curl-x86.wixobj
@@ -39,7 +40,8 @@ Curl-x86.msm: Curl-x86.wixobj
 Curl-x86.wixobj: Curl-x86.wxs
 	wixcop -indent:2 Curl-x86.wxs
 	candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\
-			-dShibbolethMsVersion=$(MsVCVersion)
+			-dShibbolethMsVersion=$(MsVCVersion) -dCurlFileVersion=$(CurlFileVersion)\
+             -dLibCurlGuid32=$(LibCurlGuid32) -dLibCurlGuid32d=$(LibCurlGuid32d)
 
 #
 # FastCGI

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the commits mailing list