Mercurial > hg > release > icedtea6-1.13
view patches/pr2800-missing_resources.patch @ 3258:ced27e54d17c
New backports for issues to be fixed in 1.13.12.
S2178143, PR2959: JVM crashes if the number of bound CPUs changed during runtime
S6260348, PR3068: GTK+ L&F JTextComponent not respecting desktop caret blink rate
S6961123, PR2975: setWMClass fails to null-terminate WM_CLASS string
PR2800: Files are missing from resources.jar
PR3137: GTKLookAndFeel does not honor gtk-alternative-button-order
2016-08-15 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches.
* NEWS: Updated.
* patches/ecj/icedtea.patch:
Adjust and extend, following PR2800.
* patches/openjdk/2178143-pr2959.patch,
* patches/openjdk/6260348-pr3068.patch,
* patches/openjdk/6961123-pr2975.patch,
* patches/pr2800-missing_resources.patch,
* patches/pr3137-alt_button_order.patch:
New backports for issues to be fixed in 1.13.12.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Wed, 17 Aug 2016 03:22:59 +0100 |
| parents | |
| children |
line wrap: on
line source
# HG changeset patch # User andrew # Date 1468897960 -3600 # Tue Jul 19 04:12:40 2016 +0100 # Node ID 43efac8a0030e2bb6b4c9a7ecb16c695b9794c69 # Parent 322e1901d8ba95f031b1a82fd51c0ae279e1a8bc PR2800: Files are missing from resources.jar Summary: Compile and filter list of files from IMPORTSRCDIR and add to resources.jar diff -Nru openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk --- openjdk.orig/jdk/make/common/Release.gmk 2016-08-15 00:13:41.073898470 +0100 +++ openjdk/jdk/make/common/Release.gmk 2016-08-15 00:23:17.156538545 +0100 @@ -232,9 +232,11 @@ ifndef COMPRESS_JARS CREATE_JAR_OPTS = c0mf CREATE_JAR_OPTS_NOMANIFEST = c0f + UPDATE_JAR_OPTS = u0f else CREATE_JAR_OPTS = cmf CREATE_JAR_OPTS_NOMANIFEST = cf + UPDATE_JAR_OPTS = uf endif # @@ -618,6 +620,21 @@ $(ECHO) "sun/tools/jinfo/" >> $@ $(ECHO) "sun/tools/jmap/" >> $@ +###################################################### +# List of directories in impsrc directory that should NOT be in resources.jar +###################################################### + +NOT_RESOURCE_JAR_LIST = $(ABS_TEMPDIR)/not_resource_jar.list + +$(NOT_RESOURCE_JAR_LIST): FRC + $(prep-target) + $(ECHO) "#\n" >> $@ + $(ECHO) "# List of subdirectories not to include in resources.jar" >> $@ + $(ECHO) "# Directories must contain trailing '/'." >> $@ + $(ECHO) "com/" >> $@ + $(ECHO) "javax/" >> $@ + $(ECHO) "org/" >> $@ + $(ECHO) "sun/" >> $@ # File order list for rt.jar # - sun.applet is included, till hotjava stops relying on it. @@ -629,6 +646,7 @@ JARFILELISTS_TEMPDIR=$(ABS_TEMPDIR)/jarfilelists RT_JAR_FILELIST=$(JARFILELISTS_TEMPDIR)/rt_jar_list RES_JAR_FILELIST=$(JARFILELISTS_TEMPDIR)/resources_jar_list +IMPORT_JAR_FILELIST=$(JARFILELISTS_TEMPDIR)/imp_file_list JARREORDER_JARFILE = $(ABS_BUILDTOOLJARDIR)/jarreorder.jar @@ -641,6 +659,15 @@ $(MV) $@.temp $@ @($(CD) $(CLASSBINDIR) && $(java-vm-cleanup)) +$(IMPORT_JAR_FILELIST): $(JARREORDER_JARFILE) $(NOT_RESOURCE_JAR_LIST) + $(prep-target) + $(RM) $@.temp + ($(CD) $(IMPORTSRCDIR) && \ + $(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \ + -o $@.temp - $(NOT_RESOURCE_JAR_LIST) . ) + $(MV) $@.temp $@ + @($(CD) $(IMPORTSRCDIR) && $(java-vm-cleanup)) + # Create the rt.jar file list & non-class files list JARSPLIT_JARFILE = $(BUILDTOOLJARDIR)/jarsplit.jar @@ -670,11 +697,15 @@ $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST) $(prep-target) $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@ -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE) +$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE) $(IMPORT_JAR_FILELIST) $(prep-target) $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(JAR_MANIFEST_FILE) $@ \ @$(RES_JAR_ARGLIST) $(JAR_JFLAGS) + $(CD) $(IMPORTSRCDIR) && \ + $(BOOT_JAR_CMD) $(UPDATE_JAR_OPTS) $@ \ + @$(IMPORT_JAR_FILELIST) $(JAR_JFLAGS) @$(java-vm-cleanup) + @$(CD) $(IMPORTSRCDIR) && $(java-vm-cleanup) # Create jsse.jar containing SunJSSE implementation classes JSSE_JAR=$(TEMPDIR)/jsse-orig.jar