/hg/icedtea6: S7025066: Build systems changes to support SE Embe...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 9 07:37:33 PDT 2013
changeset 745a52b6cece in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=745a52b6cece
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Oct 09 15:37:19 2013 +0100
S7025066: Build systems changes to support SE Embedded Integration
2013-10-09 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* patches/ecj/icedtea.patch:
Regenerated following compressed JAR support.
* patches/openjdk/7025066-embedded_build.patch:
Backport to actually provide COMPRESS_JARS support
in the build.
* NEWS: Updated.
diffstat:
ChangeLog | 11 +
Makefile.am | 3 +-
NEWS | 1 +
patches/ecj/icedtea.patch | 90 ++--
patches/openjdk/7025066-embedded_build.patch | 456 +++++++++++++++++++++++++++
5 files changed, 515 insertions(+), 46 deletions(-)
diffs (truncated from 764 to 500 lines):
diff -r 9e8a68310569 -r 745a52b6cece ChangeLog
--- a/ChangeLog Wed Oct 09 01:08:04 2013 +0100
+++ b/ChangeLog Wed Oct 09 15:37:19 2013 +0100
@@ -1,3 +1,14 @@
+2013-10-09 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * patches/ecj/icedtea.patch:
+ Regenerated following compressed JAR support.
+ * patches/openjdk/7025066-embedded_build.patch:
+ Backport to actually provide COMPRESS_JARS support
+ in the build.
+ * NEWS: Updated.
+
2012-08-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1288: Allow JARs to be optionally compressed by
diff -r 9e8a68310569 -r 745a52b6cece Makefile.am
--- a/Makefile.am Wed Oct 09 01:08:04 2013 +0100
+++ b/Makefile.am Wed Oct 09 15:37:19 2013 +0100
@@ -632,7 +632,8 @@
patches/arm/cc_compile-04.patch \
patches/arm/cc_compile-05.patch \
patches/arm/cc_compile-06.patch \
- patches/hotspot/hs23/arm-hsdis.patch
+ patches/hotspot/hs23/arm-hsdis.patch \
+ patches/openjdk/7025066-embedded_build.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 9e8a68310569 -r 745a52b6cece NEWS
--- a/NEWS Wed Oct 09 01:08:04 2013 +0100
+++ b/NEWS Wed Oct 09 15:37:19 2013 +0100
@@ -884,6 +884,7 @@
- S7000225: Sanity check on sane-alsa-headers is broken
- S7013519: [parfait] Integer overflows in 2D code
- S7018912: [parfait] potential buffer overruns in imageio jpeg
+ - S7025066: Build systems changes to support SE Embedded Integration
- S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber
- S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc()
- S8020983, RH976897: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances
diff -r 9e8a68310569 -r 745a52b6cece patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Wed Oct 09 01:08:04 2013 +0100
+++ b/patches/ecj/icedtea.patch Wed Oct 09 15:37:19 2013 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
---- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2012-01-18 21:43:04.134185695 +0000
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2013-10-04 15:45:38.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2013-10-09 12:46:11.374453549 +0100
@@ -42,7 +42,7 @@
# the rmic iiop backend needs some classes that are part of the impl/util
# package. These classes use log wrappers, so they must be built after
@@ -12,7 +12,7 @@
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile
--- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2012-01-18 21:43:04.146185899 +0000
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2013-10-09 12:46:11.374453549 +0100
@@ -0,0 +1,38 @@
+#
+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -53,7 +53,7 @@
+#
+include $(BUILDDIR)/common/Classes.gmk
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile
---- openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile 2010-05-26 09:31:18.000000000 +0100
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile 2013-10-04 15:45:38.000000000 +0100
+++ openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,224 +0,0 @@
-#
@@ -281,8 +281,8 @@
-#
-include $(BUILDDIR)/common/Rules.gmk
diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk
---- openjdk-ecj.orig/corba/make/common/Defs.gmk 2011-01-10 21:21:55.000000000 +0000
-+++ openjdk-ecj/corba/make/common/Defs.gmk 2012-01-18 21:43:04.146185899 +0000
+--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2013-10-04 15:45:38.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs.gmk 2013-10-09 12:46:11.374453549 +0100
@@ -53,6 +53,13 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -316,8 +316,8 @@
vpath %.java $(VPATH.java)
vpath %.class $(CLASSBINDIR)
diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk
---- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2012-01-18 16:50:50.977002556 +0000
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2012-01-18 21:43:04.146185899 +0000
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2013-10-09 12:43:59.208422274 +0100
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2013-10-09 12:46:11.374453549 +0100
@@ -271,7 +271,7 @@
#
VM_NAME = server
@@ -328,8 +328,8 @@
#
# We want to privatize JVM symbols on Solaris. This is so the user can
diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile
---- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2013-10-04 15:45:38.000000000 +0100
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2013-10-09 12:46:11.374453549 +0100
@@ -93,8 +93,6 @@
POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
@@ -407,8 +407,8 @@
pi.compile: $(PIGENERATEDFILES)
diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile
---- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2013-10-04 15:45:38.000000000 +0100
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2013-10-09 12:46:11.374453549 +0100
@@ -172,7 +172,6 @@
ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
@@ -426,8 +426,8 @@
portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
diff -Nru openjdk-ecj.orig/jaxp/build.xml openjdk-ecj/jaxp/build.xml
---- openjdk-ecj.orig/jaxp/build.xml 2011-01-10 21:21:59.000000000 +0000
-+++ openjdk-ecj/jaxp/build.xml 2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/jaxp/build.xml 2013-10-04 15:50:12.000000000 +0100
++++ openjdk-ecj/jaxp/build.xml 2013-10-09 12:46:11.374453549 +0100
@@ -131,7 +131,8 @@
memoryMaximumSize="${javac.memoryMaximumSize}"
source="${javac.source}"
@@ -439,8 +439,8 @@
<compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
<src refid="src.dir.id"/>
diff -Nru openjdk-ecj.orig/jaxws/build.xml openjdk-ecj/jaxws/build.xml
---- openjdk-ecj.orig/jaxws/build.xml 2011-01-10 21:22:02.000000000 +0000
-+++ openjdk-ecj/jaxws/build.xml 2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/jaxws/build.xml 2013-10-04 15:51:17.000000000 +0100
++++ openjdk-ecj/jaxws/build.xml 2013-10-09 12:46:11.374453549 +0100
@@ -131,7 +131,8 @@
memoryMaximumSize="${javac.memoryMaximumSize}"
source="${javac.source}"
@@ -452,9 +452,9 @@
<compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
<src refid="src.dir.id"/>
diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk
---- openjdk-ecj.orig/jdk/make/common/Release.gmk 2012-01-18 16:51:03.177199616 +0000
-+++ openjdk-ecj/jdk/make/common/Release.gmk 2012-01-18 21:43:04.150185964 +0000
-@@ -649,10 +649,23 @@
+--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2013-10-09 12:44:01.020450124 +0100
++++ openjdk-ecj/jdk/make/common/Release.gmk 2013-10-09 13:17:10.126995245 +0100
+@@ -660,10 +660,23 @@
$(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
$(prep-target)
$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
@@ -465,22 +465,22 @@
$(prep-target)
+ifneq (,$(JAR_KNOWS_ATFILE))
+ (cd $(CLASSBINDIR) && \
- $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(JAR_MANIFEST_FILE) $@ \
- @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
+ $(JAR_JFLAGS) @$(RES_JAR_FILELIST))
+else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
+ (cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
-+ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
++ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS)@ $(JAR_MANIFEST_FILE) $@ \
+ $(JAR_JFLAGS))
+else
+ (cd $(CLASSBINDIR) && \
-+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
++ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(JAR_MANIFEST_FILE) $@ \
+ $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
+endif
@$(java-vm-cleanup)
# Create jsse.jar containing SunJSSE implementation classes
-@@ -708,10 +721,22 @@
+@@ -719,10 +732,22 @@
$(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
$(prep-target)
$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
@@ -490,22 +490,22 @@
$(prep-target)
+ifneq (,$(JAR_KNOWS_ATFILE))
+ (cd $(CLASSBINDIR) && \
- $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(JAR_MANIFEST_FILE) $@ \
- @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
+ $(JAR_JFLAGS) @$(RT_JAR_FILELIST))
+else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
+ (cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
-+ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
++ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS)@ $(JAR_MANIFEST_FILE) $@ \
+ $(JAR_JFLAGS))
+else
+ (cd $(CLASSBINDIR) && \
-+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
++ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(JAR_MANIFEST_FILE) $@ \
+ $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
+endif
@$(java-vm-cleanup)
# Meta-index construction to make core class loaders lazier
-@@ -942,19 +967,6 @@
+@@ -969,19 +994,6 @@
@$(java-vm-cleanup)
$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
@#
@@ -517,7 +517,7 @@
- -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \
- -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 \
+- $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS_NOMANIFEST) $(LIBDIR)/ct.sym \
- -C $(OUTPUTDIR)/symbols META-INF $(JAR_JFLAGS)
- @$(java-vm-cleanup)
- $(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym
@@ -525,7 +525,7 @@
@# CORBA supported orb.idl and ir.idl should be copied to lib
@#
$(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
-@@ -1023,16 +1035,6 @@
+@@ -1050,16 +1062,6 @@
$(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher
$(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
$(RM) -r $(JDK_IMAGE_DIR)/src
@@ -543,9 +543,9 @@
$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
endif # !windows
diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk
---- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/common/Rules.gmk 2012-01-18 21:43:04.150185964 +0000
-@@ -302,6 +303,8 @@
+--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2013-10-04 15:55:30.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Rules.gmk 2013-10-09 12:46:11.374453549 +0100
+@@ -302,6 +302,8 @@
$(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
$(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
@$(java-vm-cleanup)
@@ -555,8 +555,8 @@
classheaders.clean:
diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile
---- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2012-01-18 16:50:50.576996095 +0000
-+++ openjdk-ecj/jdk/make/java/nio/Makefile 2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2013-10-09 12:43:55.072358704 +0100
++++ openjdk-ecj/jdk/make/java/nio/Makefile 2013-10-09 12:46:11.374453549 +0100
@@ -31,7 +31,7 @@
PACKAGE = java.nio
LIBRARY = nio
@@ -567,8 +567,8 @@
NIO_SRC = $(SHARE_SRC)/classes/java/nio
diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile
---- openjdk-ecj.orig/jdk/make/Makefile 2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/Makefile 2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/jdk/make/Makefile 2013-10-04 15:55:30.000000000 +0100
++++ openjdk-ecj/jdk/make/Makefile 2013-10-09 12:46:11.374453549 +0100
@@ -247,7 +247,7 @@
all build:: sanity-all post-sanity-all
@@ -579,9 +579,9 @@
$(SUBDIRS-loop)
diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2012-01-18 16:50:52.313024135 +0000
-+++ openjdk-ecj/jdk/make/sun/awt/Makefile 2012-01-18 21:43:04.150185964 +0000
-@@ -438,10 +438,9 @@
+--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2013-10-09 12:43:59.532427253 +0100
++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2013-10-09 12:46:11.374453549 +0100
+@@ -434,10 +434,9 @@
COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
$(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \
@@ -596,8 +596,8 @@
fontconfigs.clean :
diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2012-01-18 16:51:03.393203105 +0000
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2013-10-09 12:44:01.268453936 +0100
++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2013-10-09 12:46:11.374453549 +0100
@@ -301,11 +301,7 @@
TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -638,8 +638,8 @@
done
$(TOUCH) $@
diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2011-01-07 21:32:51.000000000 +0000
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2013-10-04 15:55:31.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2013-10-09 12:46:11.374453549 +0100
@@ -647,9 +647,6 @@
throws FileNotFoundException, IOException {
BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -659,8 +659,8 @@
if (plane == 0 && bLatin1 == false) {
genCaseMapTableDeclaration(result);
diff -Nru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties
---- openjdk-ecj.orig/langtools/make/build.properties 2010-05-26 09:33:27.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.properties 2012-01-18 21:43:04.150185964 +0000
+--- openjdk-ecj.orig/langtools/make/build.properties 2013-10-04 15:55:57.000000000 +0100
++++ openjdk-ecj/langtools/make/build.properties 2013-10-09 12:46:11.374453549 +0100
@@ -68,7 +68,7 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
diff -r 9e8a68310569 -r 745a52b6cece patches/openjdk/7025066-embedded_build.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7025066-embedded_build.patch Wed Oct 09 15:37:19 2013 +0100
@@ -0,0 +1,456 @@
+diff -Nru openjdk.orig/jdk/make/common/Defs-embedded.gmk openjdk/jdk/make/common/Defs-embedded.gmk
+--- openjdk.orig/jdk/make/common/Defs-embedded.gmk 1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jdk/make/common/Defs-embedded.gmk 2013-10-09 11:57:00.416951716 +0100
+@@ -0,0 +1,53 @@
++#
++# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++
++#
++# Variable definitions for SE Embedded builds. This file should
++# not contain rules.
++#
++ifdef JAVASE_EMBEDDED
++
++# Compress jar files
++COMPRESS_JARS = true
++
++# Don't mmap zip files
++LIBZIP_CAN_USE_MMAP = false
++
++# Disable ALSA version check
++REQUIRED_ALSA_VERSION =
++
++# Compilation settings
++OTHER_CPPFLAGS += -DJAVASE_EMBEDDED
++
++# Product naming
++PRODUCT_SUFFIX = SE Runtime Environment for Embedded
++RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX)
++
++# Reduced JRE locations
++JRE_REDUCED_HEADLESS_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2re-reduced-headless-image
++JRE_REDUCED_IMAGE_DIR = $(ABS_OUTPUTDIR)/j2re-reduced-image
++
++endif # JAVASE_EMBEDDED
++
+diff -Nru openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk
+--- openjdk.orig/jdk/make/common/Defs.gmk 2013-10-09 01:32:58.126292030 +0100
++++ openjdk/jdk/make/common/Defs.gmk 2013-10-09 12:02:00.033606462 +0100
+@@ -124,6 +124,12 @@
+ include $(JDK_TOPDIR)/make/common/Defs-$(PLATFORM).gmk
+
+ #
++# SE-Embedded support, if enabled
++#
++
++include $(JDK_TOPDIR)/make/common/Defs-embedded.gmk
++
++#
+ # Freetype logic is applicable to OpenJDK only
+ #
+ ifdef OPENJDK
+diff -Nru openjdk.orig/jdk/make/common/Library.gmk openjdk/jdk/make/common/Library.gmk
+--- openjdk.orig/jdk/make/common/Library.gmk 2013-10-09 01:32:58.126292030 +0100
++++ openjdk/jdk/make/common/Library.gmk 2013-10-09 11:57:00.416951716 +0100
+@@ -1,5 +1,5 @@
+ #
+-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -78,7 +78,7 @@
+ endif
+
+ $(ACTUAL_LIBRARY):: $(INIT) $(TEMPDIR) $(LIBDIR) $(BINDIR) $(EXTDIR) classheaders
+-
++ @$(ECHO) Building lib:$(ACTUAL_LIBRARY)
+ #
+ # COMPILE_APPROACH: Different approaches to compile up the native object
+ # files as quickly as possible.
+diff -Nru openjdk.orig/jdk/make/common/Release-embedded.gmk openjdk/jdk/make/common/Release-embedded.gmk
+--- openjdk.orig/jdk/make/common/Release-embedded.gmk 1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jdk/make/common/Release-embedded.gmk 2013-10-09 11:57:00.416951716 +0100
+@@ -0,0 +1,232 @@
++#
++# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation. Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++
++#
++# SE-Embedded Reduced JRE targets
++#
++ifdef JAVASE_EMBEDDED
++
++reduced-image-jre reduced-headless-image-jre ::
++ @$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
++
++# Add the reduced-jre images as pre-reqs. These will be processed last
++images:: reduced-image-jre reduced-headless-image-jre
++
++
++######################################################
++# Create the headless rt.jar
++######################################################
++
++NOT_HEADLESS_RT_JAR_LIST = $(ABS_TEMPDIR)/not_hl_rt_jar.list
++HEADLESS_RT_JAR_FILELIST=$(JARFILELISTS_TEMPDIR)/hl_rt_jar_list
++TOTAL_HEADLESS_JAR_FILELIST=$(REORDER_TEMPDIR)/hl_file_list
++HEADLESS_CLASSLIST=$(ABS_TEMPDIR)/headless_classlist
++
++# Add the jar file directories that we don't want in the
++# headless JRE. If you want to remove most classes in a
++# directory, put the directory in the NOT_HEADLESS_RT_JAR_LIST
++# and put the individual classes you want to keep in the
++# HEADLESS_CLASSLIST file.
++$(NOT_HEADLESS_RT_JAR_LIST): $(NOT_RT_JAR_LIST)
++ $(RM) $(HEADLESS_CLASSLIST)
++ $(RM) $(NOT_HEADLESS_RT_JAR_LIST)
++ $(CP) $(NOT_RT_JAR_LIST) $(NOT_HEADLESS_RT_JAR_LIST)
++ $(ECHO) "sun/awt/motif/" >> $@
++ $(ECHO) "sun/awt/X11/" >> $@
++ $(ECHO) "sun/applet/" >> $@
++ $(ECHO) "sun/java2d/opengl/" >> $@
++ $(ECHO) "com/sun/java/swing/plaf/" >> $@
++ $(ECHO) "sun/awt/motif/MFontConfiguration" >$(HEADLESS_CLASSLIST)
++ $(ECHO) "sun/applet/AppContextCreator" >>$(HEADLESS_CLASSLIST)
++ $(ECHO) "sun/applet/AppletAudioClip" >>$(HEADLESS_CLASSLIST)
++ $(ECHO) "sun/java2d/opengl/GLXSurfaceData" >>$(HEADLESS_CLASSLIST)
++ $(ECHO) "sun/java2d/opengl/GLXSurfaceData"\$$"GLXOffScreenSurfaceData" >>$(HEADLESS_CLASSLIST)
++ $(ECHO) "sun/java2d/opengl/GLXVolatileSurfaceManager" >>$(HEADLESS_CLASSLIST)
++ $(ECHO) "sun/java2d/opengl/OGLSurfaceData" >>$(HEADLESS_CLASSLIST)
++
++$(TOTAL_HEADLESS_JAR_FILELIST): $(JARREORDER_JARFILE) $(NOT_HEADLESS_RT_JAR_LIST)
++ $(prep-target)
++ $(RM) $@.temp
++ $(CD) $(CLASSBINDIR) ; \
++ $(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \
++ -o $@.temp $(HEADLESS_CLASSLIST) $(NOT_HEADLESS_RT_JAR_LIST) .
++ $(MV) $@.temp $@
++ @$(CD) $(CLASSBINDIR); $(java-vm-cleanup)
++
++# Create the headless rt.jar file list & non-class files list
++MakeHeadlessJarFileList: $(TOTAL_HEADLESS_JAR_FILELIST) $(JARSPLIT_JARFILE)
++ @$(RM) $(HEADLESS_RT_JAR_FILELIST) $(RES_JAR_FILELIST)
++ $(BOOT_JAVA_CMD) -jar $(JARSPLIT_JARFILE) $(TOTAL_HEADLESS_JAR_FILELIST) \
++ -o $(HEADLESS_RT_JAR_FILELIST) $(RES_JAR_FILELIST)
++ @$(java-vm-cleanup)
++
++# Create headless rt.jar
++HL_RT_JAR=$(ABS_TEMPDIR)/rt-hl-orig.jar
++$(HL_RT_JAR): MakeHeadlessJarFileList $(JAR_MANIFEST_FILE)
++ $(prep-target)
++ $(CD) $(CLASSBINDIR) ; \
++ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(JAR_MANIFEST_FILE) $@ @$(HEADLESS_RT_JAR_FILELIST) \
++ $(JAR_JFLAGS)
++ @$(CD) $(CLASSBINDIR); $(java-vm-cleanup)
++
++
++#
++# Produce a reduced Headful JRE for Embedded Devices
More information about the distro-pkg-dev
mailing list