< prev index next >
make/Main.gmk
Print this page
@@ -88,20 +88,17 @@
interim-rmic interim-cldrconverter buildtools-jdk
################################################################################
# Special targets for certain modules
-import-hotspot:
- +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Import.gmk)
-
unpack-sec:
+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UnpackSecurity.gmk)
generate-exported-symbols:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildStatic.gmk)
-ALL_TARGETS += import-hotspot unpack-sec generate-exported-symbols
+ALL_TARGETS += unpack-sec generate-exported-symbols
################################################################################
# Gensrc targets, generating source before java compilation can be done
#
# When creating a BUILDJDK, the java targets have already been built and copied
@@ -264,27 +261,10 @@
+($(CD) $(JDK_TOPDIR)/make && $(MAKE) -f GenerateModuleSummary.gmk)
ALL_TARGETS += generate-summary
################################################################################
-# Strip binaries targets
-
-STRIP_MODULES := $(sort $(LIBS_MODULES) $(LAUNCHER_MODULES) $(COPY_MODULES) \
- $(GENDATA_MODULES))
-STRIP_TARGETS := $(addsuffix -strip, $(STRIP_MODULES))
-
-define DeclareStripRecipe
- $1-strip:
- +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f StripBinaries.gmk \
- MODULE=$1)
-endef
-
-$(foreach m, $(STRIP_MODULES), $(eval $(call DeclareStripRecipe,$m)))
-
-ALL_TARGETS += $(STRIP_TARGETS)
-
-################################################################################
# Jmod targets
JMOD_MODULES := $(ALL_MODULES)
JMOD_TARGETS := $(addsuffix -jmod, $(JMOD_MODULES))
@@ -329,21 +309,28 @@
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ZipSource.gmk)
jrtfs-jar:
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f JrtfsJar.gmk)
-jimages:
- +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jimages)
+product-images-jdk:
+ +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jdk)
+
+product-images-jre:
+ +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre)
+
+product-images-symbols:
+ +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols)
profiles:
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles)
mac-bundles-jdk:
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
ALL_TARGETS += source-tips create-hgtip-files bootcycle-images zip-security \
- zip-source jrtfs-jar jimages profiles mac-bundles-jdk
+ zip-source jrtfs-jar product-images-jdk product-images-jre \
+ product-images-symbols profiles mac-bundles-jdk
################################################################################
# Docs targets
docs-javadoc:
@@ -537,15 +524,13 @@
$(JAVA_TARGETS): interim-langtools
hotspot-ide-project: hotspot exploded-image
- import-hotspot: hotspot
-
generate-exported-symbols: java.base-libs jdk.jdwp.agent-libs
- $(LIBS_TARGETS): import-hotspot
+ $(LIBS_TARGETS): hotspot
$(LAUNCHER_TARGETS): java.base-libs
ifeq ($(STATIC_BUILD), true)
$(LAUNCHER_TARGETS): generate-exported-symbols
@@ -596,32 +581,22 @@
jdk.vm.ci-gensrc-hotspot: java.base-java
# Explicitly add dependencies for special targets
java.base-java: unpack-sec
- # The copy target copies files generated by gensrc
- java.base-copy-hotspot: java.base-gensrc-hotspot
-
jdk.jdeps-gendata: java rmic
- # Declare dependencies from <module>-strip to libs, launchers, gendata and copy
- $(foreach m, $(LIBS_MODULES), $(eval $m-strip: $m-libs))
- $(foreach m, $(LAUNCHER_MODULES), $(eval $m-strip: $m-launchers))
- $(foreach m, $(GENDATA_MODULES), $(eval $m-strip: $m-gendata))
- $(foreach m, $(COPY_MODULES), $(eval $m-strip: $m-copy))
-
# Declare dependencies between jmod targets. Only java.base jmod needs access
# to the other jmods to be built.
# When creating a BUILDJDK, we don't need to add hashes to java.base, thus
# we don't need to depend on all other jmods
ifneq ($(CREATING_BUILDJDK), true)
java.base-jmod: $(filter-out java.base-jmod \
$(addsuffix -jmod, $(call FindAllUpgradeableModules)), $(JMOD_TARGETS))
endif
# Declare dependencies from <module>-jmod to all other module targets
- $(foreach m, $(STRIP_MODULES), $(eval $m-jmod: $m-strip))
# When creating a BUILDJDK, the java compilation has already been done by the
# normal build and copied in.
ifneq ($(CREATING_BUILDJDK), true)
$(foreach m, $(JAVA_MODULES), $(eval $m-jmod: $m-java))
endif
@@ -666,28 +641,29 @@
# classlist.
generate-classlist: interim-image
endif
generate-classlist: buildtools-jdk
- jimages: generate-classlist
+ product-images-jdk product-images-jre: generate-classlist
endif
- jimages: jmods zip-source source-tips demos samples jrtfs-jar
+ product-images-jdk: jmods zip-source source-tips demos samples jrtfs-jar
+ product-images-jre: jmods source-tips jrtfs-jar
profiles: jmods zip-source source-tips jrtfs-jar
- mac-bundles-jdk: jimages
+ mac-bundles-jdk: product-images-jdk product-images-jre
- bootcycle-images: jimages
+ bootcycle-images: product-images-jdk
docs-javadoc: $(GENSRC_TARGETS) rmic
docs-jvmtidoc: hotspot
zip-docs: docs-javadoc docs-jvmtidoc
- test: jimages test-image
+ test: product-images-jdk test-image
create-buildjdk-copy: jdk.jlink-java java.base-gendata \
$(addsuffix -java, $(INTERIM_IMAGE_MODULES))
create-buildjdk-interim-image: create-buildjdk-copy
@@ -702,11 +678,11 @@
test-failure-handler: build-test-failure-handler
test-image-failure-handler: build-test-failure-handler
- build-test-hotspot-jtreg-native: buildtools-jdk import-hotspot
+ build-test-hotspot-jtreg-native: buildtools-jdk hotspot
build-test-jdk-jtreg-native: buildtools-jdk
test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native
@@ -714,11 +690,11 @@
test-image-hotspot-gtest: hotspot
test-hotspot-internal: exploded-image
- test-hotspot-jtreg: jimages test-image
+ test-hotspot-jtreg: product-images-jdk test-image
test-hotspot-gtest: exploded-image test-image-hotspot-gtest
install: product-images
@@ -752,12 +728,10 @@
launchers: $(LAUNCHER_TARGETS)
jmods: $(JMOD_TARGETS)
-strip-binaries: $(STRIP_TARGETS)
-
# Explicitly declare dependency for virtual target jdk.jdwp.agent-gensrc which
# is actually handled by jdk.jdi-gensrc
jdk.jdwp.agent-gensrc: jdk.jdi-gensrc
# Declare dependencies from <module> to all the individual targets specific
@@ -783,11 +757,12 @@
# The $(BUILD_OUTPUT)/images directory contain the resulting deliverables,
# and in line with this, our targets for creating these are named *-image[s].
# This target builds the product images, e.g. the JRE and JDK image
# (and possibly other, more specific versions)
-product-images: jimages demos samples zip-security exploded-image
+product-images: product-images-jdk product-images-jre product-images-symbols \
+ zip-security exploded-image
# The module summary cannot be run when:
# * Cross compiling and building a partial BUILDJDK for the build host
# * An external buildjdk has been supplied since it may not match the
# module selection of the target jdk
< prev index next >