make/common/Modules.gmk

Print this page

        

*** 24,33 **** --- 24,36 ---- # ifndef _MODULES_GMK _MODULES_GMK := 1 + include JavaCompilation.gmk + include SetupJavaCompilers.gmk + ################################################################################ # Module list macros ALL_TOP_SRC_DIRS := \ $(JDK_TOPDIR)/src \
*** 48,59 **** $(wildcard $(patsubst %,%/*/share/classes/*, $(ALL_TOP_SRC_DIRS)) \ $(patsubst %,%/*/$(OPENJDK_TARGET_OS_API_DIR)/classes/*, $(ALL_TOP_SRC_DIRS)) \ $(patsubst %,%/*/$(OPENJDK_TARGET_OS)/classes/*, $(ALL_TOP_SRC_DIRS)))))))))))) endef ! MODULES_LIST_FILE := $(SRC_ROOT)/make/common/modules.list ! MODULE_DEPS_MAKEFILE := $(OUTPUT_ROOT)/module-deps.gmk $(MODULE_DEPS_MAKEFILE): $(MODULES_LIST_FILE) $(CAT) $^ | $(SED) -e 's/^\([^:]*\):/DEPS_\1 :=/g' > $@ -include $(MODULE_DEPS_MAKEFILE) --- 51,86 ---- $(wildcard $(patsubst %,%/*/share/classes/*, $(ALL_TOP_SRC_DIRS)) \ $(patsubst %,%/*/$(OPENJDK_TARGET_OS_API_DIR)/classes/*, $(ALL_TOP_SRC_DIRS)) \ $(patsubst %,%/*/$(OPENJDK_TARGET_OS)/classes/*, $(ALL_TOP_SRC_DIRS)))))))))))) endef ! # Find all modules with source for the target platform. ! define FindAllModules ! $(sort $(filter-out closed demo sample, $(notdir $(patsubst %/,%, $(dir \ ! $(wildcard $(patsubst %, %/*/share, $(ALL_TOP_SRC_DIRS)) \ ! $(patsubst %, %/*/$(OPENJDK_TARGET_OS), $(ALL_TOP_SRC_DIRS)) \ ! $(patsubst %, %/*/$(OPENJDK_TARGET_OS_API_DIR), $(ALL_TOP_SRC_DIRS)))))))) ! endef ! ! ################################################################################ ! ! $(eval $(call SetupJavaCompilation,BUILD_GENMODULESLIST, \ ! SETUP := BOOT_JAVAC, \ ! SRC := $(JDK_TOPDIR)/make/src/classes, \ ! INCLUDES := build/tools/module, \ ! BIN := $(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist)) ! ! TOOL_GENMODULESLIST = $(JAVA_SMALL) \ ! -cp "$(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist" \ ! build.tools.module.GenModulesList ! ! MODULES_LIST_FILE := $(MAKESUPPORT_OUTPUTDIR)/modules.list ! MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk ! ! $(MODULES_LIST_FILE): $(SRC_ROOT)/modules.xml \ ! $(BUILD_GENMODULESLIST) ! $(TOOL_GENMODULESLIST) -o $@ $(filter %.xml, $^) $(MODULE_DEPS_MAKEFILE): $(MODULES_LIST_FILE) $(CAT) $^ | $(SED) -e 's/^\([^:]*\):/DEPS_\1 :=/g' > $@ -include $(MODULE_DEPS_MAKEFILE)
*** 61,78 **** # Param 1: Module to find deps for define FindDepsForModule $(DEPS_$(strip $1)) endef - # Find all modules with source for the target platform. - define FindAllModules - $(sort $(filter-out closed demo sample, $(notdir $(patsubst %/,%, $(dir \ - $(wildcard $(patsubst %, %/*/share, $(ALL_TOP_SRC_DIRS)) \ - $(patsubst %, %/*/$(OPENJDK_TARGET_OS), $(ALL_TOP_SRC_DIRS)) \ - $(patsubst %, %/*/$(OPENJDK_TARGET_OS_API_DIR), $(ALL_TOP_SRC_DIRS)))))))) - endef - ################################################################################ # Hook to include the corresponding custom file, if present. $(eval $(call IncludeCustomExtension, , common/Modules.gmk)) --- 88,97 ----