[cpp-msbuild] 02/02: Make file improvements

[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=44bfafb3a83ef7d66f2a6c3fc0eb504b6cdef4a2

commit 44bfafb3a83ef7d66f2a6c3fc0eb504b6cdef4a2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jun 21 11:10:05 2016 +0100

    Make file improvements
    
    Add a "title" command to the various stages so we can track
    progress.
    
    Separate cleaning into sub topics (more to aid the debig of
    the build process)
---
 build.make | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/build.make b/build.make
index b8aa65f..a9cbe95 100644
--- a/build.make
+++ b/build.make
@@ -11,13 +11,23 @@ VCVERSION=VC10
 # The targets.  We want to build the two installers
 #
 all: msi32 msi64
+     title Build Complete
 
-clean: 
+clean: cleanxmltooling cleansaml cleansp cleanmsi
+
+cleansp:
 	cd $(SPROOT)\Build\$(VCVERSION)
-	del/s *.dll *.exe *.msm *.lib *.obj
-	del/s *.wixobj *.lib *.wixlib  *.pdb *.wixpdb *.wixlib  *.msi 
+	del/s *.dll *.exe *.lib *.obj *.pdb *.lib
+
+cleanmsi:
+	cd $(SPROOT)\MSI\WIX
+	del/s *.wixobj *.wixlib *.wixpdb *.wixlib  *.msi *.msm
+
+cleanxmltooling:
 	cd $(XMLROOT)\Build\$(VCVERSION)
 	del/s *.dll *.exe *.msm *.lib *.obj
+
+cleansp:
 	cd $(SAMLROOT)\Build\$(VCVERSION)
 	del/s *.dll *.exe *.msm *.lib *.obj
 
@@ -28,10 +38,12 @@ msi64: exe64 mergemodules64 msi64only
 
 msi32only:
 	cd $(SPROOT)\Projects\$(VCVERSION)
+        title MSI Build 32 bit
 	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount .\Shibboleth.sln /t:Installers\MergeModules;Installers\Installer
 
 msi64only:
 	cd $(SPROOT)\Projects\$(VCVERSION)
+        title MSI Build 64 bit
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount .\Shibboleth.sln /t:Installers\MergeModules;Installers\Installer
 
 mergemodules32: xmltooling32 saml32 shibsp32
@@ -40,33 +52,45 @@ mergemodules64: xmltooling64 saml64 shibsp64
 
 shibsp32: saml32
 	cd $(SPROOT)\Projects\$(VCVERSION)
+        title SP Release Build - 32 bit
 	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
+        title SP Debug Build - 64 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
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
+        title SP Debug Build - 64 bit
 	msbuild  /property:Platform=x64;Configuration=Debug /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
 
 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
+        title SAML Debug Build - 32 bit
 	msbuild  /property:Platform=Win32;Configuration=Debug /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
 
 
 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
+        title SAML Debug Build - 64 bit
 	msbuild  /property:Platform=x64;Configuration=Debug /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
 
 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
+        title XMLTooling Debug Build - 32 bit
 	msbuild  /property:Platform=Win32;Configuration=Debug /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
 
 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
+        title XMLTooling Debug Build - 64 bit
 	msbuild  /property:Platform=x64;Configuration=Debug /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
 
 exe32: shibsp32

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