[cpp-msbuild] branch main updated: SSPCPP-947 Windows Installer should force rebuild the MSMs

[Rod Widdowson]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
     new ce3aac4  SSPCPP-947 Windows Installer should force rebuild the MSMs
ce3aac4 is described below

commit ce3aac492fdb0290b884b089446b3a8daab8481a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Nov 27 13:29:31 2021 +0000

    SSPCPP-947 Windows Installer should force rebuild the MSMs
    
    https://shibboleth.atlassian.net/browse/SSPCPP-947
---
 build.make | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/build.make b/build.make
index b954662..9d3b5b3 100644
--- a/build.make
+++ b/build.make
@@ -27,7 +27,7 @@ SERVER_MODULES_64=shibd;"Server Modules\isapi_shib";"Server Modules\iis7_shib";"
 all: msi32 msi64
      title Build Complete
 
-clean: cleanxmltooling cleansaml cleansp cleanmsi
+clean: cleanxmltooling cleansaml cleansp cleanmsi cleanmergemodules32 cleanmergemodules64
 
 cleansp:
 	cd $(SPROOT)\Build\$(VCVERSION)
@@ -45,10 +45,17 @@ cleansaml:
 	cd $(SAMLROOT)\Build\$(VCVERSION)
 	del/s *.dll *.exe *.msm *.lib *.obj
 
+cleanmergemodules32:
+	cd $(SPROOT)\msi\WiX\MergeModules
+	del/s *-x86.wixobj *-x86.msm *-x86.wixpdb
 
-msi32: exe32 mergemodules32 msi32only
+cleanmergemodules64:
+	cd $(SPROOT)\msi\WiX\MergeModules
+	del /s *-x64.wixobj *-x64.msm *-x64.wixpdb
 
-msi64: exe64 mergemodules64 exe32 mergemodules32 msi64only
+msi32: exe32 cleanmergemodules32 mergemodules32 msi32only
+
+msi64: exe64 cleanmergemodules64 mergemodules64 exe32 cleanmergemodules32 mergemodules32 msi64only
 
 msi32only:
 	cd $(SPROOT)\Projects\$(VCVERSION)
@@ -61,10 +68,12 @@ msi64only:
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount .\Shibboleth.sln /t:Installers\MergeModules;Installers\Installer
 
 mergemodules32: xmltooling32 saml32 shibsp32
+	cd $(SPROOT)\Projects\$(VCVERSION)
         title MSM Build 32 bit
 	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount .\Shibboleth.sln /t:Installers\Installer
 
 mergemodules64: xmltooling64 saml64 shibsp64
+	cd $(SPROOT)\Projects\$(VCVERSION)
 
 shibsp32: saml32
 	cd $(SPROOT)\Projects\$(VCVERSION)

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