[cpp-msbuild] branch master updated: SPCPP-765 Start working towards a common environment

[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=9364953fafd70a90e1d5297ea991adf689758642

The following commit(s) were added to refs/heads/master by this push:
       new  9364953   SPCPP-765 Start working towards a common environment
9364953 is described below

commit 9364953fafd70a90e1d5297ea991adf689758642
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Dec 4 16:24:39 2017 +0000

    SPCPP-765 Start working towards a common environment
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-765
    
    ROOT_DIR will eventually supersede BuildRoot.
---
 Versions.props               |  2 ++
 build.make                   |  8 +++++---
 dependencies/dependency.make |  6 ++----
 env.make                     | 10 ++++++++++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Versions.props b/Versions.props
index 4903e5d..1badb59 100644
--- a/Versions.props
+++ b/Versions.props
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="VersionMacros">
+	<BuildRoot Condition="'$(BuildRoot)'==''">$(ROOT_DIR)\</BuildRoot>
+
     <MsVCVersion>vc15</MsVCVersion>
     <!-- NO TRAILING '\' for the following.  Default value is C:\Program Files (x86)\Common Files\Merge Modules -->
     <CppMmDir>D:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.11.25325\MergeModules</CppMmDir>
diff --git a/build.make b/build.make
index be0d3e1..11e1c11 100644
--- a/build.make
+++ b/build.make
@@ -1,9 +1,11 @@
+!Include ..\env.make
 #
 # Short cuts to make things easier
+#
 
-SPROOT=$(MAKEDIR)\..\cpp-sp
-XMLROOT=$(MAKEDIR)\..\cpp-xmltooling
-SAMLROOT=$(MAKEDIR)\..\cpp-opensaml
+SPROOT=$(ROOT_DIR)\cpp-sp
+XMLROOT=$(ROOT_DIR)\cpp-xmltooling
+SAMLROOT=$(ROOT_DIR)\cpp-opensaml
 VCVERSION=VC15
 
 SERVER_MODULES_32=shibd;"Server Modules\isapi_shib";"Server Modules\iis7_shib";"Server Modules\mod_shib_22";"Server Modules\mod_shib_24"
diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index db43a6a..494ae73 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -27,9 +27,7 @@ XercesInstallDir=Install64\VC15
 !error "Target architecture must be x86 or x64"
 !endif
 
-!if "$(ROOT_DIR)" == ""
-!error ROOT_DIR not defined
-!endif
+!Include ..\env.make
 
 !if "$(VISUALSTUDIOVERSION)" != "15.0"
 !error this code only known to work with VC15
@@ -346,4 +344,4 @@ xsec-release: test-env openssl-release xerces-release
 	title Build XmlSecurity $(VSCMD_ARG_TGT_ARCH) Release
 	cd $(ROOT_DIR)\$(XSEC_DIR)
 	set ForceImportBeforeCppTargets=$(ROOT_DIR)\cpp-msbuild\dependencies\xsec.props
-	msbuild /m projects\VC15.0\xsec\xsec.sln /p:Configuration="Release Minimal" /m  /t:Build /p:Platform=$(XsecBuildArch)
\ No newline at end of file
+	msbuild /m projects\VC15.0\xsec\xsec.sln /p:Configuration="Release Minimal" /m  /t:Build /p:Platform=$(XsecBuildArch)
diff --git a/env.make b/env.make
new file mode 100644
index 0000000..800f33a
--- /dev/null
+++ b/env.make
@@ -0,0 +1,10 @@
+##
+## Common Include file for Shibboleth nMake.
+##
+
+!if "$(ROOT_DIR)" == ""
+!error ROOT_DIR not defined
+!endif
+
+environment:
+	@echo	ROOT_DIR 		$(ROOT_DIR)

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