1.1 --- a/make/windows/create.bat Thu Feb 10 12:55:56 2011 +0100
1.2 +++ b/make/windows/create.bat Thu Feb 10 13:03:22 2011 +0100
1.3 @@ -1,6 +1,6 @@
1.4 @echo off
1.5 REM
1.6 -REM Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
1.7 +REM Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
1.8 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.9 REM
1.10 REM This code is free software; you can redistribute it and/or modify it
1.11 @@ -50,9 +50,7 @@
1.12
1.13
1.14 :testit
1.15 -cl 2>&1 | grep "IA-64" >NUL
1.16 -if %errorlevel% == 0 goto isia64
1.17 -cl 2>&1 | grep "AMD64" >NUL
1.18 +cl 2>&1 | grep "x64" >NUL
1.19 if %errorlevel% == 0 goto amd64
1.20 set ARCH=x86
1.21 set BUILDARCH=i486
1.22 @@ -64,12 +62,6 @@
1.23 set BUILDARCH=amd64
1.24 set Platform_arch=x86
1.25 set Platform_arch_model=x86_64
1.26 -goto done
1.27 -:isia64
1.28 -set ARCH=ia64
1.29 -set BUILDARCH=ia64
1.30 -set Platform_arch=ia64
1.31 -set Platform_arch_model=ia64
1.32 :done
1.33
1.34 setlocal
1.35 @@ -81,7 +73,7 @@
1.36 REM Set HotSpotWorkSpace to the directy two steps above this script
1.37 for %%i in ("%~dp0..") do ( set HotSpotWorkSpace=%%~dpi)
1.38 set HotSpotBuildRoot=%HotSpotWorkSpace%build
1.39 -set HotSpotBuildSpace=%HotSpotBuildRoot%\vs
1.40 +set HotSpotBuildSpace=%HotSpotBuildRoot%\vs-%BUILDARCH%
1.41 set HotSpotJDKDist=%1
1.42
1.43
1.44 @@ -89,9 +81,9 @@
1.45 for /F %%i in ('sh %HotSpotWorkSpace%/make/windows/get_msc_ver.sh') do set %%i
1.46
1.47 echo **************************************************************
1.48 -set ProjectFile=jvm.vcproj
1.49 +set ProjectFile=%HotSpotBuildSpace%\jvm.vcproj
1.50 if "%MSC_VER%" == "1200" (
1.51 -set ProjectFile=jvm.dsp
1.52 +set ProjectFile=%HotSpotBuildSpace%\jvm.dsp
1.53 echo Will generate VC6 project {unsupported}
1.54 ) else (
1.55 if "%MSC_VER%" == "1400" (
1.56 @@ -163,7 +155,7 @@
1.57 )
1.58
1.59 REM force regneration of ProjectFile
1.60 -if exist %HotSpotBuildSpace%\%ProjectFile% del %HotSpotBuildSpace%\%ProjectFile%
1.61 +if exist %ProjectFile% del %ProjectFile%
1.62
1.63 for /D %%i in (compiler1, compiler2, tiered, core, kernel) do (
1.64 echo -- %%i --
1.65 @@ -182,6 +174,7 @@
1.66 echo BUILDARCH=%BUILDARCH% >> %HotSpotBuildSpace%\%%i\local.make
1.67 echo Platform_arch=%Platform_arch% >> %HotSpotBuildSpace%\%%i\local.make
1.68 echo Platform_arch_model=%Platform_arch_model% >> %HotSpotBuildSpace%\%%i\local.make
1.69 +echo MSC_VER=%MSC_VER% >> %HotSpotBuildSpace%\%%i\local.make
1.70
1.71 for /D %%j in (debug, fastdebug, product) do (
1.72 if NOT EXIST %HotSpotBuildSpace%\%%i\%%j mkdir %HotSpotBuildSpace%\%%i\%%j
1.73 @@ -196,7 +189,7 @@
1.74 pushd %HotSpotBuildRoot%
1.75
1.76 REM It doesn't matter which variant we use here, "compiler1" is as good as any of the others - we need the common variables
1.77 -nmake /nologo /F %HotSpotWorkSpace%/make/windows/projectfiles/common/Makefile LOCAL_MAKE=%HotSpotBuildSpace%\compiler1\local.make %HotSpotBuildRoot%/%ProjectFile%
1.78 +nmake /nologo /F %HotSpotWorkSpace%/make/windows/projectfiles/common/Makefile LOCAL_MAKE=%HotSpotBuildSpace%\compiler1\local.make %ProjectFile%
1.79
1.80 popd
1.81
