Ignore:
Timestamp:
Feb 13, 2012, 10:07:12 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b24 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
2 deleted
27 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/hotspot/make/windows/build.bat

    r278 r309  
    11@echo off
    22REM
    3 REM Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
     3REM Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    44REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55REM

  • trunk/openjdk/hotspot/make/windows/build.make

    r278 r309  
    11#
    2 # Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2020# or visit www.oracle.com if you need additional information or have any
    2121# questions.
    22 # 
     22#
    2323#
    2424
    … …  
    7373!endif
    7474
    75 !if "$(BUILDARCH)" != "amd64"
    7675!if "$(BUILDARCH)" != "ia64"
    7776!ifndef CC_INTERP
     77!ifndef FORCE_TIERED
    7878FORCE_TIERED=1
    7979!endif
    … …  
    103103VARIANT_TEXT=Client
    104104!elseif "$(Variant)" == "compiler2"
    105 !ifdef FORCE_TIERED
     105!if "$(FORCE_TIERED)" == "1"
    106106VARIANT_TEXT=Server
    107107realVariant=tiered
    … …  
    136136# we use only integers in the file version field.  So:
    137137# JDK_UPDATE_VER = JDK_UPDATE_VERSION * 10 + EXCEPTION_VERSION
    138 # 
     138#
    139139JDK_UPDATE_VER=0
    140140JDK_BUILD_NUMBER=0
    … …  
    149149#
    150150# JDK_* variables are defined in make/hotspot_version or on command line
    151 # 
     151#
    152152JDK_VER=$(JDK_MINOR_VER),$(JDK_MICRO_VER),$(JDK_UPDATE_VER),$(JDK_BUILD_NUMBER)
    153153JDK_DOTVER=$(JDK_MINOR_VER).$(JDK_MICRO_VER).$(JDK_UPDATE_VER).$(JDK_BUILD_NUMBER)
    … …  
    163163# Hotspot Express VM FileVersion:
    164164# 10.0-b<yz> will have DLL version 10.0.0.yz (need 4 numbers).
    165 # 
     165#
    166166# HS_* variables are defined in make/hotspot_version
    167167#
    … …  
    183183
    184184# We don't support SA on ia64, and we can't
    185 # build it if we are using a version of Vis Studio 
     185# build it if we are using a version of Vis Studio
    186186# older than .Net 2003.
    187187# SA_INCLUDE and SA_LIB are hold-overs from a previous

  • trunk/openjdk/hotspot/make/windows/build_vm_def.sh

    r278 r309  
    11#
    2 # Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    4646
    4747AWK="$MKS_HOME/awk.exe"
     48if [ ! -e $AWK ]; then
     49    AWK="$MKS_HOME/gawk.exe"
     50fi
    4851GREP="$MKS_HOME/grep.exe"
    4952SORT="$MKS_HOME/sort.exe"
    … …  
    5861fi
    5962
    60 if [ "x$LINK_VER" != "x800" -a  "x$LINK_VER" != "x900" ]; then
     63if [ "x$LINK_VER" != "x800" -a  "x$LINK_VER" != "x900" -a "x$LINK_VER" != "x1000" ]; then
    6164$DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
    6265else

  • trunk/openjdk/hotspot/make/windows/create.bat

    r278 r309  
    11@echo off
    22REM
    3 REM Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
     3REM Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    44REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55REM
    … …  
    2727REM build execution script). It creates $HotSpotBuildSpace if necessary,
    2828REM copies the appropriate files out of $HotSpotWorkSpace into it, and
    29 REM builds and runs MakeDeps in it. This has the side-effect of creating
     29REM builds and runs ProjectCreator in it. This has the side-effect of creating
    3030REM the vm.vcproj file in the buildspace, which is then used in Visual C++.
    31 REM
    32 REM The generated project file depends upon the include databases. If
    33 REM those are changed then MakeDeps is rerun.
    3431
    3532REM
    … …  
    4037REM that "grep" be accessible on the PATH. An MKS install does this.
    4138REM
     39
     40cl 2>NUL >NUL
     41if %errorlevel% == 0 goto nexttest
     42echo Make sure cl.exe is in your PATH before running this script.
     43goto end
     44
     45:nexttest
     46grep -V 2>NUL >NUL
     47if %errorlevel% == 0 goto testit
     48echo Make sure grep.exe is in your PATH before running this script. Either cygwin or MKS should work.
     49goto end
     50
     51
     52:testit
    4253cl 2>&1 | grep "IA-64" >NUL
    4354if %errorlevel% == 0 goto isia64
    … …  
    4859set Platform_arch=x86
    4960set Platform_arch_model=x86_32
    50 goto end
     61goto done
    5162:amd64
    5263set ARCH=x86
    … …  
    5465set Platform_arch=x86
    5566set Platform_arch_model=x86_64
    56 goto end
     67goto done
    5768:isia64
    5869set ARCH=ia64
    … …  
    6071set Platform_arch=ia64
    6172set Platform_arch_model=ia64
    62 :end
     73:done
    6374
    6475setlocal
    … …  
    6677if "%1" == "" goto usage
    6778
    68 if not "%4" == "" goto usage
    69 
    70 set HotSpotWorkSpace=%1
    71 set HotSpotBuildSpace=%2
    72 set HotSpotJDKDist=%3
     79if not "%2" == "" goto usage
     80
     81REM Set HotSpotWorkSpace to the directy two steps above this script
     82for %%i in ("%~dp0..") do ( set HotSpotWorkSpace=%%~dpi)
     83set HotSpotBuildRoot=%HotSpotWorkSpace%build
     84set HotSpotBuildSpace=%HotSpotBuildRoot%\vs
     85set HotSpotJDKDist=%1
     86
    7387
    7488REM figure out MSC version
    … …  
    7690
    7791echo **************************************************************
    78 set ProjectFile=vm.vcproj
     92set ProjectFile=jvm.vcproj
    7993if "%MSC_VER%" == "1200" (
    80 set ProjectFile=vm.dsp
     94set ProjectFile=jvm.dsp
    8195echo Will generate VC6 project {unsupported}
    8296) else (
    … …  
    87101echo Will generate VC9 {Visual Studio 2008}
    88102) else (
     103if "%MSC_VER%" == "1600" (
     104echo Detected Visual Studio 2010, but
     105echo will generate VC9 {Visual Studio 2008}
     106echo Use conversion wizard in VS 2010.
     107) else (
    89108echo Will generate VC7 project {Visual Studio 2003 .NET}
     109)
    90110)
    91111)
    … …  
    122142:test3
    123143if not "%HOTSPOTMKSHOME%" == "" goto makedir
     144if exist c:\cygwin\bin set HOTSPOTMKSHOME=c:\cygwin\bin
     145if not "%HOTSPOTMKSHOME%" == "" goto makedir
    124146echo Warning: please set variable HOTSPOTMKSHOME to place where
    125147echo          your MKS/Cygwin installation is
    … …  
    137159:copyfiles
    138160for /D %%i in (compiler1, compiler2, tiered, core, kernel) do (
    139 if NOT EXIST %HotSpotBuildSpace%\%%i mkdir %HotSpotBuildSpace%\%%i
    140 copy %HotSpotWorkSpace%\make\windows\projectfiles\%%i\* %HotSpotBuildSpace%\%%i\ > NUL
     161if NOT EXIST %HotSpotBuildSpace%\%%i\generated mkdir %HotSpotBuildSpace%\%%i\generated
     162copy %HotSpotWorkSpace%\make\windows\projectfiles\%%i\* %HotSpotBuildSpace%\%%i\generated > NUL
    141163)
    142164
    … …  
    145167
    146168for /D %%i in (compiler1, compiler2, tiered, core, kernel) do (
    147 
    148 echo # Generated file!                                                 >    %HotSpotBuildSpace%\%%i\local.make
     169echo -- %%i --
     170echo # Generated file!                                                        >    %HotSpotBuildSpace%\%%i\local.make
    149171echo # Changing a variable below and then deleting %ProjectFile% will cause  >>    %HotSpotBuildSpace%\%%i\local.make
    150172echo # %ProjectFile% to be regenerated with the new values.  Changing the    >>    %HotSpotBuildSpace%\%%i\local.make
    151 echo # version requires rerunning create.bat.                         >>    %HotSpotBuildSpace%\%%i\local.make
     173echo # version requires rerunning create.bat.                                >>    %HotSpotBuildSpace%\%%i\local.make
    152174echo.                                      >>    %HotSpotBuildSpace%\%%i\local.make
     175echo Variant=%%i                           >>    %HotSpotBuildSpace%\%%i\local.make
     176echo WorkSpace=%HotSpotWorkSpace%          >>    %HotSpotBuildSpace%\%%i\local.make
    153177echo HOTSPOTWORKSPACE=%HotSpotWorkSpace%   >>    %HotSpotBuildSpace%\%%i\local.make
     178echo HOTSPOTBUILDROOT=%HotSpotBuildRoot%   >>    %HotSpotBuildSpace%\%%i\local.make
    154179echo HOTSPOTBUILDSPACE=%HotSpotBuildSpace% >>    %HotSpotBuildSpace%\%%i\local.make
    155180echo HOTSPOTJDKDIST=%HotSpotJDKDist%       >>    %HotSpotBuildSpace%\%%i\local.make
    … …  
    159184echo Platform_arch_model=%Platform_arch_model% >>    %HotSpotBuildSpace%\%%i\local.make
    160185
    161 REM build config specific stuff
    162 
    163 pushd %HotSpotBuildSpace%\%%i
     186for /D %%j in (debug, fastdebug, product) do (
     187if NOT EXIST %HotSpotBuildSpace%\%%i\%%j mkdir %HotSpotBuildSpace%\%%i\%%j
     188)
     189
     190pushd %HotSpotBuildSpace%\%%i\generated
    164191nmake /nologo
    165192popd
    166 )
     193
     194)
     195
     196pushd %HotSpotBuildRoot%
     197
     198REM It doesn't matter which variant we use here, "compiler1" is as good as any of the others - we need the common variables
     199nmake /nologo /F %HotSpotWorkSpace%/make/windows/projectfiles/common/Makefile LOCAL_MAKE=%HotSpotBuildSpace%\compiler1\local.make %HotSpotBuildRoot%/%ProjectFile%
     200
     201popd
    167202
    168203goto end
    169204
    170205:usage
    171 echo Usage: create HotSpotWorkSpace HotSpotBuildSpace HotSpotJDKDist
    172 echo.
    173 echo This is the interactive build setup script (as opposed to the batch
    174 echo build execution script). It creates HotSpotBuildSpace if necessary,
    175 echo copies the appropriate files out of HotSpotWorkSpace into it, and
    176 echo builds and runs MakeDeps in it. This has the side-effect of creating
     206echo Usage: create HotSpotJDKDist
     207echo.
     208echo This is the VS build setup script (as opposed to the batch
     209echo build execution script). It creates a build directory if necessary,
     210echo copies the appropriate files out of the workspace into it, and
     211echo builds and runs ProjectCreator in it. This has the side-effect of creating
    177212echo the %ProjectFile% file in the build space, which is then used in Visual C++.
    178 echo The HotSpotJDKDist defines place where JVM binaries should be placed.
     213echo.
     214echo The HotSpotJDKDist defines the JDK that should be used when running the JVM.
    179215echo Environment variable FORCE_MSC_VER allows to override MSVC version autodetection.
    180 echo.
    181 echo The generated project file depends upon the include databases. If
    182 echo those are changed then MakeDeps is rerun.
    183216echo.
    184217echo NOTE that it is now NOT safe to modify any of the files in the build

  • trunk/openjdk/hotspot/make/windows/get_msc_ver.sh

    r278 r309  
    11#
    2 # Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#

  • trunk/openjdk/hotspot/make/windows/makefiles/adlc.make

    r278 r309  
    11#
    2 # Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2323#
    2424
    25 !include $(WorkSpace)/make/windows/makefiles/compile.make
    2625
    2726# Rules for building adlc.exe
    … …  
    4746!endif
    4847
    49 CPP_FLAGS=$(CPP_FLAGS) /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE 
     48ADLC_CPP_FLAGS=$(CPP_FLAGS) /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
    5049
    5150CPP_INCLUDE_DIRS=\
    52   /I "..\generated"                          \
    53   /I "$(WorkSpace)\src\share\vm\compiler"    \
    54   /I "$(WorkSpace)\src\share\vm\code"        \
    55   /I "$(WorkSpace)\src\share\vm\interpreter" \
    56   /I "$(WorkSpace)\src\share\vm\classfile"   \
    57   /I "$(WorkSpace)\src\share\vm\asm"         \
    58   /I "$(WorkSpace)\src\share\vm\memory"      \
    59   /I "$(WorkSpace)\src\share\vm\oops"        \
    60   /I "$(WorkSpace)\src\share\vm\prims"       \
    61   /I "$(WorkSpace)\src\share\vm\runtime"     \
    62   /I "$(WorkSpace)\src\share\vm\utilities"   \
    63   /I "$(WorkSpace)\src\share\vm\libadt"      \
    64   /I "$(WorkSpace)\src\share\vm\opto"        \
    65   /I "$(WorkSpace)\src\os\windows\vm"          \
     51  /I "..\generated" \
     52  /I "$(WorkSpace)\src\share\vm" \
     53  /I "$(WorkSpace)\src\os\windows\vm" \
    6654  /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm"
    6755
    68 # NOTE! If you add any files here, you must also update GENERATED_NAMES_IN_INCL
    69 # and MakeDepsIDEOptions in makedeps.make.
     56# NOTE! If you add any files here, you must also update GENERATED_NAMES_IN_DIR
     57# and ProjectCreatorIDEOptions in projectcreator.make.
    7058GENERATED_NAMES=\
    7159  ad_$(Platform_arch_model).cpp \
    … …  
    8270
    8371# NOTE! This must be kept in sync with GENERATED_NAMES
    84 GENERATED_NAMES_IN_INCL=\
    85   incls/ad_$(Platform_arch_model).cpp \
    86   incls/ad_$(Platform_arch_model).hpp \
    87   incls/ad_$(Platform_arch_model)_clone.cpp \
    88   incls/ad_$(Platform_arch_model)_expand.cpp \
    89   incls/ad_$(Platform_arch_model)_format.cpp \
    90   incls/ad_$(Platform_arch_model)_gen.cpp \
    91   incls/ad_$(Platform_arch_model)_misc.cpp \
    92   incls/ad_$(Platform_arch_model)_peephole.cpp \
    93   incls/ad_$(Platform_arch_model)_pipeline.cpp \
    94   incls/adGlobals_$(Platform_arch_model).hpp \
    95   incls/dfa_$(Platform_arch_model).cpp
     72GENERATED_NAMES_IN_DIR=\
     73  $(AdlcOutDir)\ad_$(Platform_arch_model).cpp \
     74  $(AdlcOutDir)\ad_$(Platform_arch_model).hpp \
     75  $(AdlcOutDir)\ad_$(Platform_arch_model)_clone.cpp \
     76  $(AdlcOutDir)\ad_$(Platform_arch_model)_expand.cpp \
     77  $(AdlcOutDir)\ad_$(Platform_arch_model)_format.cpp \
     78  $(AdlcOutDir)\ad_$(Platform_arch_model)_gen.cpp \
     79  $(AdlcOutDir)\ad_$(Platform_arch_model)_misc.cpp \
     80  $(AdlcOutDir)\ad_$(Platform_arch_model)_peephole.cpp \
     81  $(AdlcOutDir)\ad_$(Platform_arch_model)_pipeline.cpp \
     82  $(AdlcOutDir)\adGlobals_$(Platform_arch_model).hpp \
     83  $(AdlcOutDir)\dfa_$(Platform_arch_model).cpp
    9684
    9785{$(WorkSpace)\src\share\vm\adlc}.cpp.obj::
    98         $(CPP) $(CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $<
     86        $(CPP) $(ADLC_CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $<
    9987
    10088{$(WorkSpace)\src\share\vm\opto}.cpp.obj::
    101         $(CPP) $(CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $<
     89        $(CPP) $(ADLC_CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $<
    10290
    10391adlc.exe: main.obj adlparse.obj archDesc.obj arena.obj dfa.obj dict2.obj filebuff.obj \
    … …  
    11199!endif
    112100
    113 $(GENERATED_NAMES_IN_INCL): $(Platform_arch_model).ad adlc.exe includeDB.current
     101$(GENERATED_NAMES_IN_DIR): $(Platform_arch_model).ad adlc.exe
    114102        rm -f $(GENERATED_NAMES)
     103        if exist $(AdlcOutDir) rmdir /s /q $(AdlcOutDir)
     104        mkdir $(AdlcOutDir)
    115105        $(ADLC) $(ADLCFLAGS) $(Platform_arch_model).ad
    116         mv $(GENERATED_NAMES) incls/
     106        mv $(GENERATED_NAMES) $(AdlcOutDir)/
    117107
    118108$(Platform_arch_model).ad: $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad $(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm/windows_$(Platform_arch_model).ad

  • trunk/openjdk/hotspot/make/windows/makefiles/compile.make

    r278 r309  
    11#
    2 # Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    8080CPP=ARCH_ERROR
    8181!endif
     82
     83CPP_FLAGS=$(CPP_FLAGS) /D "WIN32" /D "_WINDOWS"
     84
     85# Must specify this for sharedRuntimeTrig.cpp
     86CPP_FLAGS=$(CPP_FLAGS) /D "VM_LITTLE_ENDIAN"
     87
     88# Used for platform dispatching
     89CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_FAMILY_windows
     90CPP_FLAGS=$(CPP_FLAGS) /D TARGET_ARCH_$(Platform_arch)
     91CPP_FLAGS=$(CPP_FLAGS) /D TARGET_ARCH_MODEL_$(Platform_arch_model)
     92CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_ARCH_windows_$(Platform_arch)
     93CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_ARCH_MODEL_windows_$(Platform_arch_model)
     94CPP_FLAGS=$(CPP_FLAGS) /D TARGET_COMPILER_visCPP
     95
    8296
    8397# MSC_VER is a 4 digit number that tells us what compiler is being used
    … …  
    139153
    140154# Always add the _STATIC_CPPLIB flag
    141 STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB
     155STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB /D _DISABLE_DEPRECATE_STATIC_CPPLIB
    142156MS_RUNTIME_OPTION = $(MS_RUNTIME_OPTION) $(STATIC_CPPLIB_OPTION)
    143157CPP_FLAGS=$(CPP_FLAGS) $(MS_RUNTIME_OPTION)

  • trunk/openjdk/hotspot/make/windows/makefiles/debug.make

    r278 r309  
    11#
    2 # Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2929GENERATED=../generated
    3030
    31 default:: _build_pch_file.obj $(AOUT) checkAndBuildSA
     31# Allow the user to turn off precompiled headers from the command line.
     32!if "$(USE_PRECOMPILED_HEADER)" != "0"
     33BUILD_PCH_FILE=_build_pch_file.obj
     34!endif
     35
     36default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
    3237
    3338!include ../local.make
    … …  
    3944!include local.make
    4045
    41 !include $(GENERATED)/Dependencies
    42 
    4346HS_BUILD_ID=$(HS_BUILD_VER)-debug
    4447
    … …  
    4649$(Res_Files): FORCE
    4750
    48 $(AOUT): $(Res_Files) $(Obj_Files)
     51vm.def: $(Obj_Files)
    4952        sh $(WorkSpace)/make/windows/build_vm_def.sh
     53
     54$(AOUT): $(Res_Files) $(Obj_Files) vm.def
    5055        $(LINK) @<<
    5156  $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
    … …  
    6065!include $(WorkSpace)/make/windows/makefiles/shared.make
    6166!include $(WorkSpace)/make/windows/makefiles/sa.make
     67!include $(WorkSpace)/make/windows/makefiles/launcher.make

  • trunk/openjdk/hotspot/make/windows/makefiles/defs.make

    r278 r309  
    11#
    2 # Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#

  • trunk/openjdk/hotspot/make/windows/makefiles/fastdebug.make

    r278 r309  
    11#
    2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2929GENERATED=../generated
    3030
    31 default:: _build_pch_file.obj $(AOUT) checkAndBuildSA
     31# Allow the user to turn off precompiled headers from the command line.
     32!if "$(USE_PRECOMPILED_HEADER)" != "0"
     33BUILD_PCH_FILE=_build_pch_file.obj
     34!endif
     35
     36default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
    3237
    3338!include ../local.make
    … …  
    3944!include local.make
    4045
    41 !include $(GENERATED)/Dependencies
    42 
    4346HS_BUILD_ID=$(HS_BUILD_VER)-fastdebug
    4447
    … …  
    4649$(Res_Files): FORCE
    4750
    48 $(AOUT): $(Res_Files) $(Obj_Files)
     51vm.def: $(Obj_Files)
    4952        sh $(WorkSpace)/make/windows/build_vm_def.sh
     53
     54$(AOUT): $(Res_Files) $(Obj_Files) vm.def
    5055        $(LINK) @<<
    5156  $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
    … …  
    5863!endif
    5964
    60 
    6165!include $(WorkSpace)/make/windows/makefiles/shared.make
    6266!include $(WorkSpace)/make/windows/makefiles/sa.make
     67!include $(WorkSpace)/make/windows/makefiles/launcher.make

  • trunk/openjdk/hotspot/make/windows/makefiles/generated.make

    r278 r309  
    11#
    2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2424
    2525!include ../local.make
    26 !include $(WorkSpace)/make/windows/makefiles/makedeps.make
     26!include $(WorkSpace)/make/windows/makefiles/projectcreator.make
    2727!include local.make
    2828
    … …  
    3434!include $(WorkSpace)/make/windows/makefiles/sa.make
    3535
     36AdlcOutDir=adfiles
     37
    3638!if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
    37 default:: includeDB.current Dependencies incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles)
     39default:: $(AdlcOutDir)/ad_$(Platform_arch_model).cpp $(AdlcOutDir)/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) buildobjfiles
    3840!else
    39 default:: includeDB.current Dependencies $(JvmtiGeneratedFiles)
     41default:: $(JvmtiGeneratedFiles) buildobjfiles
    4042!endif
    4143
    42 # core plus serial gc
    43 IncludeDBs_base=$(WorkSpace)/src/share/vm/includeDB_core \
    44            $(WorkSpace)/src/share/vm/includeDB_jvmti \
    45            $(WorkSpace)/src/share/vm/includeDB_gc \
    46            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_serial
     44buildobjfiles:
     45        @ sh $(WorkSpace)/make/windows/create_obj_files.sh $(Variant) $(Platform_arch) $(Platform_arch_model) $(WorkSpace) .    > objfiles.make
    4746
    48 # parallel gc
    49 IncludeDBs_gc= $(WorkSpace)/src/share/vm/includeDB_gc_parallel \
    50            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \
    51            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_shared \
    52            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parNew \
    53            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep \
    54            $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_g1
    55 
    56 IncludeDBs_core=$(IncludeDBs_base) $(IncludeDBs_gc) \
    57                 $(WorkSpace)/src/share/vm/includeDB_features
    58 
    59 !if "$(Variant)" == "core"
    60 IncludeDBs=$(IncludeDBs_core)
    61 !endif
    62 
    63 !if "$(Variant)" == "kernel"
    64 IncludeDBs=$(IncludeDBs_base) $(WorkSpace)/src/share/vm/includeDB_compiler1
    65 !endif
    66 
    67 !if "$(Variant)" == "compiler1"
    68 IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler1
    69 !endif
    70 
    71 
    72 !if "$(Variant)" == "compiler2"
    73 IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler2
    74 !endif
    75 
    76 !if "$(Variant)" == "tiered"
    77 IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler1 \
    78            $(WorkSpace)/src/share/vm/includeDB_compiler2
    79 !endif
    80 
    81 # Note we don't generate a Visual C++ project file using MakeDeps for
    82 # the batch build.
    83 includeDB.current Dependencies: classes/MakeDeps.class $(IncludeDBs)
    84         cat $(IncludeDBs) > includeDB
    85         if exist incls rmdir /s /q incls
    86         mkdir incls
    87         $(RUN_JAVA) -Djava.class.path=classes MakeDeps WinGammaPlatform$(VcVersion) $(WorkSpace)/make/windows/platform_$(BUILDARCH) includeDB $(MakeDepsOptions)
    88         rm -f includeDB.current
    89         cp includeDB includeDB.current
    90 
    91 classes/MakeDeps.class: $(MakeDepsSources)
     47classes/ProjectCreator.class: $(ProjectCreatorSources)
    9248        if exist classes rmdir /s /q classes
    9349        mkdir classes
    94         $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\MakeDeps -d classes $(MakeDepsSources)
     50        $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\ProjectCreator -d classes $(ProjectCreatorSources)
    9551
    9652!if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
    9753
     54!include $(WorkSpace)/make/windows/makefiles/compile.make
    9855!include $(WorkSpace)/make/windows/makefiles/adlc.make
    9956

  • trunk/openjdk/hotspot/make/windows/makefiles/product.make

    r278 r309  
    11#
    2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2828GENERATED=../generated
    2929
    30 default:: _build_pch_file.obj $(AOUT) checkAndBuildSA
     30# Allow the user to turn off precompiled headers from the command line.
     31!if "$(USE_PRECOMPILED_HEADER)" != "0"
     32BUILD_PCH_FILE=_build_pch_file.obj
     33!endif
     34
     35default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
    3136
    3237!include ../local.make
    … …  
    4247!include local.make
    4348
    44 !include $(GENERATED)/Dependencies
    45 
    4649HS_BUILD_ID=$(HS_BUILD_VER)
    4750
    … …  
    5659<<
    5760!else
    58 $(AOUT): $(Res_Files) $(Obj_Files)
     61vm.def: $(Obj_Files)
    5962        sh $(WorkSpace)/make/windows/build_vm_def.sh
     63
     64$(AOUT): $(Res_Files) $(Obj_Files) vm.def
    6065        $(LINK) @<<
    6166  $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
    … …  
    7176!include $(WorkSpace)/make/windows/makefiles/shared.make
    7277!include $(WorkSpace)/make/windows/makefiles/sa.make
     78!include $(WorkSpace)/make/windows/makefiles/launcher.make

  • trunk/openjdk/hotspot/make/windows/makefiles/rules.make

    r278 r309  
    11#
    2 # Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    4949BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
    5050
    51 ProjectFile=vm.vcproj
     51ProjectFile=jvm.vcproj
    5252
    5353!if "$(MSC_VER)" == "1200"
    … …  
    6464VcVersion=VC9
    6565
     66!elseif "$(MSC_VER)" == "1600"
     67
     68# for compatibility - we don't yet have a ProjectCreator for VC10
     69VcVersion=VC9
     70
    6671!else
    6772

  • trunk/openjdk/hotspot/make/windows/makefiles/sanity.make

    r278 r309  
    11#
    2 # Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#

  • trunk/openjdk/hotspot/make/windows/makefiles/vm.make

    r278 r309  
    11#
    2 # Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2525# Resource file containing VERSIONINFO
    2626Res_Files=.\version.res
     27
     28!include ..\generated\objfiles.make
    2729
    2830!ifdef RELEASE
    … …  
    7072CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
    7173
    72 CPP_FLAGS=$(CPP_FLAGS) /D "WIN32" /D "_WINDOWS" $(CPP_INCLUDE_DIRS)
    73 
    74 # Must specify this for sharedRuntimeTrig.cpp
    75 CPP_FLAGS=$(CPP_FLAGS) /D "VM_LITTLE_ENDIAN"
     74CPP_FLAGS=$(CPP_FLAGS) $(CPP_INCLUDE_DIRS)
    7675
    7776# Define that so jni.h is on correct side
    … …  
    9594!endif
    9695
     96# If you modify exports below please do the corresponding changes in
     97# src/share/tools/ProjectCreator/WinGammaPlatformVC7.java
    9798LINK_FLAGS=$(LINK_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \
    9899  /export:JNI_GetDefaultJavaVMInitArgs       \
    … …  
    112113
    113114CPP_INCLUDE_DIRS=\
    114   /I "..\generated"                          \
    115   /I "..\generated\jvmtifiles"               \
    116   /I "$(WorkSpace)\src\share\vm\c1"          \
    117   /I "$(WorkSpace)\src\share\vm\compiler"    \
    118   /I "$(WorkSpace)\src\share\vm\code"        \
    119   /I "$(WorkSpace)\src\share\vm\interpreter" \
    120   /I "$(WorkSpace)\src\share\vm\ci"          \
    121   /I "$(WorkSpace)\src\share\vm\classfile"   \
    122   /I "$(WorkSpace)\src\share\vm\gc_implementation\parallelScavenge"\
    123   /I "$(WorkSpace)\src\share\vm\gc_implementation\shared"\
    124   /I "$(WorkSpace)\src\share\vm\gc_implementation\parNew"\
    125   /I "$(WorkSpace)\src\share\vm\gc_implementation\concurrentMarkSweep"\
    126   /I "$(WorkSpace)\src\share\vm\gc_implementation\g1"\
    127   /I "$(WorkSpace)\src\share\vm\gc_interface"\
    128   /I "$(WorkSpace)\src\share\vm\asm"         \
    129   /I "$(WorkSpace)\src\share\vm\memory"      \
    130   /I "$(WorkSpace)\src\share\vm\oops"        \
    131   /I "$(WorkSpace)\src\share\vm\prims"       \
    132   /I "$(WorkSpace)\src\share\vm\runtime"     \
    133   /I "$(WorkSpace)\src\share\vm\services"    \
    134   /I "$(WorkSpace)\src\share\vm\utilities"   \
    135   /I "$(WorkSpace)\src\share\vm\libadt"      \
    136   /I "$(WorkSpace)\src\share\vm\opto"        \
    137   /I "$(WorkSpace)\src\os\windows\vm"          \
     115  /I "..\generated" \
     116  /I "$(WorkSpace)\src\share\vm" \
     117  /I "$(WorkSpace)\src\share\vm\prims" \
     118  /I "$(WorkSpace)\src\os\windows\vm" \
    138119  /I "$(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm" \
    139120  /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm"
    140121
    141 CPP_USE_PCH=/Fp"vm.pch" /Yu"incls/_precompiled.incl"
     122CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
     123
     124!if "$(USE_PRECOMPILED_HEADER)" != "0"
     125CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
     126!else
     127CPP_USE_PCH=$(CPP_DONT_USE_PCH)
     128!endif
    142129
    143130# Where to find the source code for the virtual machine
    144 VM_PATH=../generated/incls
     131VM_PATH=../generated
     132VM_PATH=$(VM_PATH);../generated/adfiles
    145133VM_PATH=$(VM_PATH);../generated/jvmtifiles
    146134VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1
    … …  
    174162
    175163c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
    176          $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
     164         $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
    177165
    178166os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp
    179         $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp
     167        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp
    180168
    181169os_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
    182         $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
     170        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
    183171
    184172osThread_windows.obj: $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
    185         $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
     173        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
    186174
    187175conditionVar_windows.obj: $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
    188         $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
     176        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
    189177
    190178getThread_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
    191         $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
     179        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
    192180
    193181opcodes.obj: $(WorkSpace)\src\share\vm\opto\opcodes.cpp
    194         $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp
     182        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp
    195183
    196184bytecodeInterpreter.obj: $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
    197         $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
     185        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
    198186
    199187bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
    200         $(CPP) $(CPP_FLAGS) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
     188        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
    201189
    202190# Default rules for the Virtual Machine
    … …  
    281269        $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
    282270
     271{..\generated\adfiles}.cpp.obj::
     272        $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
     273
    283274{..\generated\jvmtifiles}.cpp.obj::
    284275        $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
    … …  
    287278
    288279_build_pch_file.obj:
    289         @echo #include "incls/_precompiled.incl" > ../generated/_build_pch_file.cpp
    290         $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"incls/_precompiled.incl" /c ../generated/_build_pch_file.cpp
     280        @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp
     281        $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp

  • trunk/openjdk/hotspot/make/windows/projectfiles/common/Makefile

    r278 r309  
    11#
    2 # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2323#
    2424
     25!ifdef LOCAL_MAKE
     26!include $(LOCAL_MAKE)
     27!endif
     28
     29
    2530WorkSpace=$(HOTSPOTWORKSPACE)
    2631
    … …  
    3338!ifdef JAVA_HOME
    3439BootStrapDir=$(JAVA_HOME)
     40!else
     41!ifdef HOTSPOTJDKDIST
     42BootStrapDir=$(HOTSPOTJDKDIST)
     43!endif
    3544!endif
    3645!endif
    3746!endif
    3847
    39 !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/makedeps.make
     48
     49
     50!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/projectcreator.make
     51!include $(WorkSpace)/make/windows/makefiles/compile.make
    4052
    4153# Pick up rules for building JVMTI (JSR-163)
    42 JvmtiOutDir=$(HOTSPOTBUILDSPACE)\jvmtifiles
     54JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles
    4355!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make
    4456
    4557Platform=$(HOTSPOTWORKSPACE)/make/windows/platform_$(BUILDARCH)
    4658
    47 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles)
    48 
    49 IncludeDBs_base=$(HOTSPOTWORKSPACE)/src/share/vm/includeDB_core  \
    50                 $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_jvmti \
    51                 $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_gc    \
    52                 $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_serial
    53 
    54 # Parallel gc files
    55 IncludeDBs_gc=$(HOTSPOTWORKSPACE)/src/share/vm/includeDB_gc_parallel       \
    56     $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_shared \
    57     $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_parNew \
    58     $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \
    59     $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep \
    60     $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_g1
    61 
    62 
    63 IncludeDBs_kernel =$(IncludeDBs_base) \
    64                     $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler1
    65 
    66 IncludeDBs_core =$(IncludeDBs_base) $(IncludeDBs_gc) \
    67                  $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_features
    68 
    69 IncludeDBs_compiler1=$(IncludeDBs_core) \
    70                      $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler1
    71 
    72 IncludeDBs_compiler2=$(IncludeDBs_core) \
    73                     $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler2
    74 
    75 IncludeDBs_tiered=$(IncludeDBs_core) \
    76                     $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler1 \
    77                     $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler2
    78 
    79 
    80 !if "$(Variant)" == "compiler1"
    81 IncludeDBs = $(IncludeDBs_compiler1)
    82 !endif
    83 
    8459!if "$(Variant)" == "compiler2"
    85 IncludeDBs = $(IncludeDBs_compiler2)
    8660# Pick up rules for building adlc
    8761!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
    … …  
    8963
    9064!if "$(Variant)" == "tiered"
    91 IncludeDBs = $(IncludeDBs_tiered)
    9265# Pick up rules for building adlc
    9366!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make
    9467!endif
    9568
    96 !if "$(Variant)" == "core"
    97 IncludeDBs = $(IncludeDBs_core)
    98 !endif
     69HS_INTERNAL_NAME=jvm
     70!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/launcher.make
    9971
    100 !if "$(Variant)" == "kernel"
    101 IncludeDBs = $(IncludeDBs_kernel)
    102 !endif
     72default:: $(AdditionalTargets) $(JvmtiGeneratedFiles)
    10373
    10474!include $(HOTSPOTWORKSPACE)/make/hotspot_version
    … …  
    10979HOTSPOT_RELEASE_VERSION="$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)"
    11080!endif
     81!if "$(USER_RELEASE_SUFFIX)" != ""
     82HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal-$(USER_RELEASE_SUFFIX)
     83!else
    11184HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = internal
     85!endif
    11286!if "$(HOTSPOT_BUILD_VERSION)" != ""
    11387HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)"
    … …  
    131105!endif
    132106
    133 MakeDepsIDEOptions =       $(MakeDepsIDEOptions) \
    134       -includeDB_kernel    $(HOTSPOTBUILDSPACE)\includeDB_kernel \
    135       -includeDB_core      $(HOTSPOTBUILDSPACE)\includeDB_core \
    136       -includeDB_compiler1 $(HOTSPOTBUILDSPACE)\includeDB_compiler1 \
    137       -includeDB_compiler2 $(HOTSPOTBUILDSPACE)\includeDB_compiler2 \
    138       -includeDB_tiered    $(HOTSPOTBUILDSPACE)\includeDB_tiered \
     107ProjectCreatorIDEOptions =       $(ProjectCreatorIDEOptions) \
    139108      -platform            $(Platform) \
    140109      -define              HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \
    … …  
    142111      -define              HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\"
    143112
    144 incls:
    145         @mkdir incls
    146 
    147 includeDB.current $(ProjectFile) Dependencies: local.make $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class \
    148                                                $(IncludeDBs) incls
    149         @rm -f includeDB $(HOTSPOTBUILDSPACE)\includeDB_kernel \
    150                          $(HOTSPOTBUILDSPACE)\includeDB_core \
    151                          $(HOTSPOTBUILDSPACE)\includeDB_compiler1 \
    152                          $(HOTSPOTBUILDSPACE)\includeDB_compiler2 \
    153                          $(HOTSPOTBUILDSPACE)\includeDB_tiered
    154         @cat $(IncludeDBs_kernel) > $(HOTSPOTBUILDSPACE)\includeDB_kernel
    155         @cat $(IncludeDBs_core) > $(HOTSPOTBUILDSPACE)\includeDB_core
    156         @cat $(IncludeDBs_compiler1)   > $(HOTSPOTBUILDSPACE)\includeDB_compiler1
    157         @cat $(IncludeDBs_compiler2)   > $(HOTSPOTBUILDSPACE)\includeDB_compiler2
    158         @cat $(IncludeDBs_tiered)      > $(HOTSPOTBUILDSPACE)\includeDB_tiered
    159         @echo java.cpp jni.h >  includeDB
    160         @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes MakeDeps diffs WinGammaPlatform$(VcVersion) \
    161                   $(Platform) includeDB.current $(Platform) includeDB $(MakeDepsOptions) $(MakeDepsIDEOptions)
    162         @rm -f includeDB.current
    163         @cp includeDB includeDB.current
    164 
    165 lists: $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class FORCE
    166         @if exist incls rmdir /s /q incls
    167         @rm -f includeDB
    168         @cat $(IncludeDBs) > includeDB
    169         @mkdir incls
    170         @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes MakeDeps WinGammaPlatform$(VcVersion) \
    171                  $(Platform) includeDB $(MakeDepsOptions) $(MakeDepsIDEOptions)
    172         @rm -f includeDB.current
    173         @cp includeDB includeDB.current
     113$(HOTSPOTBUILDROOT)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
     114        @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)
    174115
    175116clean:
    176         @rm -rf incls $(HOTSPOTBUILDSPACE)/classes
    177         @rm -f includeDB includeDB.current $(ProjectFile) Dependencies
     117        @rm -rf $(HOTSPOTBUILDSPACE)/classes
     118        @rm -r ../$(ProjectFile)
    178119
    179 $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class: $(MakeDepsSources)
     120$(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class: $(ProjectCreatorSources)
    180121        @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes
    181122        @mkdir $(HOTSPOTBUILDSPACE)\classes
    182         @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\MakeDeps -d $(HOTSPOTBUILDSPACE)/classes $(MakeDepsSources)
     123        @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\ProjectCreator -d $(HOTSPOTBUILDSPACE)/classes $(ProjectCreatorSources)
    183124
    184125FORCE:

  • trunk/openjdk/hotspot/make/windows/projectfiles/compiler1/Makefile

    r278 r309  
    11#
    2 # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2323#
    2424
    25 Variant=compiler1
    26 !include local.make
     25!include ../local.make
    2726
    2827!include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile

  • trunk/openjdk/hotspot/make/windows/projectfiles/compiler1/vm.def

    r2 r309  
    33; generated during the build process. See
    44; make\windows\build_vm_def.sh and
    5 ; make\windows\makefiles\makedeps.make (esp. the "-prelink"
     5; make\windows\makefiles\projectcreator.make (esp. the "-prelink"
    66; options).
    77;

  • trunk/openjdk/hotspot/make/windows/projectfiles/compiler2/Makefile

    r278 r309  
    11#
    2 # Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2323#
    2424
    25 Variant=compiler2
    26 !include local.make
    27 AdditionalTargets=incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp
     25!include ../local.make
     26AdlcOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\adfiles
     27AdditionalTargets=$(AdlcOutDir)\ad_$(Platform_arch_model).cpp $(AdlcOutDir)\dfa_$(Platform_arch_model).cpp
    2828
    2929!include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile

  • trunk/openjdk/hotspot/make/windows/projectfiles/compiler2/vm.def

    r2 r309  
    33; generated during the build process. See
    44; make\windows\build_vm_def.sh and
    5 ; make\windows\makefiles\makedeps.make (esp. the "-prelink"
     5; make\windows\makefiles\projectcreator.make (esp. the "-prelink"
    66; options).
    77;

  • trunk/openjdk/hotspot/make/windows/projectfiles/core/Makefile

    r278 r309  
    11#
    2 # Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2323#
    2424
    25 Variant=core
    26 !include local.make
     25!include ../local.make
    2726
    2827!include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile

  • trunk/openjdk/hotspot/make/windows/projectfiles/core/vm.def

    r2 r309  
    33; generated during the build process. See
    44; make\windows\build_vm_def.sh and
    5 ; make\windows\makefiles\makedeps.make (esp. the "-prelink"
     5; make\windows\makefiles\projectcreator.make (esp. the "-prelink"
    66; options).
    77;

  • trunk/openjdk/hotspot/make/windows/projectfiles/kernel/Makefile

    r278 r309  
    11#
    2 # Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2007, 2010 Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#   
    … …  
    2323#
    2424
    25 Variant=compiler1
    26 !include local.make
     25!include ../local.make
    2726
    2827!include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile

  • trunk/openjdk/hotspot/make/windows/projectfiles/kernel/vm.def

    r2 r309  
    33; generated during the build process. See
    44; make\windows\build_vm_def.sh and
    5 ; make\windows\makefiles\makedeps.make (esp. the "-prelink"
     5; make\windows\makefiles\projectcreator.make (esp. the "-prelink"
    66; options).
    77;

  • trunk/openjdk/hotspot/make/windows/projectfiles/tiered/Makefile

    r278 r309  
    11#
    2 # Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2323#
    2424
    25 Variant=tiered
    26 !include local.make
    27 AdditionalTargets=incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp
     25!include ../local.make
     26AdlcOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\adfiles
     27AdditionalTargets=$(AdlcOutDir)\ad_$(Platform_arch_model).cpp $(AdlcOutDir)\dfa_$(Platform_arch_model).cpp
    2828
    2929!include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile

  • trunk/openjdk/hotspot/make/windows/projectfiles/tiered/vm.def

    r2 r309  
    33; generated during the build process. See
    44; make\windows\build_vm_def.sh and
    5 ; make\windows\makefiles\makedeps.make (esp. the "-prelink"
     5; make\windows\makefiles\projectcreator.make (esp. the "-prelink"
    66; options).
    77;
Note: See TracChangeset for help on using the changeset viewer.