[cpp-msbuild] 02/02: Add some more logging and add all the dependenies for a 64 bit MSI 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=90f10c59994a9323bc9c8e9c93ec4817b4e37475

commit 90f10c59994a9323bc9c8e9c93ec4817b4e37475
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Feb 21 19:38:53 2018 +0000

    Add some more logging and add all the dependenies for a 64 bit MSI build
---
 build.make | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/build.make b/build.make
index 601c4bb..5766260 100644
--- a/build.make
+++ b/build.make
@@ -40,7 +40,7 @@ cleansaml:
 
 msi32: exe32 mergemodules32 msi32only
 
-msi64: exe64 mergemodules64 msi64only
+msi64: exe64 mergemodules64 exe32 mergemodules32 msi64only
 
 msi32only:
 	cd $(SPROOT)\Projects\$(VCVERSION)
@@ -53,21 +53,23 @@ msi64only:
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount .\Shibboleth.sln /t:Installers\MergeModules;Installers\Installer
 
 mergemodules32: xmltooling32 saml32 shibsp32
+        title MSM Build 32 bit
+	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount .\Shibboleth.sln /t:Installers\Installer
 
 mergemodules64: xmltooling64 saml64 shibsp64
 
 shibsp32: saml32
 	cd $(SPROOT)\Projects\$(VCVERSION)
-        title SP Release Build - 32 bit
+        title SP-Dll Release Build - 32 bit
 	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
-        title SP Debug Build - 64 bit
+        title SP-Dll Debug Build - 32 bit
 	msbuild  /property:Platform=Win32;Configuration=Debug /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
 
 shibsp64: saml64
 	cd $(SPROOT)\Projects\$(VCVERSION)
-        title SP Release Build - 64 bit
+        title SP-Dll Release Build - 64 bit
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
-        title SP Debug Build - 64 bit
+        title SP-Dll Debug Build - 64 bit
 	msbuild  /property:Platform=x64;Configuration=Debug /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
 
 saml32: xmltooling32
@@ -101,12 +103,16 @@ xmltooling64:
 
 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)
+        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)
 
 
 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)
+        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)
 

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