--- old/make/Main.gmk 2016-10-04 13:16:34.486817476 +0200 +++ new/make/Main.gmk 2016-10-04 13:16:34.398813790 +0200 @@ -90,16 +90,13 @@ ################################################################################ # 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 @@ -266,23 +263,6 @@ 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) @@ -331,8 +311,14 @@ jrtfs-jar: +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f JrtfsJar.gmk) -jimages: - +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jimages) +jdk-image: + +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jdk) + +jre-image: + +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre) + +symbols-image: + +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols) profiles: +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles) @@ -341,7 +327,8 @@ +($(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 jdk-image jre-image \ + symbols-image profiles mac-bundles-jdk ################################################################################ # Docs targets @@ -379,7 +366,7 @@ ALL_TARGETS += create-buildjdk-copy create-buildjdk-interim-image ################################################################################ -# The interim-image is a small jlinked image that is used to generate artifacts +# The interim-image is a small jlinked image that is used to generate artifacts # at build time for use when linking the real images. interim-image: @@ -539,11 +526,9 @@ 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 @@ -598,17 +583,8 @@ # 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 -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 @@ -619,7 +595,6 @@ endif # Declare dependencies from -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) @@ -668,16 +643,17 @@ endif generate-classlist: buildtools-jdk - jimages: generate-classlist + jdk-image jre-image: generate-classlist endif - jimages: jmods zip-source source-tips demos samples jrtfs-jar + jdk-image: jmods zip-source source-tips demos samples jrtfs-jar + jre-image: jmods source-tips jrtfs-jar profiles: jmods zip-source source-tips jrtfs-jar - mac-bundles-jdk: jimages + mac-bundles-jdk: jdk-image jre-image - bootcycle-images: jimages + bootcycle-images: jdk-image docs-javadoc: $(GENSRC_TARGETS) rmic @@ -685,7 +661,7 @@ zip-docs: docs-javadoc docs-jvmtidoc - test: jimages test-image + test: jdk-image test-image create-buildjdk-copy: jdk.jlink-java java.base-gendata \ $(addsuffix -java, $(INTERIM_IMAGE_MODULES)) @@ -704,7 +680,7 @@ 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 @@ -716,7 +692,7 @@ test-hotspot-internal: exploded-image - test-hotspot-jtreg: jimages test-image + test-hotspot-jtreg: jdk-image test-image test-hotspot-gtest: exploded-image test-image-hotspot-gtest @@ -754,8 +730,6 @@ 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 @@ -785,7 +759,11 @@ # 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: jdk-image jre-image symbols-image exploded-image + +# zip-security is actually a bundle, but for now it needs to be considered +# an image until this can be cleaned up properly. +product-images: zip-security # The module summary cannot be run when: # * Cross compiling and building a partial BUILDJDK for the build host