[cpp-sp] branch master updated: SSPCPP-782 Remove Debug executables from the installer

[Rod Widdowson]

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=7bcb88798bd1c88a1977ff3721bf79794a86541f

The following commit(s) were added to refs/heads/master by this push:
       new  7bcb887   SSPCPP-782 Remove Debug executables from the installer
7bcb887 is described below

commit 7bcb88798bd1c88a1977ff3721bf79794a86541f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 30 16:21:47 2018 +0100

    SSPCPP-782 Remove Debug executables from the installer
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-782
    
    Bugfix: Make sure that the "Debug variant carries
    the debug executables for the Merge Modules"
---
 Projects/vc15/wix/MergeModules.vcxproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Projects/vc15/wix/MergeModules.vcxproj b/Projects/vc15/wix/MergeModules.vcxproj
index cedcb27..3cd5978 100644
--- a/Projects/vc15/wix/MergeModules.vcxproj
+++ b/Projects/vc15/wix/MergeModules.vcxproj
@@ -74,7 +74,7 @@ nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) CurlF
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <NMakeBuildCommandLine>
 cd ..\..\..\msi\Wix\MergeModules
-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 [...]
+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) 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 [...]
+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>

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