# HG changeset patch
# User erikj
# Date 1525394185 25200
# Node ID b70281f5146e5c5b3246196ede8a942ce0160ee4
# Parent 64229f3e971602551e2d832c8a723ab8c2221974
8196113: Remove the Compact Profile builds
Reviewed-by: tbell, alanb
diff -r 64229f3e9716 -r b70281f5146e make/Bundles.gmk
--- a/make/Bundles.gmk Thu May 03 22:29:20 2018 +0000
+++ b/make/Bundles.gmk Thu May 03 17:36:25 2018 -0700
@@ -156,9 +156,6 @@
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 @@
################################################################################
-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 @@
################################################################################
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 -r 64229f3e9716 -r b70281f5146e make/Help.gmk
--- a/make/Help.gmk Thu May 03 22:29:20 2018 +0000
+++ b/make/Help.gmk Thu May 03 17:36:25 2018 -0700
@@ -43,7 +43,7 @@
$(info $(_) make images # Create complete jdk and jre images)
$(info $(_) # (alias for product-images))
$(info $(_) make <name>-image # Build just the image for any of: )
- $(info $(_) # jdk, jre, test, docs, symbols, profiles)
+ $(info $(_) # jdk, jre, test, docs, symbols)
$(info $(_) make <phase> # 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 @@
$(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 -r 64229f3e9716 -r b70281f5146e make/Images.gmk
--- a/make/Images.gmk Thu May 03 22:29:20 2018 +0000
+++ b/make/Images.gmk Thu May 03 17:36:25 2018 -0700
@@ -47,50 +47,8 @@
$(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 @@
)
$(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 @@
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 -r 64229f3e9716 -r b70281f5146e make/Main.gmk
--- a/make/Main.gmk Thu May 03 22:29:20 2018 +0000
+++ b/make/Main.gmk Thu May 03 17:36:25 2018 -0700
@@ -344,9 +344,6 @@
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 @@
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 @@
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 @@
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 @@
product-bundles: product-images
- profiles-bundles: profiles-images
-
test-bundles: test-image
docs-bundles: docs-image
@@ -992,9 +982,6 @@
# 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 @@
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 -r 64229f3e9716 -r b70281f5146e make/autoconf/spec.gmk.in
--- a/make/autoconf/spec.gmk.in Thu May 03 22:29:20 2018 +0000
+++ b/make/autoconf/spec.gmk.in Thu May 03 17:36:25 2018 -0700
@@ -817,18 +817,11 @@
# 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 @@
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