make/CompileJavaModules.gmk
changeset 28180 c14092114414
parent 27602 236555ddac42
child 28903 2bf89d675e57
equal deleted inserted replaced
28179:094d2e4a54b1 28180:c14092114414
   233       #
   233       #
   234 endif
   234 endif
   235 
   235 
   236 ################################################################################
   236 ################################################################################
   237 
   237 
       
   238 java.scripting_COPY := .js
       
   239 java.scripting_CLEAN := .properties
       
   240 
       
   241 ################################################################################
       
   242 
   238 java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
   243 java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
   239 
   244 
   240 ################################################################################
   245 ################################################################################
   241 
   246 
   242 java.sql.rowset_CLEAN_FILES := $(wildcard \
   247 java.sql.rowset_CLEAN_FILES := $(wildcard \
   316 jdk.charsets_COPY := .dat
   321 jdk.charsets_COPY := .dat
   317 
   322 
   318 ################################################################################
   323 ################################################################################
   319 
   324 
   320 jdk.compiler_COPY := javax.tools.JavaCompilerTool
   325 jdk.compiler_COPY := javax.tools.JavaCompilerTool
   321 
   326 jdk.compiler_CLEAN_FILES := $(wildcard \
   322 ################################################################################
   327     $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
   323 
   328         sun/tools/serialver/resources))
   324 jdk.jcmd_COPY := _options 
   329 
       
   330 ################################################################################
       
   331 
       
   332 jdk.jcmd_COPY := _options
   325 
   333 
   326 ################################################################################
   334 ################################################################################
   327 
   335 
   328 jdk.javadoc_COPY := .xml .css .js
   336 jdk.javadoc_COPY := .xml .css .js
   329 
   337 
   364 jdk.jconsole_CLEAN_FILES := $(wildcard \
   372 jdk.jconsole_CLEAN_FILES := $(wildcard \
   365     $(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
   373     $(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
   366 
   374 
   367 ################################################################################
   375 ################################################################################
   368 
   376 
   369 jdk.compiler_CLEAN_FILES := $(wildcard \
       
   370     $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
       
   371         sun/tools/serialver/resources))
       
   372 
       
   373 ################################################################################
       
   374 
       
   375 jdk.jdi_EXCLUDES += \
   377 jdk.jdi_EXCLUDES += \
   376     com/sun/tools/example/debug/bdi \
   378     com/sun/tools/example/debug/bdi \
   377     com/sun/tools/example/debug/event \
   379     com/sun/tools/example/debug/event \
   378     com/sun/tools/example/debug/gui \
   380     com/sun/tools/example/debug/gui \
   379     com/sun/jdi/doc-files \
   381     com/sun/jdi/doc-files \
   424 # Order src dirs in order of override with the most important first. Generated
   426 # Order src dirs in order of override with the most important first. Generated
   425 # source before static source and platform specific source before shared.
   427 # source before static source and platform specific source before shared.
   426 #
   428 #
   427 # To use this variable, use $(call ALL_SRC_DIRS,module) with no space.
   429 # To use this variable, use $(call ALL_SRC_DIRS,module) with no space.
   428 GENERATED_SRC_DIRS += \
   430 GENERATED_SRC_DIRS += \
   429     $(JDK_OUTPUTDIR)/gensrc/$1 \
   431     $(SUPPORT_OUTPUTDIR)/gensrc/$1 \
   430     $(LANGTOOLS_OUTPUTDIR)/gensrc/$1 \
   432     $(SUPPORT_OUTPUTDIR)/gensrc_no_docs/$1 \
   431     $(CORBA_OUTPUTDIR)/gensrc/$1 \
       
   432     $(JDK_OUTPUTDIR)/gensrc_no_srczip/$1 \
       
   433     #
   433     #
   434 
   434 
   435 OS_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS)/classes
   435 OS_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS)/classes
   436 ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_API_DIR))
   436 ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
   437 OS_API_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS_API_DIR)/classes
   437   OS_TYPE_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS_TYPE)/classes
   438 endif
   438 endif
   439 
   439 
   440 SHARE_SRC_DIRS += \
   440 SHARE_SRC_DIRS += \
   441     $(JDK_TOPDIR)/src/$1/share/classes \
   441     $(JDK_TOPDIR)/src/$1/share/classes \
   442     $(LANGTOOLS_TOPDIR)/src/$1/share/classes \
   442     $(LANGTOOLS_TOPDIR)/src/$1/share/classes \
   446     #
   446     #
   447 
   447 
   448 ALL_SRC_DIRS = \
   448 ALL_SRC_DIRS = \
   449     $(GENERATED_SRC_DIRS) \
   449     $(GENERATED_SRC_DIRS) \
   450     $(OS_SRC_DIRS) \
   450     $(OS_SRC_DIRS) \
   451     $(OS_API_SRC_DIRS) \
   451     $(OS_TYPE_SRC_DIRS) \
   452     $(SHARE_SRC_DIRS) \
   452     $(SHARE_SRC_DIRS) \
   453     #
   453     #
   454 
   454 
   455 # Find all modules with java sources. Filter out nashorn since it needs to be
   455 # Find all modules with java sources. Filter out nashorn since it needs to be
   456 # compiled separately.
   456 # compiled separately.
   468 define SetupModuleCompilation
   468 define SetupModuleCompilation
   469   # Find the module dependencies by parsing modules.list file
   469   # Find the module dependencies by parsing modules.list file
   470   $1_DEPS := $$(call FindDepsForModule, $1)
   470   $1_DEPS := $$(call FindDepsForModule, $1)
   471 
   471 
   472   $1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS))
   472   $1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS))
   473   # When crypto classes are prebuilt, need to look for classes already in 
   473   # When crypto classes are prebuilt, need to look for classes already in
   474   # output dir.
   474   # output dir.
   475   ifneq ($(BUILD_CRYPTO), true)
   475   ifneq ($(BUILD_CRYPTO), true)
   476     $1_CLASSPATH += $(JDK_OUTPUTDIR)/modules/$1
   476     $1_CLASSPATH += $(JDK_OUTPUTDIR)/modules/$1
   477   endif
   477   endif
   478   ifeq ($1, jdk.hotspot.agent)
   478   ifeq ($1, jdk.hotspot.agent)
   486   $$(eval $$(call SetupJavaCompilation,$1, \
   486   $$(eval $$(call SetupJavaCompilation,$1, \
   487       SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
   487       SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
   488       SRC := $$(wildcard $$(call ALL_SRC_DIRS,$1)), \
   488       SRC := $$(wildcard $$(call ALL_SRC_DIRS,$1)), \
   489       INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
   489       INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
   490       BIN := $(JDK_OUTPUTDIR)/modules/$1, \
   490       BIN := $(JDK_OUTPUTDIR)/modules/$1, \
   491       HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers/$1, \
   491       HEADERS := $(SUPPORT_OUTPUTDIR)/headers/$1, \
   492       ADD_JAVAC_FLAGS := $$($1_JAVAC_FLAGS)))
   492       ADD_JAVAC_FLAGS := $$($1_JAVAC_FLAGS)))
   493 
   493 
   494   $1: $$($1) $$($1_COPY_EXTRA)
   494   $1: $$($1) $$($1_COPY_EXTRA)
   495 
   495 
   496   # Declare dependencies between java compilation of different modules.
   496   # Declare dependencies between java compilation of different modules.
   497   # Since not all modules have been declared yet, or might be declared
   497   # Since not all modules have been declared yet, or might be declared
   498   # in different invocations of this file, use the macro to find the 
   498   # in different invocations of this file, use the macro to find the
   499   # correct target file to depend on.
   499   # correct target file to depend on.
   500   # Only the javac compilation actually depends on other modules so limit
   500   # Only the javac compilation actually depends on other modules so limit
   501   # dependency declaration to that by using the *_COMPILE_TARGET variable.
   501   # dependency declaration to that by using the *_COMPILE_TARGET variable.
   502   $$($1_COMPILE_TARGETS): $$(foreach d,$$($1_DEPS), \
   502   $$($1_COMPILE_TARGETS): $$(foreach d,$$($1_DEPS), \
   503       $$(call SetupJavaCompilationCompileTarget, $$d, $(JDK_OUTPUTDIR)/modules/$$d))
   503       $$(call SetupJavaCompilationCompileTarget, $$d, $(JDK_OUTPUTDIR)/modules/$$d))