6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build
Summary: Needed BOOT_JAR_JFLAGS. Fixed PREVIOUS_RELEASE_IMAGE.
Reviewed-by: tbell
--- a/jdk/make/com/sun/crypto/provider/Makefile Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/com/sun/crypto/provider/Makefile Wed Aug 06 15:02:15 2008 -0700
@@ -193,7 +193,7 @@
$(UNSIGNED_DIR)/sunjce_provider.jar: build $(JCE_MANIFEST_FILE)
$(prep-target)
$(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ $(JAR_DIRS) \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
@@ -253,7 +253,7 @@
@$(CD) $(OBFUS_DIR); $(java-vm-cleanup)
$(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ \
-C $(OBFUS_DIR)/build com \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
$(sign-target)
@$(java-vm-cleanup)
--- a/jdk/make/com/sun/inputmethods/indicim/Makefile Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/com/sun/inputmethods/indicim/Makefile Wed Aug 06 15:02:15 2008 -0700
@@ -71,7 +71,7 @@
$(BOOT_JAR_CMD) -cf $@ \
-C $(CLASSDESTDIR) com \
-C $(CLASSDESTDIR) $(SERVICESDIR) \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
clean::
--- a/jdk/make/com/sun/inputmethods/thaiim/Makefile Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/com/sun/inputmethods/thaiim/Makefile Wed Aug 06 15:02:15 2008 -0700
@@ -71,7 +71,7 @@
$(BOOT_JAR_CMD) -cf $@ \
-C $(CLASSDESTDIR) com \
-C $(CLASSDESTDIR) $(SERVICESDIR) \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
clean::
--- a/jdk/make/common/BuildToolJar.gmk Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/common/BuildToolJar.gmk Wed Aug 06 15:02:15 2008 -0700
@@ -46,7 +46,7 @@
-sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
-C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
- $(JAR_JFLAGS) || $(RM) $@
+ $(BOOT_JAR_JFLAGS) || $(RM) $@
@$(java-vm-cleanup)
# Printing out a build tool information line
--- a/jdk/make/common/Demo.gmk Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/common/Demo.gmk Wed Aug 06 15:02:15 2008 -0700
@@ -251,7 +251,7 @@
@$(DEMO_JAVAC_INPUT)
$(BOOT_JAR_CMD) -cfm $@ $(DEMO_MANIFEST) \
-C $(DEMO_JAR_IMAGE) . \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
endif
@@ -317,7 +317,11 @@
# Applets are special, no jar file, no src.zip, everything expanded.
ifdef DEMO_IS_APPLET
@$(ECHO) "Expanding jar file into demos area at $(DEMO_DESTDIR)"
- ( $(CD) $(DEMO_DESTDIR) && $(BOOT_JAR_CMD) -xfv $(DEMONAME).jar && $(RM) -r META-INF $(DEMONAME).jar )
+ ( $(CD) $(DEMO_DESTDIR) && \
+ $(BOOT_JAR_CMD) -xfv $(DEMONAME).jar \
+ $(BOOT_JAR_JFLAGS) && \
+ $(RM) -r META-INF $(DEMONAME).jar && \
+ $(java-vm-cleanup) )
@( $(CD) $(DEMO_DESTDIR) && $(java-vm-cleanup) )
@$(ECHO) "Expanding source into demos area at $(DEMO_DESTDIR)"
( $(CD) $(DEMO_DESTDIR) && $(UNZIP) -o src.zip && $(RM) src.zip )
--- a/jdk/make/common/Release.gmk Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/common/Release.gmk Wed Aug 06 15:02:15 2008 -0700
@@ -662,7 +662,7 @@
$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
$(prep-target)
$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
- @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
+ @$(RES_JAR_ARGLIST) $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
# Create jsse.jar containing SunJSSE implementation classes
@@ -671,7 +671,7 @@
$(prep-target)
$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
$(JSSE_CLASSES_DIRS:%=-C $(CLASSBINDIR) %) \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
# Create sec-bin.zip
@@ -721,7 +721,7 @@
$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
$(prep-target)
$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
- @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
+ @$(RT_JAR_ARGLIST) $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
# Meta-index construction to make core class loaders lazier
@@ -955,7 +955,7 @@
@#
$(BOOT_JAR_CMD) c0f $(LIBDIR)/tools.jar $(addprefix \
-C $(CLASSBINDIR) , $(TOOLS)) \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
@#
@@ -968,7 +968,7 @@
-Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
$(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS)
$(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \
- -C $(OUTPUTDIR)/symbols META-INF $(JAR_JFLAGS)
+ -C $(OUTPUTDIR)/symbols META-INF $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
$(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym
@#
@@ -1132,11 +1132,11 @@
COMPARE_FILTER = | $(EGREP) -v /fastdebug/ | $(EGREP) -v /demo/ | $(EGREP) -v /sample/
# If a previuous image is provided, no need to install it.
-ifdef PREVIOUS_JDK_IMAGE
+ifdef PREVIOUS_RELEASE_IMAGE
# Just use the pre-installed images
- PREV_JRE_IMAGE_DIR=$(PREVIOUS_JDK_IMAGE)/jre
- PREV_JDK_IMAGE_DIR=$(PREVIOUS_JDK_IMAGE)
+ PREV_JRE_IMAGE_DIR=$(PREVIOUS_RELEASE_IMAGE)/jre
+ PREV_JDK_IMAGE_DIR=$(PREVIOUS_RELEASE_IMAGE)
else
--- a/jdk/make/common/internal/BinaryPlugs.gmk Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/common/internal/BinaryPlugs.gmk Wed Aug 06 15:02:15 2008 -0700
@@ -185,7 +185,8 @@
define import-binary-plug-classes
@$(MKDIR) -p $(CLASSDESTDIR)
@$(CAT) $1 | $(SED) -e 's/^/PLUG IMPORT: /'
-($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) @$1)
+($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) @$1 $(BOOT_JAR_JFLAGS) )
+($(CD) $(CLASSDESTDIR) && $(java-vm-cleanup) )
endef # import-binary-plug-classes
# Import specific area classes (the classes are always created)
@@ -275,7 +276,8 @@
@$(prep-target)
@$(ECHO) "PLUG EXPORT: $(@F)"
@$(CAT) $(PLUG_TEMPDIR)/all.clist | $(SED) -e 's/^/PLUG EXPORT: /'
- $(BOOT_JAR_CMD) cf $@ @$(PLUG_TEMPDIR)/all.jargs
+ $(BOOT_JAR_CMD) cf $@ @$(PLUG_TEMPDIR)/all.jargs $(BOOT_JAR_JFLAGS)
+ @$(java-vm-cleanup)
export-binary-plugs-jar: $(PLUG_EXPORT_JARFILE)
# Export native libraries
--- a/jdk/make/common/internal/ImportComponents.gmk Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/common/internal/ImportComponents.gmk Wed Aug 06 15:02:15 2008 -0700
@@ -107,8 +107,9 @@
define Unjar
( \
$(MKDIR) -p $1; \
- $(ECHO) "( $(CD) $1 && $(BOOT_JAR_CMD) xfv $2 $3 )" ; \
- ( $(CD) $1 && $(BOOT_JAR_CMD) xfv $2 $3 ) \
+ $(ECHO) "( $(CD) $1 && $(BOOT_JAR_CMD) xfv $2 $3 $(BOOT_JAR_JFLAGS) )" ; \
+ ( $(CD) $1 && $(BOOT_JAR_CMD) xfv $2 $3 $(BOOT_JAR_JFLAGS) ) && \
+ ( $(CD) $1 && $(java-vm-cleanup) ) \
)
endef
--- a/jdk/make/common/shared/Defs-java.gmk Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/common/shared/Defs-java.gmk Wed Aug 06 15:02:15 2008 -0700
@@ -190,6 +190,7 @@
BOOT_JAVACFLAGS += -Werror
endif
BOOT_JAVACFLAGS += -encoding ascii
+BOOT_JAR_JFLAGS += $(JAR_JFLAGS)
BOOT_JAVA_CMD = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
BOOT_JAVAC_CMD = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
--- a/jdk/make/java/management/Makefile Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/java/management/Makefile Wed Aug 06 15:02:15 2008 -0700
@@ -93,7 +93,8 @@
include $(BUILDDIR)/common/Library.gmk
$(AGENTJAR): $(LIBDIR) $(TEMPDIR)/manifest
- $(BOOT_JAR_CMD) -cfm $(AGENTJAR) $(TEMPDIR)/manifest
+ $(BOOT_JAR_CMD) -cfm $(AGENTJAR) $(TEMPDIR)/manifest $(BOOT_JAR_JFLAGS)
+ @$(java-vm-cleanup)
$(TEMPDIR)/manifest: $(MANIFEST)
$(install-file)
--- a/jdk/make/javax/crypto/Makefile Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/javax/crypto/Makefile Wed Aug 06 15:02:15 2008 -0700
@@ -230,7 +230,7 @@
$(UNSIGNED_DIR)/jce.jar: prebuild build $(JCE_MANIFEST_FILE)
$(prep-target)
$(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ $(JAR_DIRS) \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
$(CP) -r $(CLASSDESTDIR)/* $(CLASSBINDIR)
@$(java-vm-cleanup)
@@ -268,7 +268,7 @@
$(prep-target)
$(BOOT_JAR_CMD) cmf policy/unlimited/UNLIMITED $@ \
-C policy/unlimited default_US_export.policy \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
$(UNSIGNED_POLICY_BUILDDIR)/unlimited/local_policy.jar: \
@@ -277,7 +277,7 @@
$(prep-target)
$(BOOT_JAR_CMD) cmf policy/unlimited/UNLIMITED $@ \
-C policy/unlimited default_local.policy \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
#
@@ -302,7 +302,7 @@
$(BOOT_JAR_CMD) cmf policy/limited/LIMITED $@ \
-C policy/limited default_local.policy \
-C policy/limited exempt_local.policy \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
UNSIGNED_POLICY_FILES = \
@@ -402,7 +402,7 @@
$(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ \
-C $(OBFUS_DIR)/build javax \
-C $(OBFUS_DIR)/build sun \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
$(sign-target)
@$(java-vm-cleanup)
--- a/jdk/make/javax/swing/beaninfo/SwingBeans.gmk Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/javax/swing/beaninfo/SwingBeans.gmk Wed Aug 06 15:02:15 2008 -0700
@@ -170,7 +170,7 @@
$(BOOT_JAR_CMD) cf $(TEMPDIR)/tmp.jar \
-C $(BEANCLASSDIR) javax \
-C $(BEANCLASSDIR) sun \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
$(MV) $(TEMPDIR)/tmp.jar $(JDK_IMAGE_DIR)/lib/dt.jar
@$(java-vm-cleanup)
--- a/jdk/make/sun/jconsole/Makefile Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/sun/jconsole/Makefile Wed Aug 06 15:02:15 2008 -0700
@@ -82,7 +82,7 @@
$(BOOT_JAR_CMD) -cfm $(JARFILE) $(TEMPDIR)/manifest \
-C $(CLASSBINDIR) sun/tools/jconsole \
-C $(CLASSBINDIR) com/sun/tools/jconsole \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
clean clobber::
--- a/jdk/make/sun/net/spi/nameservice/dns/Makefile Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/sun/net/spi/nameservice/dns/Makefile Wed Aug 06 15:02:15 2008 -0700
@@ -67,7 +67,7 @@
$(BOOT_JAR_CMD) -cf $(JARFILE) \
-C $(CLASSDESTDIR) sun \
-C $(CLASSDESTDIR) META-INF \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
include $(BUILDDIR)/common/Classes.gmk
--- a/jdk/make/sun/nio/Makefile Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/sun/nio/Makefile Wed Aug 06 15:02:15 2008 -0700
@@ -91,7 +91,7 @@
$(BOOT_JAR_CMD) cf $(CHARSETS_JAR) \
-C $(CLASSDESTDIR) sun \
-C $(CLASSDESTDIR) $(SERVICE_DESCRIPTION_PATH) \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
clean::
--- a/jdk/make/sun/security/mscapi/Makefile Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/sun/security/mscapi/Makefile Wed Aug 06 15:02:15 2008 -0700
@@ -210,7 +210,7 @@
$(UNSIGNED_DIR)/sunmscapi.jar: build
$(prep-target)
$(BOOT_JAR_CMD) cf $@ $(JAR_DIRS) \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
--- a/jdk/make/sun/security/pkcs11/Makefile Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/sun/security/pkcs11/Makefile Wed Aug 06 15:02:15 2008 -0700
@@ -210,7 +210,7 @@
$(UNSIGNED_DIR)/sunpkcs11.jar: build
$(prep-target)
$(BOOT_JAR_CMD) cf $@ $(JAR_DIRS) \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
--- a/jdk/make/sun/text/Makefile Wed Jul 05 16:39:28 2017 +0200
+++ b/jdk/make/sun/text/Makefile Wed Aug 06 15:02:15 2008 -0700
@@ -112,7 +112,7 @@
$(LOCALEDATA_JAR): $(EXTDIR) $(FILES_class) $(BIFILES) $(SPECIALFILES)
$(prep-target)
$(BOOT_JAR_CMD) -cf $@ -C $(CLASSDESTDIR) sun \
- $(JAR_JFLAGS)
+ $(BOOT_JAR_JFLAGS)
@$(java-vm-cleanup)
build: $(LOCALEDATA_JAR)