update NANT config settings to support builds on both x86 and x64 processor architectures

This commit is contained in:
sbohlen
2014-02-23 08:50:22 -05:00
parent 9a2907a8a1
commit e41d0dee48
6 changed files with 6576 additions and 1 deletions

View File

@@ -1,4 +1,5 @@
@echo off
call build-support\set-nant-config-per-processor-architecture.cmd
@echo .
@echo ..
@echo ...

View File

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

View File

@@ -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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,5 @@
@echo off
call build-support\set-nant-config-per-processor-architecture.cmd
@echo .
@echo ..
@echo ...