make/CompileJavaModules.gmk
changeset 34118 0e07d8f543ea
parent 34108 671dd84efa14
parent 34117 afc734a1cf3b
child 34494 3b756754f957
equal deleted inserted replaced
34109:1a2876259a91 34118:0e07d8f543ea
   365     $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
   365     $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
   366         sun/tools/serialver/resources))
   366         sun/tools/serialver/resources))
   367 
   367 
   368 ################################################################################
   368 ################################################################################
   369 
   369 
       
   370 jdk.hotspot.agent_SRC += \
       
   371     $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent \
       
   372     $(HOTSPOT_TOPDIR)/agent/src/share/classes \
       
   373     #
       
   374 jdk.hotspot.agent_ADD_JAVAC_FLAGS := $(DISABLE_WARNINGS),-overrides
       
   375 jdk.hotspot.agent_COPY := .png sa.js .properties
       
   376 
       
   377 ifeq ($(MODULE), jdk.hotspot.agent)
       
   378   ### Copy gif files
       
   379   # Special handling to copy gif files in images/toolbarButtonGraphics \
       
   380   #   -> classes/toolbarButtonGraphics.
       
   381   # These can't be handled by COPY to SetupJavaCompilation since they chop off
       
   382   # one directory level.
       
   383   $(eval $(call SetupCopyFiles, COPY_SA_IMAGES, \
       
   384       SRC := $(HOTSPOT_TOPDIR)/agent/src/share/classes/images, \
       
   385       DEST := $(JDK_OUTPUTDIR)/modules/$(MODULE), \
       
   386       FILES := $(wildcard $(HOTSPOT_TOPDIR)/agent/src/share/classes/images/*/*/*.gif), \
       
   387   ))
       
   388   jdk.hotspot.agent: $(COPY_SA_IMAGES)
       
   389 endif
       
   390 
       
   391 ################################################################################
       
   392 
   370 jdk.internal.le_COPY := .properties
   393 jdk.internal.le_COPY := .properties
   371 
   394 
   372 ################################################################################
   395 ################################################################################
   373 
   396 
   374 jdk.jcmd_COPY := _options
   397 jdk.jcmd_COPY := _options
   526 # Find the module dependencies by parsing modules.list file
   549 # Find the module dependencies by parsing modules.list file
   527 DEPS := $(call FindDepsForModule, $(MODULE))
   550 DEPS := $(call FindDepsForModule, $(MODULE))
   528 
   551 
   529 CLASSPATH := $(foreach d, $(DEPS), $(if $($d_BIN), $($d_BIN), \
   552 CLASSPATH := $(foreach d, $(DEPS), $(if $($d_BIN), $($d_BIN), \
   530     $(JDK_OUTPUTDIR)/modules/$d))
   553     $(JDK_OUTPUTDIR)/modules/$d))
   531 # When crypto classes are prebuilt, need to look for classes already in
   554   # When crypto classes are prebuilt, need to look for classes already in
   532 # output dir.
   555   # output dir.
   533 ifneq ($(BUILD_CRYPTO), true)
   556   ifneq ($(BUILD_CRYPTO), true)
   534   CLASSPATH += $(JDK_OUTPUTDIR)/modules/$(MODULE)
   557   CLASSPATH += $(JDK_OUTPUTDIR)/modules/$(MODULE)
   535 endif
   558   endif
   536 JAVAC_FLAGS := -bootclasspath $(EMPTY_DIR) -extdirs $(EMPTY_DIR) \
   559 JAVAC_FLAGS := -bootclasspath $(EMPTY_DIR) -extdirs $(EMPTY_DIR) \
   537     -endorseddirs $(EMPTY_DIR) $($(MODULE)_ADD_JAVAC_FLAGS)
   560     -endorseddirs $(EMPTY_DIR) $($(MODULE)_ADD_JAVAC_FLAGS)
   538 
   561 
   539 $(eval $(call SetupJavaCompilation, $(MODULE), \
   562 $(eval $(call SetupJavaCompilation, $(MODULE), \
   540     SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
   563     SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
   541     SRC := $(if $($(MODULE)_SRC), $($(MODULE)_SRC), $(wildcard $(ALL_SRC_DIRS))), \
   564     SRC := $(if $($(MODULE)_SRC), $($(MODULE)_SRC), $(wildcard $(ALL_SRC_DIRS))), \
   542     INCLUDES := $(JDK_USER_DEFINED_FILTER),\
   565       INCLUDES := $(JDK_USER_DEFINED_FILTER),\
   543     BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules/$(MODULE)), \
   566     BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules/$(MODULE)), \
   544     HEADERS := $(SUPPORT_OUTPUTDIR)/headers/$(MODULE), \
   567     HEADERS := $(SUPPORT_OUTPUTDIR)/headers/$(MODULE), \
   545     CLASSPATH := $(CLASSPATH), \
   568     CLASSPATH := $(CLASSPATH), \
   546     ADD_JAVAC_FLAGS := $($(MODULE)_ADD_JAVAC_FLAGS) $(JAVAC_FLAGS) \
   569     ADD_JAVAC_FLAGS := $($(MODULE)_ADD_JAVAC_FLAGS) $(JAVAC_FLAGS) \
   547 ))
   570 ))
   548 
       
   549 TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)
   571 TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)
   550 
   572 
   551 # Declare dependencies between java compilations of different modules.
   573 # Declare dependencies between java compilations of different modules.
   552 # Since the other modules are declared in different invocations of this file,
   574 # Since the other modules are declared in different invocations of this file,
   553 # use the macro to find the correct target file to depend on.
   575 # use the macro to find the correct target file to depend on.