stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8159047: Disable redundant build steps when creating buildjdk

Browse Source 
Reviewed-by: tbell, dholmes
This commit is contained in:
Erik Joelsson 2016-06-09 10:40:19 +02:00
parent 3cd4bea953
commit 13dd1d5bda
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
make/Main.gmk
View File

@ -65,20 +65,24 @@ ALL_MODULES := $(call FindAllModules)
################################################################################ ################################################################################
# Interim/build tools targets, compiling tools used during the build # Interim/build tools targets, compiling tools used during the build
buildtools-langtools: # When creating a BUILDJDK, the buildtools and interim targets have already
# been built and should not be built again.
ifneq ($(CREATING_BUILDJDK), true)
buildtools-langtools:
+($(CD) $(LANGTOOLS_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Tools.gmk) +($(CD) $(LANGTOOLS_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Tools.gmk)
interim-langtools: interim-langtools:
+($(CD) $(LANGTOOLS_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterim.gmk) +($(CD) $(LANGTOOLS_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterim.gmk)
interim-rmic: interim-rmic:
+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk) +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
interim-cldrconverter: interim-cldrconverter:
+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk) +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
buildtools-jdk: buildtools-jdk:
+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk) +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk)
endif
ALL_TARGETS += buildtools-langtools interim-langtools \ ALL_TARGETS += buildtools-langtools interim-langtools \
interim-rmic interim-cldrconverter buildtools-jdk interim-rmic interim-cldrconverter buildtools-jdk
@ -99,35 +103,40 @@ ALL_TARGETS += import-hotspot unpack-sec generate-exported-symbols
################################################################################ ################################################################################
# Gensrc targets, generating source before java compilation can be done # Gensrc targets, generating source before java compilation can be done
$(eval $(call DeclareRecipesForPhase, GENSRC, \ #
TARGET_SUFFIX := gensrc, \ # When creating a BUILDJDK, the java targets have already been built and copied
FILE_PREFIX := Gensrc, \ # into the buildjdk so no need to generate sources.
MAKE_SUBDIR := gensrc, \ ifneq ($(CREATING_BUILDJDK), true)
CHECK_MODULES := $(ALL_MODULES), \ $(eval $(call DeclareRecipesForPhase, GENSRC, \
MULTIPLE_MAKEFILES := true)) TARGET_SUFFIX := gensrc, \
FILE_PREFIX := Gensrc, \
MAKE_SUBDIR := gensrc, \
CHECK_MODULES := $(ALL_MODULES), \
MULTIPLE_MAKEFILES := true))
JDK_GENSRC_TARGETS := $(filter %-gensrc-jdk, $(GENSRC_TARGETS)) JDK_GENSRC_TARGETS := $(filter %-gensrc-jdk, $(GENSRC_TARGETS))
LANGTOOLS_GENSRC_TARGETS := $(filter %-gensrc-langtools, $(GENSRC_TARGETS)) LANGTOOLS_GENSRC_TARGETS := $(filter %-gensrc-langtools, $(GENSRC_TARGETS))
CORBA_GENSRC_TARGETS := $(filter %-gensrc-corba, $(GENSRC_TARGETS)) CORBA_GENSRC_TARGETS := $(filter %-gensrc-corba, $(GENSRC_TARGETS))
HOTSPOT_GENSRC_TARGETS := $(filter %-gensrc-hotspot, $(GENSRC_TARGETS)) HOTSPOT_GENSRC_TARGETS := $(filter %-gensrc-hotspot, $(GENSRC_TARGETS))
GENSRC_MODULEINFO_MODULES := $(ALL_MODULES) GENSRC_MODULEINFO_MODULES := $(ALL_MODULES)
GENSRC_MODULEINFO_TARGETS := $(addsuffix -gensrc-moduleinfo, \ GENSRC_MODULEINFO_TARGETS := $(addsuffix -gensrc-moduleinfo, \
$(GENSRC_MODULEINFO_MODULES)) $(GENSRC_MODULEINFO_MODULES))
GENSRC_MODULES := $(GENSRC_MODULEINFO_MODULES) GENSRC_MODULES := $(GENSRC_MODULEINFO_MODULES)
GENSRC_TARGETS += $(sort $(GENSRC_MODULEINFO_TARGETS) \ GENSRC_TARGETS += $(sort $(GENSRC_MODULEINFO_TARGETS) \
$(addsuffix -gensrc, $(GENSRC_MODULES))) $(addsuffix -gensrc, $(GENSRC_MODULES)))
define DeclareModuleInfoRecipe define DeclareModuleInfoRecipe
$1-gensrc-moduleinfo: $1-gensrc-moduleinfo:
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) \ +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) \
-f GensrcModuleInfo.gmk MODULE=$1) -f GensrcModuleInfo.gmk MODULE=$1)
$1-gensrc: $1-gensrc-moduleinfo $1-gensrc: $1-gensrc-moduleinfo
endef endef
$(foreach m, $(GENSRC_MODULEINFO_MODULES), $(eval $(call DeclareModuleInfoRecipe,$m))) $(foreach m, $(GENSRC_MODULEINFO_MODULES), $(eval $(call DeclareModuleInfoRecipe,$m)))
endif
ALL_TARGETS += $(GENSRC_TARGETS) ALL_TARGETS += $(GENSRC_TARGETS)