Mercurial > hg > truffle
changeset 2214:30fd69882184
More build system adjustments.
| author | Thomas Wuerthinger <thomas.wuerthinger@gmail.com> |
|---|---|
| date | Mon, 21 Feb 2011 19:53:48 +0100 |
| parents | 020eee65316d |
| children | 999f8086cc4f |
| files | .hgignore create.cmd create64.cmd make/windows/create.bat src/share/tools/ProjectCreator/Util.java |
| diffstat | 5 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Mon Feb 21 19:32:20 2011 +0100 +++ b/.hgignore Mon Feb 21 19:53:48 2011 +0100 @@ -1,6 +1,7 @@ ^build/ ^dist/ ^java/ +^java64/ ^work/ .metadata/ ~$
--- a/create.cmd Mon Feb 21 19:32:20 2011 +0100 +++ b/create.cmd Mon Feb 21 19:53:48 2011 +0100 @@ -4,8 +4,6 @@ set OrigPath=%cd% cd make\windows - -mkdir %OrigPath%\work call create.bat %OrigPath% cd %OrigPath%
--- a/create64.cmd Mon Feb 21 19:32:20 2011 +0100 +++ b/create64.cmd Mon Feb 21 19:53:48 2011 +0100 @@ -5,8 +5,6 @@ set OrigPath=%cd% cd make\windows - -mkdir %OrigPath%\work call create.bat %OrigPath% set PATH=%ORIG_PATH%
--- a/make/windows/create.bat Mon Feb 21 19:32:20 2011 +0100 +++ b/make/windows/create.bat Mon Feb 21 19:53:48 2011 +0100 @@ -54,6 +54,8 @@ if %errorlevel% == 0 goto isia64 cl 2>&1 | grep "AMD64" >NUL if %errorlevel% == 0 goto amd64 +cl 2>&1 | grep "x64" >NUL +if %errorlevel% == 0 goto amd64 set ARCH=x86 set BUILDARCH=i486 set Platform_arch=x86
--- a/src/share/tools/ProjectCreator/Util.java Mon Feb 21 19:32:20 2011 +0100 +++ b/src/share/tools/ProjectCreator/Util.java Mon Feb 21 19:53:48 2011 +0100 @@ -99,6 +99,7 @@ _os = "x64"; else throw new RuntimeException("Unsupported PLATFORM_ARCH_MODEL " + archModel); + System.out.println("Found OS configuration: " + _os); return _os; } throw new RuntimeException("PLATFORM_ARCH_MODEL not specified");