# HG changeset patch # User Thomas Wuerthinger # Date 1298314428 -3600 # Node ID 30fd69882184cb66c90551ac0d8a4edd43ee9f9b # Parent 020eee65316de0c38c000cdd6756001c584eb9bf More build system adjustments. diff -r 020eee65316d -r 30fd69882184 .hgignore --- 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/ ~$ diff -r 020eee65316d -r 30fd69882184 create.cmd --- 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% diff -r 020eee65316d -r 30fd69882184 create64.cmd --- 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% diff -r 020eee65316d -r 30fd69882184 make/windows/create.bat --- 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 diff -r 020eee65316d -r 30fd69882184 src/share/tools/ProjectCreator/Util.java --- 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");