From 4fc0229dcb4ea4d4ff0ad9836057d699e5646c71 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Thu, 3 May 2018 17:36:25 -0700 Subject: [PATCH] 8196113: Remove the Compact Profile builds Reviewed-by: tbell, alanb --- make/Bundles.gmk | 35 +-------------- make/Help.gmk | 3 +- make/Images.gmk | 92 +-------------------------------------- make/Main.gmk | 18 +------- make/autoconf/spec.gmk.in | 13 ------ 5 files changed, 5 insertions(+), 156 deletions(-) diff --git a/make/Bundles.gmk b/make/Bundles.gmk index e7f1ac246e2..e447eb51c54 100644 --- a/make/Bundles.gmk +++ b/make/Bundles.gmk @@ -156,9 +156,6 @@ else JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR) JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER) JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER) - JRE_COMPACT1_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)-compact1 - JRE_COMPACT2_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)-compact2 - JRE_COMPACT3_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)-compact3 ifneq ($(DEBUG_LEVEL), release) JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) @@ -281,35 +278,6 @@ endif ################################################################################ -ifneq ($(filter profiles-bundles, $(MAKECMDGOALS)), ) - ifeq ($(OPENJDK_TARGET_OS), macosx) - $(error Creating compact profiles bundles on macosx is unsupported) - endif - - define GenerateCompactProfilesBundles - ALL_JRE_COMPACT$1_FILES := $$(call CacheFind, $$(JRE_COMPACT$1_IMAGE_DIR)) - - JRE_COMPACT$1_BUNDLE_FILES := $$(filter-out \ - $$(SYMBOLS_EXCLUDE_PATTERN), \ - $$(ALL_JRE_COMPACT$1_FILES)) - - $$(eval $$(call SetupBundleFile, BUILD_JRE_COMPACT$1_BUNDLE, \ - BUNDLE_NAME := $$(JRE_COMPACT$1_BUNDLE_NAME), \ - FILES := $$(JRE_COMPACT$1_BUNDLE_FILES), \ - BASE_DIRS := $$(JRE_COMPACT$1_IMAGE_DIR), \ - SUBDIR := $$(JRE_COMPACT$1_BUNDLE_SUBDIR), \ - )) - - PROFILES_TARGETS += $$(BUILD_JRE_COMPACT$1_BUNDLE) - endef - - $(eval $(call GenerateCompactProfilesBundles,1)) - $(eval $(call GenerateCompactProfilesBundles,2)) - $(eval $(call GenerateCompactProfilesBundles,3)) -endif - -################################################################################ - ifneq ($(filter test-bundles, $(MAKECMDGOALS)), ) TEST_BUNDLE_FILES := $(call CacheFind, $(TEST_IMAGE_DIR)) @@ -345,8 +313,7 @@ $(eval $(call IncludeCustomExtension, Bundles.gmk)) ################################################################################ product-bundles: $(PRODUCT_TARGETS) -profiles-bundles: $(PROFILES_TARGETS) test-bundles: $(TEST_TARGETS) docs-bundles: $(DOCS_TARGETS) -.PHONY: all default product-bundles profiles-bundles test-bundles docs-bundles +.PHONY: all default product-bundles test-bundles docs-bundles diff --git a/make/Help.gmk b/make/Help.gmk index b6974c71de4..e839fb81d42 100644 --- a/make/Help.gmk +++ b/make/Help.gmk @@ -43,7 +43,7 @@ help: $(info $(_) make images # Create complete jdk and jre images) $(info $(_) # (alias for product-images)) $(info $(_) make -image # Build just the image for any of: ) - $(info $(_) # jdk, jre, test, docs, symbols, profiles) + $(info $(_) # jdk, jre, test, docs, symbols) $(info $(_) make # Build the specified phase and everything it depends on) $(info $(_) # (gensrc, java, copy, libs, launchers, gendata, rmic)) $(info $(_) make *-only # Applies to most targets and disables building the) @@ -51,7 +51,6 @@ help: $(info $(_) # result in incorrect build results!) $(info $(_) make docs # Create all docs) $(info $(_) make docs-jdk-api # Create just JDK javadocs) - $(info $(_) make profiles # Create complete jre compact profile images) $(info $(_) make bootcycle-images # Build images twice, second time with newly built JDK) $(info $(_) make install # Install the generated images locally) $(info $(_) make reconfigure # Rerun configure with the same arguments as last time) diff --git a/make/Images.gmk b/make/Images.gmk index 3514d2f3ee6..1eb386f89f6 100644 --- a/make/Images.gmk +++ b/make/Images.gmk @@ -47,50 +47,8 @@ JRE_MODULES += $(filter $(ALL_MODULES), $(BOOT_MODULES) \ $(PLATFORM_MODULES) $(JRE_TOOL_MODULES)) JDK_MODULES += $(ALL_MODULES) -# Modules list for compact builds -JRE_COMPACT1_MODULES := \ - java.logging \ - java.scripting \ - jdk.localedata \ - jdk.crypto.cryptoki \ - jdk.crypto.ec \ - jdk.unsupported \ - # - -JRE_COMPACT2_MODULES := \ - $(JRE_COMPACT1_MODULES) \ - java.rmi \ - java.sql \ - java.xml \ - jdk.xml.dom \ - jdk.httpserver \ - # - -JRE_COMPACT3_MODULES := \ - $(JRE_COMPACT2_MODULES) \ - java.smartcardio \ - java.compiler \ - java.instrument \ - java.management \ - java.management.rmi \ - java.naming \ - java.prefs \ - java.security.jgss \ - java.security.sasl \ - java.sql.rowset \ - java.xml.crypto \ - jdk.management \ - jdk.naming.dns \ - jdk.naming.rmi \ - jdk.sctp \ - jdk.security.auth \ - # - JRE_MODULES_LIST := $(call CommaList, $(JRE_MODULES)) JDK_MODULES_LIST := $(call CommaList, $(JDK_MODULES)) -JRE_COMPACT1_MODULES_LIST := $(call CommaList, $(JRE_COMPACT1_MODULES)) -JRE_COMPACT2_MODULES_LIST := $(call CommaList, $(JRE_COMPACT2_MODULES)) -JRE_COMPACT3_MODULES_LIST := $(call CommaList, $(JRE_COMPACT3_MODULES)) ################################################################################ @@ -152,45 +110,8 @@ $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ ) $(TOUCH) $@ - -$(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ - $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE) - $(ECHO) Creating jre compact1 jimage - $(RM) -r $(JRE_COMPACT1_IMAGE_DIR) - $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre_compact1, \ - $(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \ - $(JLINK_JRE_EXTRA_OPTS) \ - --output $(JRE_COMPACT1_IMAGE_DIR) \ - ) - $(TOUCH) $@ - -$(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ - $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(BASE_RELEASE_FILE) - $(ECHO) Creating jre compact2 jimage - $(RM) -r $(JRE_COMPACT2_IMAGE_DIR) - $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre_compact2, \ - $(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \ - $(JLINK_JRE_EXTRA_OPTS) \ - --output $(JRE_COMPACT2_IMAGE_DIR) \ - ) - $(TOUCH) $@ - -$(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ - $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE) - $(ECHO) Creating jre compact3 jimage - $(RM) -r $(JRE_COMPACT3_IMAGE_DIR) - $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre_compact3, \ - $(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \ - $(JLINK_JRE_EXTRA_OPTS) \ - --output $(JRE_COMPACT3_IMAGE_DIR) \ - ) - $(TOUCH) $@ - TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) -TOOL_JRE_COMPACT1_TARGETS := $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) -TOOL_JRE_COMPACT2_TARGETS := $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) -TOOL_JRE_COMPACT3_TARGETS := $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) ################################################################################ # /man dir @@ -442,15 +363,4 @@ symbols: $(SYMBOLS_TARGETS) all: jdk jre symbols -$(JRE_COMPACT1_TARGETS): $(TOOL_JRE_COMPACT1_TARGETS) -$(JRE_COMPACT2_TARGETS): $(TOOL_JRE_COMPACT2_TARGETS) -$(JRE_COMPACT3_TARGETS): $(TOOL_JRE_COMPACT3_TARGETS) - -profiles: $(TOOL_JRE_COMPACT1_TARGETS) \ - $(TOOL_JRE_COMPACT2_TARGETS) \ - $(TOOL_JRE_COMPACT3_TARGETS) \ - $(JRE_COMPACT1_TARGETS) \ - $(JRE_COMPACT2_TARGETS) \ - $(JRE_COMPACT3_TARGETS) - -.PHONY: default all jdk jre symbols profiles +.PHONY: default all jdk jre symbols diff --git a/make/Main.gmk b/make/Main.gmk index 26d282db6c8..dd5f3a1c9de 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -344,9 +344,6 @@ jre-image: symbols-image: +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols) -profiles-image: - +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles) - mac-bundles-jdk: +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk) @@ -358,7 +355,7 @@ exploded-image-optimize: ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \ zip-source jrtfs-jar jdk-image jre-image \ - symbols-image profiles-image mac-bundles-jdk \ + symbols-image mac-bundles-jdk \ release-file exploded-image-optimize ################################################################################ @@ -569,16 +566,13 @@ ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \ product-bundles: +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk product-bundles) -profiles-bundles: - +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk profiles-bundles) - test-bundles: +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk test-bundles) docs-bundles: +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk docs-bundles) -ALL_TARGETS += product-bundles profiles-bundles test-bundles docs-bundles +ALL_TARGETS += product-bundles test-bundles docs-bundles ################################################################################ # Install targets @@ -804,8 +798,6 @@ else jre-image: jmods release-file symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS) - profiles-image: jmods release-file - mac-bundles-jdk: jdk-image jre-image # The optimize target can run as soon as the modules dir has been completely @@ -886,8 +878,6 @@ else product-bundles: product-images - profiles-bundles: profiles-images - test-bundles: test-image docs-bundles: docs-image @@ -992,9 +982,6 @@ product-images: jdk-image jre-image symbols-image exploded-image # an image until this can be cleaned up properly. product-images: zip-security -# Declare these for backwards compatiblity and convenience. -profiles profiles-images: profiles-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 @@ -1034,7 +1021,6 @@ ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \ exploded-image-base exploded-image \ create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \ docs-javase docs-reference docs-javadoc mac-bundles product-images \ - profiles profiles-images \ docs-image test-image all-images \ all-bundles diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in index 59524a0a737..9acb2da0def 100644 --- a/make/autoconf/spec.gmk.in +++ b/make/autoconf/spec.gmk.in @@ -817,18 +817,11 @@ OS_VERSION_MICRO:=@OS_VERSION_MICRO@ # Images directory definitions JDK_IMAGE_SUBDIR:=jdk JRE_IMAGE_SUBDIR:=jre -JRE_COMPACT1_IMAGE_SUBDIR := jre-compact1 -JRE_COMPACT2_IMAGE_SUBDIR := jre-compact2 -JRE_COMPACT3_IMAGE_SUBDIR := jre-compact3 # Colon left out to be able to override output dir for bootcycle-images JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR) JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR) -JRE_COMPACT1_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(JRE_COMPACT1_IMAGE_SUBDIR) -JRE_COMPACT2_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(JRE_COMPACT2_IMAGE_SUBDIR) -JRE_COMPACT3_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(JRE_COMPACT3_IMAGE_SUBDIR) - # Test image, as above TEST_IMAGE_SUBDIR:=test TEST_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR) @@ -866,12 +859,6 @@ else ifneq ($(DEBUG_LEVEL), release) endif JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).tar.gz JRE_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART).tar.gz -JRE_COMPACT1_BUNDLE_NAME := \ - jre-$(VERSION_SHORT)+$(VERSION_BUILD)-compact1_$(OPENJDK_TARGET_BUNDLE_PLATFORM)_bin$(DEBUG_PART).tar.gz -JRE_COMPACT2_BUNDLE_NAME := \ - jre-$(VERSION_SHORT)+$(VERSION_BUILD)-compact2_$(OPENJDK_TARGET_BUNDLE_PLATFORM)_bin$(DEBUG_PART).tar.gz -JRE_COMPACT3_BUNDLE_NAME := \ - jre-$(VERSION_SHORT)+$(VERSION_BUILD)-compact3_$(OPENJDK_TARGET_BUNDLE_PLATFORM)_bin$(DEBUG_PART).tar.gz JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz JRE_SYMBOLS_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz