[cpp-msbuild] branch master updated: SSPCPP-782 Do not put debug DLLs and EXEs into 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-msbuild.

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

The following commit(s) were added to refs/heads/master by this push:
       new  9f1ced8   SSPCPP-782 Do not put debug DLLs and EXEs into the installer
9f1ced8 is described below

commit 9f1ced8f90b370a5bac75b09ff74fb8aa56ce348
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Mar 15 14:48:32 2018 +0000

    SSPCPP-782 Do not put debug DLLs and EXEs into the installer
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-782
    
    Introduce an environmental variable DEBUG_INSTALLER which if not
    set to YES will cause the msi and sms files to be built without
    the debug dll and exes.
    
    To speed up the build, undtr this configuration we do not build them
    for XMLTooling, OpenSAML and Shibboleth.  The dependency build
    (currently) builds both variants.
---
 build.make              | 22 +++++++++++++++++++++-
 dependencies/config.bat |  4 +++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/build.make b/build.make
index 5766260..56629ae 100644
--- a/build.make
+++ b/build.make
@@ -8,6 +8,13 @@ XMLROOT=$(ROOT_DIR)\cpp-xmltooling
 SAMLROOT=$(ROOT_DIR)\cpp-opensaml
 VCVERSION=VC15
 
+!if "$(DEBUG_INSTALLER)" != ""
+!if "$(DEBUG_INSTALLER)" != "YES"
+!error DEBUG_INSTALLER must be "YES" or not present: value $(DEBUG_INSTALLER)
+!endif
+!endif
+
+
 SERVER_MODULES_32=shibd;"Server Modules\isapi_shib";"Server Modules\iis7_shib";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24"
 SERVER_MODULES_64=shibd;"Server Modules\isapi_shib";"Server Modules\iis7_shib";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24"
 # fastCGI: "Server Modules\fastcgi\shibauthorizer";"Server Modules\fastcgi\shibresponder"
@@ -62,15 +69,19 @@ shibsp32: saml32
 	cd $(SPROOT)\Projects\$(VCVERSION)
         title SP-Dll Release Build - 32 bit
 	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
+!if "$(DEBUG_INSTALLER)" != ""
         title SP-Dll Debug Build - 32 bit
 	msbuild  /property:Platform=Win32;Configuration=Debug /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
+!endif
 
 shibsp64: saml64
 	cd $(SPROOT)\Projects\$(VCVERSION)
         title SP-Dll Release Build - 64 bit
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
+!if "$(DEBUG_INSTALLER)" != ""
         title SP-Dll Debug Build - 64 bit
 	msbuild  /property:Platform=x64;Configuration=Debug /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
+!endif
 
 saml32: xmltooling32
         title SAML Release Build - 32 bit
@@ -84,35 +95,44 @@ saml64: xmltooling64
 	cd $(SAMLROOT)\Projects\$(VCVERSION)
         title SAML Release Build - 64 bit
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
+!if "$(DEBUG_INSTALLER)" != ""
         title SAML Debug Build - 64 bit
 	msbuild  /property:Platform=x64;Configuration=Debug /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
+!endif
 
 xmltooling32:
 	cd $(XMLROOT)\Projects\$(VCVERSION)
         title XMLTooling Release Build - 32 bit
 	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
+!if "$(DEBUG_INSTALLER)" != ""
         title XMLTooling Debug Build - 32 bit
 	msbuild  /property:Platform=Win32;Configuration=Debug /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
+!endif
 
 xmltooling64:
 	cd $(XMLROOT)\Projects\$(VCVERSION)
         title XMLTooling Release Build - 64 bit
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
+!if "$(DEBUG_INSTALLER)" != ""
         title XMLTooling Debug Build - 64 bit
 	msbuild  /property:Platform=x64;Configuration=Debug /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
+!endif
 
 exe32: shibsp32
 	cd $(SPROOT)\Projects\$(VCVERSION)
         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
 	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
 
 
 exe64: shibsp64
 	cd $(SPROOT)\Projects\$(VCVERSION)
         title SP Release Build - 64 bit
 	msbuild /property:Platform=x64;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_64)
+!if "$(DEBUG_INSTALLER)" != ""
         title SP Debug Build - 64 bit
 	msbuild   /property:Platform=x64;Configuration=Debug /maxcpucount .\shibboleth.sln /t:utilities\resolvertest;utilities\messages;utilities\mdquery;Extensions\adfs;Extensions\adfs-lite;Extensions\odbc-store;Extensions\plugins;Extensions\plugins-lite;$(SERVER_MODULES_64)
-
+!endif
diff --git a/dependencies/config.bat b/dependencies/config.bat
index f3842ff..372bbcb 100644
--- a/dependencies/config.bat
+++ b/dependencies/config.bat
@@ -9,7 +9,7 @@ if "%1" NEQ "" goto %1%
 set ROOT_DIR=C:\Users\scantor\Shibboleth\
 set CPP_MM_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.11.25325\MergeModules
 set SED=C:\cygwin64\bin\sed.exe
-
+rem set DEBUG_INSTALLER=YES
 
 #
 # Apache Config
@@ -27,6 +27,8 @@ goto path_done
 set ROOT_DIR=H:\Perforce\VS2017\
 set SED=sed
 set CPP_MM_DIR=D:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.12.25810\MergeModules
+set DEBUG_INSTALLER=YES
+
 
 ##
 ## Apache Config

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