[cpp-msbuild] branch master updated: SSPCPP-689 Move SP's projects files into the Projects dir

[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=4c229033c591ae6dc5e7fd4c43a2f489031aa2c8

The following commit(s) were added to refs/heads/master by this push:
       new  4c22903   SSPCPP-689 Move SP's projects files into the Projects dir
4c22903 is described below

commit 4c229033c591ae6dc5e7fd4c43a2f489031aa2c8
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jun 20 15:30:20 2016 +0100

    SSPCPP-689 Move SP's projects files into the Projects dir
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-689
---
 build.make | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.make b/build.make
index 25cdd5b..05fc46f 100644
--- a/build.make
+++ b/build.make
@@ -13,7 +13,7 @@ VCVERSION=VC10
 all: msi32 msi64
 
 clean: 
-	cd $(SPROOT)
+	cd $(SPROOT)\Build\$(VCVERSION)
 	del/s *.dll *.exe *.msm *.lib *.obj
 	del/s *.wixobj *.lib *.wixlib  *.pdb *.wixpdb *.wixlib  *.msi 
 	cd $(XMLROOT)\Build\$(VCVERSION)
@@ -27,11 +27,11 @@ msi32: exe32 mergemodules32 msi32only
 msi64: exe64 mergemodules64 msi64only
 
 msi32only:
-	cd $(SPROOT)
+	cd $(SPROOT)\Projects\$(VCVERSION)
 	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount .\Shibboleth.sln /t:Installers\MergeModules;Installers\Installer
 
 msi64only:
-	cd $(SPROOT)
+	cd $(SPROOT)\Projects\$(VCVERSION)
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount .\Shibboleth.sln /t:Installers\MergeModules;Installers\Installer
 
 mergemodules32: xmltooling32 saml32 shibsp32
@@ -39,12 +39,12 @@ mergemodules32: xmltooling32 saml32 shibsp32
 mergemodules64: xmltooling64 saml64 shibsp64
 
 shibsp32: saml32
-	cd $(SPROOT)
+	cd $(SPROOT)\Projects\$(VCVERSION)
 	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
 	msbuild  /property:Platform=Win32;Configuration=Debug /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
 
 shibsp64: saml64
-	cd $(SPROOT)
+	cd $(SPROOT)\Projects\$(VCVERSION)
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
 	msbuild  /property:Platform=x64;Configuration=Debug /maxcpucount .\shibboleth.sln /t:shibsp;shibsp-lite
 

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