[cpp-msbuild] branch master updated: SSPCPP-800 Fix default (no debug) build

[Rod Widdowson]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  045b197   SSPCPP-800  Fix default (no debug) build
045b197 is described below

commit 045b19702de1261529bc711e26805f4d21274b7b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri May 11 17:00:35 2018 +0100

    SSPCPP-800  Fix default (no debug) build
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-800
    
    When I made the Debug build optional I missed a condition so
    OpenSAMLL was still trying to build debug and failed because
    there was no XMLTOOLING.
    
    Also fix some logging.
---
 build.make | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.make b/build.make
index b84f4f2..bd9032c 100644
--- a/build.make
+++ b/build.make
@@ -88,9 +88,10 @@ saml32: xmltooling32
         title SAML Release Build - 32 bit
 	cd $(SAMLROOT)\Projects\$(VCVERSION)
 	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
+!if "$(DEBUG_INSTALLER)" != ""
         title SAML Debug Build - 32 bit
 	msbuild  /property:Platform=Win32;Configuration=Debug /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
-
+!endif
 
 saml64: xmltooling64
 	cd $(SAMLROOT)\Projects\$(VCVERSION)
@@ -124,7 +125,7 @@ exe32: shibsp32
         title SP Release Build - 32 bit
 	msbuild /property:Platform=Win32;Configuration=Release /maxcpucount .\shibboleth.sln /t:utilities\messages;utilities\resolvertest;utilities\mdquery;Extensions\adfs;Extensions\adfs-lite;Extensions\odbc-store;Extensions\plugins;Extensions\plugins-lite;$(SERVER_MODULES_32)
 !if "$(DEBUG_INSTALLER)" != ""
-        title SP Release Build - 32 bit
+        title SP Debug Build - 32 bit
 	msbuild   /property:Platform=Win32;Configuration=Debug /maxcpucount .\shibboleth.sln /t:utilities\messages;utilities\resolvertest;utilities\mdquery;Extensions\adfs;Extensions\adfs-lite;Extensions\odbc-store;Extensions\plugins;Extensions\plugins-lite;$(SERVER_MODULES_32)
 !endif
 

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