From e41d0dee48bc4971edfdf6b368b6df8982f61cc7 Mon Sep 17 00:00:00 2001 From: sbohlen Date: Sun, 23 Feb 2014 08:50:22 -0500 Subject: [PATCH] update NANT config settings to support builds on both x86 and x64 processor architectures --- Build.cmd | 1 + build-release-all.cmd | 3 +- ...nant-config-per-processor-architecture.cmd | 38 + .../tools/nant/config/NAnt.exe.config-x64 | 3267 +++++++++++++++++ .../tools/nant/config/NAnt.exe.config-x86 | 3267 +++++++++++++++++ copy-files-to-package-dir.cmd | 1 + 6 files changed, 6576 insertions(+), 1 deletion(-) create mode 100644 build-support/set-nant-config-per-processor-architecture.cmd create mode 100644 build-support/tools/nant/config/NAnt.exe.config-x64 create mode 100644 build-support/tools/nant/config/NAnt.exe.config-x86 diff --git a/Build.cmd b/Build.cmd index be2343dd..5ea17181 100644 --- a/Build.cmd +++ b/Build.cmd @@ -1,4 +1,5 @@ @echo off +call build-support\set-nant-config-per-processor-architecture.cmd @echo . @echo .. @echo ... diff --git a/build-release-all.cmd b/build-release-all.cmd index cb0585cd..24a7a5f1 100644 --- a/build-release-all.cmd +++ b/build-release-all.cmd @@ -1,10 +1,11 @@ @echo off +call build-support\set-nant-config-per-processor-architecture.cmd @echo . @echo .. @echo ... @echo Running full Build Script, capturing output to buildlog.txt file... @echo Start Time: %time% -build-support\tools\nant\bin\nant clean package -f:spring.build -D:project.build.sign=true -D:build-ems=true -D:mstest.exe="c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\mstest.exe" -D:package.version=2.0.0 -D:vs-net.mstest.bin.dir="c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE" > buildlog.txt +build-support\tools\nant\bin\nant clean package -f:spring.build -D:project.build.sign=true -D:build-ems=true -D:test.integration.ems=false -D:test.integration.data=true -D:mstest.exe="c:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\mstest.exe" -D:package.version=2.0.0 -D:vs-net.mstest.bin.dir="c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE" > buildlog.txt @echo . @echo .. @echo ... diff --git a/build-support/set-nant-config-per-processor-architecture.cmd b/build-support/set-nant-config-per-processor-architecture.cmd new file mode 100644 index 00000000..59e21412 --- /dev/null +++ b/build-support/set-nant-config-per-processor-architecture.cmd @@ -0,0 +1,38 @@ +@echo off +REM ************************************************** +REM Batch file to copy the appropriate nant.exe.config file that correlates to the underlying +REM processor architecture of the system on which the build is running. +REM +REM This is necessary b/c the nant.exe.config file contains path-references for .NET Framework assemblies +REM which need to properly depend upon either %programfiles% (for x86 machines) or %programfilesx86% (for x64 machines). +REM As there is no way to make the present version of NANT "processor-architecture-aware", this crude mechanism of +REM maintaining two otherwise identical .config files (one for x86 and one or x64) and copying the appropriate one into the +REM expected location has been implemented. +REM +REM NOTE: until such time as NANT itself becomes able to accommodate the differing .NET framework install paths on x86 and x64 +REM systems, it will be necessary for ANY builds of SPRNET that use NANT to first call this batch/command file to set the +REM proper .config file 'active'. +REM +REM ************************************************** + + +goto %processor_architecture% +goto end + + +:x86 +echo x86 Processor Architecture Detected, setting up nant.exe.config for x86-based .NET reference paths... +copy tools\nant\config\NAnt.exe.config-x86 tools\nant\bin\NAnt.exe.config +goto end + + +:amd64 +echo AMD64 Processor Architecture Detected, setting up nant.exe.config for x64-based .NET reference paths. +copy tools\nant\config\NAnt.exe.config-x64 tools\nant\bin\NAnt.exe.config +goto end + +:ia64 +echo IA64 Processor Architecture Detected -- WARNING: this processor architecture is not supported by the Spring.NET build scripts! +goto end + +:end diff --git a/build-support/tools/nant/config/NAnt.exe.config-x64 b/build-support/tools/nant/config/NAnt.exe.config-x64 new file mode 100644 index 00000000..04f38c2d --- /dev/null +++ b/build-support/tools/nant/config/NAnt.exe.config-x64 @@ -0,0 +1,3267 @@ + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + sn + + + lc + + + false + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + sn + + + lc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The .NET Framework 1.1 SDK is not installed. + + + + true + true + true + + + cfresgen + + + sn + + + lc + + + + + + + + + + + + + + + + + + + + + + + + + + + The .NET Framework 2.0 SDK is not installed. + + + + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + ${csc.tool} + true + true + true + ${csc.supportsdocgeneration} + true + true + true + true + + + mjs + true + + + ${mbas.tool} + true + + + ${resgen.tool} + true + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + gmcs + true + true + true + ${csc.supportsdocgeneration} + true + true + true + true + + + mjs + strict + + + vbnc + true + + + ${resgen.tool} + true + ${resgen.supportsexternalfilereferences} + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + gmcs + true + linq + true + true + true + true + true + true + true + + + mjs + strict + + + vbnc + true + + + true + true + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + dmcs + true + linq + true + true + true + true + true + true + true + + + mjs + strict + + + vbnc + true + + + true + true + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + smcs + true + true + true + true + true + true + true + true + + + true + true + + + sn + + + false + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + sn + + + false + + + true + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/. + + + + + + + + + + + + + + + + true + + + ${path::combine(prefix, 'lib/mono/1.0/mcs.exe')} + true + true + true + ${csc.supportsdocgeneration} + true + true + true + true + + + mjs + true + + + ${path::combine(prefix, 'lib/mono/1.0/mbas.exe')} + true + + + ${resgen.tool} + true + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/. + + + + + + + + + + + + + + + + + + + + + true + + + gmcs + true + true + true + ${csc.supportsdocgeneration} + true + true + true + true + + + mjs + strict + + + vbnc + true + + + ${resgen.tool} + true + ${resgen.supportsexternalfilereferences} + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/. + + + + + + + + true + + + gmcs + true + linq + true + true + true + true + true + true + true + + + mjs + strict + + + vbnc + true + + + true + true + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/. + + + + + + + + true + + + dmcs + true + linq + true + true + true + true + true + true + true + + + mjs + strict + + + vbnc + true + + + true + true + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/. + + + + + + + smcs + true + true + true + true + true + true + true + true + + + true + true + + + sn + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build-support/tools/nant/config/NAnt.exe.config-x86 b/build-support/tools/nant/config/NAnt.exe.config-x86 new file mode 100644 index 00000000..1054409b --- /dev/null +++ b/build-support/tools/nant/config/NAnt.exe.config-x86 @@ -0,0 +1,3267 @@ + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + sn + + + lc + + + false + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + sn + + + lc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The .NET Framework 1.1 SDK is not installed. + + + + true + true + true + + + cfresgen + + + sn + + + lc + + + + + + + + + + + + + + + + + + + + + + + + + + + The .NET Framework 2.0 SDK is not installed. + + + + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + true + true + + + true + + + true + true + true + true + + + true + true + + + sn + + + lc + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + ${csc.tool} + true + true + true + ${csc.supportsdocgeneration} + true + true + true + true + + + mjs + true + + + ${mbas.tool} + true + + + ${resgen.tool} + true + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + gmcs + true + true + true + ${csc.supportsdocgeneration} + true + true + true + true + + + mjs + strict + + + vbnc + true + + + ${resgen.tool} + true + ${resgen.supportsexternalfilereferences} + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + gmcs + true + linq + true + true + true + true + true + true + true + + + mjs + strict + + + vbnc + true + + + true + true + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + dmcs + true + linq + true + true + true + true + true + true + true + + + mjs + strict + + + vbnc + true + + + true + true + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + smcs + true + true + true + true + true + true + true + true + + + true + true + + + sn + + + false + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + sn + + + false + + + true + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/. + + + + + + + + + + + + + + + + true + + + ${path::combine(prefix, 'lib/mono/1.0/mcs.exe')} + true + true + true + ${csc.supportsdocgeneration} + true + true + true + true + + + mjs + true + + + ${path::combine(prefix, 'lib/mono/1.0/mbas.exe')} + true + + + ${resgen.tool} + true + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/. + + + + + + + + + + + + + + + + + + + + + true + + + gmcs + true + true + true + ${csc.supportsdocgeneration} + true + true + true + true + + + mjs + strict + + + vbnc + true + + + ${resgen.tool} + true + ${resgen.supportsexternalfilereferences} + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/. + + + + + + + + true + + + gmcs + true + linq + true + true + true + true + true + true + true + + + mjs + strict + + + vbnc + true + + + true + true + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/. + + + + + + + + true + + + dmcs + true + linq + true + true + true + true + true + true + true + + + mjs + strict + + + vbnc + true + + + true + true + + + sn + true + + + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unable to locate 'mono' module using pkg-config. Download the Mono development packages from http://www.mono-project.com/downloads/. + + + + + + + smcs + true + true + true + true + true + true + true + true + + + true + true + + + sn + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/copy-files-to-package-dir.cmd b/copy-files-to-package-dir.cmd index d7b32702..11334092 100644 --- a/copy-files-to-package-dir.cmd +++ b/copy-files-to-package-dir.cmd @@ -1,4 +1,5 @@ @echo off +call build-support\set-nant-config-per-processor-architecture.cmd @echo . @echo .. @echo ...