Skip to content

Commit e41d0de

Browse files
committed
update NANT config settings to support builds on both x86 and x64 processor architectures
1 parent 9a2907a commit e41d0de

6 files changed

+6576
-1
lines changed

Diff for: Build.cmd

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@echo off
2+
call build-support\set-nant-config-per-processor-architecture.cmd
23
@echo .
34
@echo ..
45
@echo ...

Diff for: build-release-all.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
@echo off
2+
call build-support\set-nant-config-per-processor-architecture.cmd
23
@echo .
34
@echo ..
45
@echo ...
56
@echo Running full Build Script, capturing output to buildlog.txt file...
67
@echo Start Time: %time%
7-
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
8+
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
89
@echo .
910
@echo ..
1011
@echo ...
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
@echo off
2+
REM **************************************************
3+
REM Batch file to copy the appropriate nant.exe.config file that correlates to the underlying
4+
REM processor architecture of the system on which the build is running.
5+
REM
6+
REM This is necessary b/c the nant.exe.config file contains path-references for .NET Framework assemblies
7+
REM which need to properly depend upon either %programfiles% (for x86 machines) or %programfilesx86% (for x64 machines).
8+
REM As there is no way to make the present version of NANT "processor-architecture-aware", this crude mechanism of
9+
REM maintaining two otherwise identical .config files (one for x86 and one or x64) and copying the appropriate one into the
10+
REM expected location has been implemented.
11+
REM
12+
REM NOTE: until such time as NANT itself becomes able to accommodate the differing .NET framework install paths on x86 and x64
13+
REM systems, it will be necessary for ANY builds of SPRNET that use NANT to first call this batch/command file to set the
14+
REM proper .config file 'active'.
15+
REM
16+
REM **************************************************
17+
18+
19+
goto %processor_architecture%
20+
goto end
21+
22+
23+
:x86
24+
echo x86 Processor Architecture Detected, setting up nant.exe.config for x86-based .NET reference paths...
25+
copy tools\nant\config\NAnt.exe.config-x86 tools\nant\bin\NAnt.exe.config
26+
goto end
27+
28+
29+
:amd64
30+
echo AMD64 Processor Architecture Detected, setting up nant.exe.config for x64-based .NET reference paths.
31+
copy tools\nant\config\NAnt.exe.config-x64 tools\nant\bin\NAnt.exe.config
32+
goto end
33+
34+
:ia64
35+
echo IA64 Processor Architecture Detected -- WARNING: this processor architecture is not supported by the Spring.NET build scripts!
36+
goto end
37+
38+
:end

0 commit comments

Comments
 (0)