archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8067194: Restructure hotspot/agent/src to conform the modular source layout

Browse source 
Move sources under jdk.hotspot.agent

Reviewed-by: ihse, erikj, jbachorik
This commit is contained in:
Dmitry Samersoff 2015-12-23 13:12:12 +03:00
parent 19cddada2c
commit c28f46f637
2 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/CompileJavaModules.gmk
View file

@ -367,10 +367,6 @@ jdk.compiler_CLEAN_FILES := $(wildcard \
################################################################################ ################################################################################
jdk.hotspot.agent_SRC += \
$(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent \
$(HOTSPOT_TOPDIR)/agent/src/share/classes \
#
jdk.hotspot.agent_ADD_JAVAC_FLAGS := $(DISABLE_WARNINGS),-overrides jdk.hotspot.agent_ADD_JAVAC_FLAGS := $(DISABLE_WARNINGS),-overrides
jdk.hotspot.agent_COPY := .png sa.js .properties jdk.hotspot.agent_COPY := .png sa.js .properties
@ -381,9 +377,9 @@ ifeq ($(MODULE), jdk.hotspot.agent)
# These can't be handled by COPY to SetupJavaCompilation since they chop off # These can't be handled by COPY to SetupJavaCompilation since they chop off
# one directory level. # one directory level.
$(eval $(call SetupCopyFiles, COPY_SA_IMAGES, \ $(eval $(call SetupCopyFiles, COPY_SA_IMAGES, \
SRC := $(HOTSPOT_TOPDIR)/agent/src/share/classes/images, \ SRC := $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent/share/classes/images, \
DEST := $(JDK_OUTPUTDIR)/modules/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/modules/$(MODULE), \
FILES := $(wildcard $(HOTSPOT_TOPDIR)/agent/src/share/classes/images/*/*/*.gif), \ FILES := $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent/share/classes/images/*/*/*.gif), \
)) ))
jdk.hotspot.agent: $(COPY_SA_IMAGES) jdk.hotspot.agent: $(COPY_SA_IMAGES)
endif endif

8
make/common/Modules.gmk
View file

@ -49,25 +49,21 @@ ALL_TOP_SRC_DIRS := \
# #
# Find all modules with java sources by looking in the source dirs # Find all modules with java sources by looking in the source dirs
# jdk.hotspot.agent currently doesn't comply with source dir policy.
define FindJavaModules define FindJavaModules
$(filter-out $(MODULES_FILTER), $(sort $(notdir \ $(filter-out $(MODULES_FILTER), $(sort $(notdir \
$(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir \ $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir \
$(wildcard $(patsubst %,%/*/share/classes/*, $(ALL_TOP_SRC_DIRS)) \ $(wildcard $(patsubst %,%/*/share/classes/*, $(ALL_TOP_SRC_DIRS)) \
$(patsubst %,%/*/$(OPENJDK_TARGET_OS)/classes/*, $(ALL_TOP_SRC_DIRS)) \ $(patsubst %,%/*/$(OPENJDK_TARGET_OS)/classes/*, $(ALL_TOP_SRC_DIRS)) \
$(patsubst %,%/*/$(OPENJDK_TARGET_OS_TYPE)/classes/*, $(ALL_TOP_SRC_DIRS))))))))))) \ $(patsubst %,%/*/$(OPENJDK_TARGET_OS_TYPE)/classes/*, $(ALL_TOP_SRC_DIRS))))))))))))
jdk.hotspot.agent)
endef endef
# Find all modules with source for the target platform. # Find all modules with source for the target platform.
# jdk.hotspot.agent currently doesn't comply with source dir policy.
define FindAllModules define FindAllModules
$(sort $(filter-out $(MODULES_FILTER) closed demo sample, \ $(sort $(filter-out $(MODULES_FILTER) closed demo sample, \
$(notdir $(patsubst %/,%, $(dir \ $(notdir $(patsubst %/,%, $(dir \
$(wildcard $(patsubst %, %/*/share, $(ALL_TOP_SRC_DIRS)) \ $(wildcard $(patsubst %, %/*/share, $(ALL_TOP_SRC_DIRS)) \
$(patsubst %, %/*/$(OPENJDK_TARGET_OS), $(ALL_TOP_SRC_DIRS)) \ $(patsubst %, %/*/$(OPENJDK_TARGET_OS), $(ALL_TOP_SRC_DIRS)) \
$(patsubst %, %/*/$(OPENJDK_TARGET_OS_TYPE), $(ALL_TOP_SRC_DIRS)))))) \ $(patsubst %, %/*/$(OPENJDK_TARGET_OS_TYPE), $(ALL_TOP_SRC_DIRS))))))))
jdk.hotspot.agent))
endef endef
################################################################################ ################################################################################