[cpp-msbuild] branch master updated: CPPXT-106 XMLTooling builds into a per VS=version directory

[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.

The following commit(s) were added to refs/heads/master by this push:
       new  9dc8f93   CPPXT-106 XMLTooling builds into a per VS=version directory
9dc8f93 is described below

commit 9dc8f939a4049b9ed3eb704d9223ebe7656bdd92
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Apr 25 15:31:37 2016 +0100

    CPPXT-106 XMLTooling builds into a per VS=version directory
    
    https://issues.shibboleth.net/jira/browse/CPPXT-106
---
 build.make | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.make b/build.make
index e8dc3fe..8cc6af3 100644
--- a/build.make
+++ b/build.make
@@ -4,6 +4,7 @@
 SPROOT=$(MAKEDIR)\..\cpp-sp
 XMLROOT=$(MAKEDIR)\..\cpp-xmltooling
 SAMLROOT=$(MAKEDIR)\..\cpp-opensaml
+VCVERSION=VC10
 
 
 #
@@ -15,7 +16,7 @@ clean:
 	cd $(SPROOT)
 	del/s *.dll *.exe *.msm *.lib *.obj
 	del/s *.wixobj *.lib *.wixlib  *.pdb *.wixpdb *.wixlib  *.msi 
-	cd $(XMLROOT)
+	cd $(XMLROOT)\Build\$(VCVERSION)
 	del/s *.dll *.exe *.msm *.lib *.obj
 	cd $(SAMLROOT)
 	del/s *.dll *.exe *.msm *.lib *.obj
@@ -59,12 +60,12 @@ saml64: xmltooling64
 	msbuild  /property:Platform=x64;Configuration=Debug /maxcpucount cpp-opensaml2.sln /t:saml;samlsign
 
 xmltooling32:
-	cd $(XMLROOT)
+	cd $(XMLROOT)\Projects\$(VCVERSION)
 	msbuild  /property:Platform=Win32;Configuration=Release /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
 	msbuild  /property:Platform=Win32;Configuration=Debug /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
 
 xmltooling64:
-	cd $(XMLROOT)
+	cd $(XMLROOT)\Projects\$(VCVERSION)
 	msbuild  /property:Platform=x64;Configuration=Release /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
 	msbuild  /property:Platform=x64;Configuration=Debug /maxcpucount cpp-xmltooling.sln /t:xmltooling;xmltooling-lite
 

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