diff options
Diffstat (limited to 'pcr/openjdk6')
| -rw-r--r-- | pcr/openjdk6/PKGBUILD | 33 | ||||
| -rw-r--r-- | pcr/openjdk6/disable-openjdk-Werror.diff | 147 | ||||
| -rw-r--r-- | pcr/openjdk6/ecj-icedtea.patch | 893 |
3 files changed, 1061 insertions, 12 deletions
diff --git a/pcr/openjdk6/PKGBUILD b/pcr/openjdk6/PKGBUILD index b552f272c..8c70bb72a 100644 --- a/pcr/openjdk6/PKGBUILD +++ b/pcr/openjdk6/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> -pkgname=('openjdk6' 'openjdk6-src') +pkgname=('openjdk6-old' 'openjdk6-old-src') pkgbase="openjdk6" _javaver=6 _icedteaver=1.12.3 @@ -15,7 +15,7 @@ arch=('i686' 'x86_64') license=('custom') makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt' - 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6' 'inetutils' 'wget') + 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'java-environment' 'inetutils' 'wget') options=('!emptydirs') source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig} http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz @@ -28,7 +28,9 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar nonreparenting-wm.diff disable_Werror.diff openjdk6.profile - openjdk6.profile.csh) + openjdk6.profile.csh + disable-openjdk-Werror.diff + ecj-icedtea.patch) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz jaxp144_04.zip jdk6-jaxws2_1_6-2011_06_13.zip @@ -45,11 +47,12 @@ sha256sums=('db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c' '9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9' 'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97' '26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd' - '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007') + '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007' + '3e20fdcd17d4adee1cb2ddc3b15a39fe56b9a7837067487eedd40733adfea9c6' + '77bafb45d67cbdac59ae27b0cc85e38d849dcf5c4c4005f5b28b33f4f5b734ab') build() { - unset JAVA_HOME unset CLASSPATH [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh @@ -62,10 +65,11 @@ build() { ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz . cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/ + cp ${srcdir}/ecj-icedtea.patch ${srcdir}/icedtea6-${_icedteaver}/patches/ecj/icedtea.patch autoreconf -i - export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/disable_Werror.diff" + export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/disable_Werror.diff patches/disable-openjdk-Werror.diff" export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" @@ -73,16 +77,21 @@ build() { ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \ --with-ant-home=/usr/share/java/apache-ant \ - --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \ + --with-pkgversion=Parabola-${pkgver}-${pkgrel}-$CARCH \ --with-jaxp-drop-zip=${srcdir}/jaxp144_04.zip \ --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \ --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \ - --disable-bootstrap \ - --with-abs-install-dir=${_jvmdir} + --enable-bootstrap \ + --with-abs-install-dir=${_jvmdir} \ + --with-jdk-home="$JAVA_HOME" + + # Java 7 compilers give more warnings. + find . -name '*.gmk' -or -name 'Makefile' | xargs sed -i 's/-Werror//' + LD_PRELOAD="" make } -package_openjdk6() { +package_openjdk6-old() { pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.' backup=(etc/profile.d/openjdk6.sh) depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7') @@ -162,9 +171,9 @@ package_openjdk6() { install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } -package_openjdk6-src() { +package_openjdk6-old-src() { pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle' - depends=('openjdk6') + depends=('openjdk6-old') if [ "${CARCH}" = "x86_64" ]; then _arch=amd64 diff --git a/pcr/openjdk6/disable-openjdk-Werror.diff b/pcr/openjdk6/disable-openjdk-Werror.diff new file mode 100644 index 000000000..2fbecaffe --- /dev/null +++ b/pcr/openjdk6/disable-openjdk-Werror.diff @@ -0,0 +1,147 @@ +diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk +--- openjdk.orig/corba/make/common/Defs-linux.gmk 2013-03-09 18:42:00.271861055 +0100 ++++ openjdk/corba/make/common/Defs-linux.gmk 2013-03-09 18:42:10.322026218 +0100 +@@ -130,13 +130,6 @@ + GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(GCC_INHIBIT) + + # +-# Treat compiler warnings as errors, if warnings not allowed +-# +-ifeq ($(COMPILER_WARNINGS_FATAL),true) +- GCC_WARNINGS += -Werror +-endif +- +-# + # Misc compiler options + # + ifeq ($(ARCH),ppc) +diff -ru openjdk.orig/corba/make/common/shared/Defs-java.gmk openjdk/corba/make/common/shared/Defs-java.gmk +--- openjdk.orig/corba/make/common/shared/Defs-java.gmk 2013-03-09 18:42:00.271861055 +0100 ++++ openjdk/corba/make/common/shared/Defs-java.gmk 2013-03-09 18:42:10.342026563 +0100 +@@ -100,9 +100,6 @@ + ifeq ($(DEBUG_CLASSFILES),true) + JAVACFLAGS += -g + endif +-ifeq ($(COMPILER_WARNINGS_FATAL), true) +- JAVACFLAGS += -Werror +-endif + + NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true + JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) +@@ -173,12 +170,6 @@ + # can bootstrap itself. + # + +-# The javac options supplied to the boot javac is limited. This compiler +-# should only be used to build the 'make/tools' sources, which are not +-# class files that end up in the classes directory. +-ifeq ($(COMPILER_WARNINGS_FATAL), true) +- BOOT_JAVACFLAGS += -Werror +-endif + BOOT_SOURCE_LANGUAGE_VERSION = 5 + BOOT_TARGET_CLASS_VERSION = 5 + BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) +diff -ru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk +--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2013-03-09 18:42:00.891871222 +0100 ++++ openjdk/jdk/make/common/Defs-linux.gmk 2013-03-09 18:42:10.342026563 +0100 +@@ -140,13 +140,6 @@ + GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(GCC_INHIBIT) + + # +-# Treat compiler warnings as errors, if warnings not allowed +-# +-ifeq ($(COMPILER_WARNINGS_FATAL),true) +- GCC_WARNINGS += -Werror +-endif +- +-# + # Misc compiler options + # + ifeq ($(ARCH),ppc) +diff -ru openjdk.orig/jdk/make/common/shared/Defs-java.gmk openjdk/jdk/make/common/shared/Defs-java.gmk +--- openjdk.orig/jdk/make/common/shared/Defs-java.gmk 2013-03-09 18:42:00.891871222 +0100 ++++ openjdk/jdk/make/common/shared/Defs-java.gmk 2013-03-09 18:42:10.342026563 +0100 +@@ -107,9 +107,6 @@ + ifeq ($(DEBUG_CLASSFILES),true) + JAVACFLAGS += -g + endif +-ifeq ($(COMPILER_WARNINGS_FATAL), true) +- JAVACFLAGS += -Werror +-endif + + # Add the source level (currently all source is 1.5, should this be 1.6?) + LANGUAGE_VERSION = -source 1.5 +@@ -180,13 +177,6 @@ + # can bootstrap itself. + # + +-# The javac options supplied to the boot javac is limited. This compiler +-# should only be used to build the 'make/tools' sources, which are not +-# class files that end up in the classes directory. +-ifeq ($(COMPILER_WARNINGS_FATAL), true) +- BOOT_JAVACFLAGS += -Werror +-endif +- + BOOT_SOURCE_LANGUAGE_VERSION = 5 + BOOT_TARGET_CLASS_VERSION = 5 + BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) +diff -ru openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile +--- openjdk.orig/jdk/make/java/nio/Makefile 2013-03-09 18:42:00.881871058 +0100 ++++ openjdk/jdk/make/java/nio/Makefile 2013-03-09 18:42:10.342026563 +0100 +@@ -31,7 +31,7 @@ + PACKAGE = java.nio + LIBRARY = nio + PRODUCT = java +-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror ++OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial + include $(BUILDDIR)/common/Defs.gmk + + NIO_SRC = $(SHARE_SRC)/classes/java/nio +diff -ru openjdk.orig/jdk/make/java/sun_nio/Makefile openjdk/jdk/make/java/sun_nio/Makefile +--- openjdk.orig/jdk/make/java/sun_nio/Makefile 2013-03-09 18:42:00.871870894 +0100 ++++ openjdk/jdk/make/java/sun_nio/Makefile 2013-03-09 18:42:10.342026563 +0100 +@@ -31,7 +31,7 @@ + PACKAGE = sun.nio + PRODUCT = sun + +-OTHER_JAVACFLAGS += -Xlint:serial -Werror ++OTHER_JAVACFLAGS += -Xlint:serial + include $(BUILDDIR)/common/Defs.gmk + + # +diff -ru openjdk.orig/jdk/make/sun/native2ascii/Makefile openjdk/jdk/make/sun/native2ascii/Makefile +--- openjdk.orig/jdk/make/sun/native2ascii/Makefile 2013-03-09 18:42:00.891871222 +0100 ++++ openjdk/jdk/make/sun/native2ascii/Makefile 2013-03-09 18:42:10.342026563 +0100 +@@ -30,7 +30,7 @@ + BUILDDIR = ../.. + PACKAGE = sun.tools.native2ascii + PRODUCT = sun +-OTHER_JAVACFLAGS += -Xlint:serial -Werror ++OTHER_JAVACFLAGS += -Xlint:serial + include $(BUILDDIR)/common/Defs.gmk + + # +diff -ru openjdk.orig/jdk/make/sun/nio/Makefile openjdk/jdk/make/sun/nio/Makefile +--- openjdk.orig/jdk/make/sun/nio/Makefile 2013-03-09 18:42:00.891871222 +0100 ++++ openjdk/jdk/make/sun/nio/Makefile 2013-03-09 18:42:10.342026563 +0100 +@@ -35,7 +35,7 @@ + # This re-directs all the class files to a separate location + CLASSDESTDIR = $(TEMPDIR)/classes + +-OTHER_JAVACFLAGS += -Xlint:serial -Werror ++OTHER_JAVACFLAGS += -Xlint:serial + include $(BUILDDIR)/common/Defs.gmk + + # +diff -ru openjdk.orig/langtools/make/build.properties openjdk/langtools/make/build.properties +--- openjdk.orig/langtools/make/build.properties 2013-03-09 18:42:00.311861690 +0100 ++++ openjdk/langtools/make/build.properties 2013-03-09 18:43:04.542923328 +0100 +@@ -68,7 +68,7 @@ + # set the following to -version to verify the versions of javac being used + javac.version.opt = + # in time, there should be no exceptions to -Xlint:all +-javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror ++javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial + + # options for the <javadoc> task for javac + javadoc.jls3.url=http://java.sun.com/docs/books/jls/ diff --git a/pcr/openjdk6/ecj-icedtea.patch b/pcr/openjdk6/ecj-icedtea.patch new file mode 100644 index 000000000..1af1365bf --- /dev/null +++ b/pcr/openjdk6/ecj-icedtea.patch @@ -0,0 +1,893 @@ +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 +@@ -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 + # pept and before rmi. +-SUBDIRS = sources pept corespi core spi impl rmi ++SUBDIRS = org pept corespi core spi impl rmi + all build clean clobber:: + $(SUBDIRS-loop) + +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 +@@ -0,0 +1,38 @@ ++# ++# Copyright 2001-2005 Sun Microsystems, Inc. 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. Sun designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++# CA 95054 USA or visit www.sun.com if you need additional information or ++# have any questions. ++# ++ ++BUILDDIR = ../../../../.. ++PACKAGE = com.sun.corba.se ++PRODUCT = org ++ ++include $(BUILDDIR)/common/Defs.gmk ++ ++FILES_java=\ ++ com/sun/corba/se/org/omg/CORBA/ORB.java ++ ++# ++# Include ++# ++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/corba/make/com/sun/corba/se/sources/Makefile 1970-01-01 01:00:00.000000000 +0100 +@@ -1,224 +0,0 @@ +-# +-# Copyright (c) 2000, 2006, 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. +-# +- +-BUILDDIR = ../../../../.. +- +-PACKAGE = com.sun.corba.se +-PRODUCT = org +- +-include $(BUILDDIR)/common/Defs.gmk +- +-# +-# Rules +-# +-all: build +- +-build: portableactivation.idl.compile logwrapper.generate logresource.generate +- +-clean clobber:: portableactivation.idl.clean +- +-# +-# Files +-# +-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/ +-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk +-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk +- +-FILES_java += com/sun/corba/se/org/omg/CORBA/ORB.java +- +-# +-# Dirs +-# +- +-SRC_DIR = $(SHARE_SRC)/classes +-CORBA_IDL_DIR = $(SRC_DIR)/org/omg/PortableServer +-PI_IDL_DIR = $(SRC_DIR)/org/omg/PortableInterceptor +- +-ACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/spi/activation +-PORTABLEACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/PortableActivationIDL +-LOG_GENDIRECTORY = $(GENSRCDIR)/com/sun/corba/se/impl/logging +- +-# +-# IDLs +-# +- +-ACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/spi/activation/activation.idl +-PORTABLEACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/PortableActivationIDL/activation.idl +- +- +-# +-# .mc files +-# +-ACTIVATION.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Activation.mc +-IOR.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/IOR.mc +-INTERCEPTORS.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Interceptors.mc +-NAMING.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Naming.mc +-OMG.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/OMG.mc +-ORBUTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/ORBUtil.mc +-POA.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc +-UTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc +- +-MC_GENERATE_CLASS = make-class +-MC_GENERATE_LOG_RB = make-resource +- +-JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS) +-JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB) +- +- +-# +-# Activation +-# +- +-ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%) +- +-$(ACTIVATIONFILES): $(ACTIVATION.IDL) +- $(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL) +- +-activation.idl.compile: $(ACTIVATIONFILES) +- +-activation.idl.clean: +- $(RM) -f $(ACTIVATIONFILES) +- +-# +-# PortableActivationIDL +-# +- +-PORTABLEACTIVATIONFILES = $(com_sun_corba_se_PortableActivationIDL_java:%=$(GENSRCDIR)/%) +- +-PORTABLEACTIVATION_INCLUDES = -i $(CORBA_IDL_DIR) -i $(PI_IDL_DIR) +- +-PORTABLEACTIVATION_PKG_PREFIXES = -pkgPrefix PortableInterceptor org.omg \ +- -pkgPrefix PortableActivationIDL com.sun.corba.se \ +- -pkgPrefix Dynamic org.omg \ +- -pkgPrefix IOP org.omg +- +-# REVISIT: remove -oldImplBase +-$(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL) +- $(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL) +- +-portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES) +- +-portableactivation.idl.clean: +- $(RM) -f $(PORTABLEACTIVATIONFILES) +- +-# +-# Generate LogWrapper classes +-# +-logwrapper.generate: \ +- $(LOG_GENDIRECTORY)/ActivationSystemException.java \ +- $(LOG_GENDIRECTORY)/IORSystemException.java \ +- $(LOG_GENDIRECTORY)/InterceptorsSystemException.java \ +- $(LOG_GENDIRECTORY)/NamingSystemException.java \ +- $(LOG_GENDIRECTORY)/OMGSystemException.java \ +- $(LOG_GENDIRECTORY)/ORBUtilSystemException.java \ +- $(LOG_GENDIRECTORY)/POASystemException.java \ +- $(LOG_GENDIRECTORY)/UtilSystemException.java +- +-$(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/UtilSystemException.java : $(UTIL.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY) +- +-logresource.generate: $(LOG_GENDIRECTORY)/LogStrings.properties +- +-$(LOG_GENDIRECTORY)/LogStrings.properties: \ +- $(LOG_GENDIRECTORY)/ActivationSystemException.resource \ +- $(LOG_GENDIRECTORY)/IORSystemException.resource \ +- $(LOG_GENDIRECTORY)/InterceptorsSystemException.resource \ +- $(LOG_GENDIRECTORY)/NamingSystemException.resource \ +- $(LOG_GENDIRECTORY)/OMGSystemException.resource \ +- $(LOG_GENDIRECTORY)/ORBUtilSystemException.resource \ +- $(LOG_GENDIRECTORY)/POASystemException.resource \ +- $(LOG_GENDIRECTORY)/UtilSystemException.resource +- $(CAT) $(LOG_GENDIRECTORY)/*.resource > $(LOG_GENDIRECTORY)/LogStrings.properties +- +-$(LOG_GENDIRECTORY)/ActivationSystemException.resource : $(ACTIVATION.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/IORSystemException.resource : $(IOR.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource : $(INTERCEPTORS.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/NamingSystemException.resource : $(NAMING.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/OMGSystemException.resource : $(OMG.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource : $(ORBUTIL.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/POASystemException.resource : $(POA.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/UtilSystemException.resource : $(UTIL.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY) +- +- +-.PHONY: all build clean clobber \ +- activation.idl.compile activation.idl.clean \ +- portableactivation.idl.compile portableactivation.idl.clean +- +-# +-# Include +-# +-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 +@@ -53,6 +53,13 @@ + + _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH) + ++ ++ifdef ALT_LANGTOOLS_DIST ++ LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST)) ++else ++ LANGTOOLS_DIST = ++endif ++ + # + # Get platform definitions + # +@@ -118,8 +125,6 @@ + # for build tool jar files + BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars + ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars +-# for generated java source files +-GENSRCDIR = $(OUTPUTDIR)/gensrc + # for generated C source files (not javah) + GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc + # for imported source files +@@ -220,7 +225,7 @@ + # We define an intermediate variable for Java files because + # we use its value later to help define $SOURCEPATH + +-VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes ++VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes + VPATH.java = $(VPATH0.java) + 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 +@@ -271,7 +271,7 @@ + # + VM_NAME = server + JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm +-JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB) ++JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB) + + # + # We want to privatize JVM symbols on Solaris. This is so the user can +diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk +--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2012-01-18 16:50:57.569109033 +0000 ++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2012-01-18 21:43:04.150185964 +0000 +@@ -116,35 +116,17 @@ + CLASS_VERSION = -target $(TARGET_CLASS_VERSION) + JAVACFLAGS += $(CLASS_VERSION) + JAVACFLAGS += -encoding ascii +-JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar ++JAVACFLAGS += -classpath $(LANGTOOLS_DIST)/lib/classes.jar + JAVACFLAGS += $(OTHER_JAVACFLAGS) + + # Needed for javah +-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) ++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) + +-# Langtools +-ifdef LANGTOOLS_DIST +- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar +- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar +- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar +- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar +- JAVAC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAC_JAR)" \ +- -jar $(JAVAC_JAR) $(JAVACFLAGS) +- JAVAH_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \ +- -jar $(JAVAH_JAR) $(JAVAHFLAGS) +- JAVADOC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \ +- -jar $(JAVADOC_JAR) +-else +- # If no explicit tools, use boot tools (add VM flags in this case) +- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ ++# If no explicit tools, use boot tools (add VM flags in this case) ++JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ + $(JAVACFLAGS) +- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ ++JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ + $(JAVAHFLAGS) +- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) +-endif + + # Override of what javac to use (see deploy workspace) + ifdef JAVAC +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 +@@ -93,8 +93,6 @@ + POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%) + + $(POAGENERATEDFILES):: $(POA.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -corba 3.0 -fall -pkgPrefix PortableServer org.omg $(POA.IDL) +- $(RM) -r $(POAHELHOLFILES) + + poa.compile: $(POAGENERATEDFILES) + +@@ -110,10 +108,6 @@ + + # Generating and deleting unused files to reduce images size + $(DYNANYFILES): $(DYNAMIC_ANY.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" $(DYNANY_IDLJ_FLAGS) $(DYNAMIC_ANY.IDL) +- $(RM) $(DYNANY_DIR)/*POA* +- $(RM) $(DYNANY_DIR)/*Holder* +- $(RM) $(DYNANYDELETEFILES) + + dynany.compile: $(DYNANYFILES) + +@@ -125,12 +119,6 @@ + TR_IDLJ_FLAGS =-i "$(SRC_DIR)/org/omg/PortableInterceptor" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/CosTransactions" + + $(TRGENERATEDFILES):: $(COSTRANSACTIONS.IDL) $(COSTSINTEROP.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTransactions org.omg $(COSTRANSACTIONS.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTSInteroperation org.omg $(COSTSINTEROP.IDL) +-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) +-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) +-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) +-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) + + tr.compile: $(TRGENERATEDFILES) + +@@ -144,7 +132,6 @@ + # _NamingContextImplBase.java and _BindingIteratorImplBase.java files + # to GENSRC directory. Note that these two classes are deprecated. + $(NSGENERATEDFILES): $(NAMESERVICE.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i $(NAMESERVICEDIR) -fall -pkgPrefix CosNaming org.omg $(NAMESERVICE.IDL) + + ns.compile: $(NSGENERATEDFILES) + +@@ -156,8 +143,6 @@ + IOPDELETEFILES = $(IOP_TO_DELETE_FILES:%=$(GENSRCDIR)/%) + + $(IOPGENERATEDFILES):: $(IOP.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -D CORBA3 -pkgPrefix IOP org.omg $(IOP.IDL) +- $(RM) -r $(IOPDELETEFILES) + + iop.compile: $(IOPGENERATEDFILES) + +@@ -169,8 +154,6 @@ + CORBAXDUPLICATEFILES = $(CORBA_DUPLICATE_java:%=$(GENSRCDIR)/%) + + $(CORBAXGENERATEDFILES):: $(CORBAX.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 $(CORBAX.IDL) +- $(RM) $(CORBAXDUPLICATEFILES) + + corbax.compile: $(CORBAXGENERATEDFILES) + +@@ -181,7 +164,6 @@ + MESSAGINGGENERATEDFILES = $(Messaging_java:%=$(GENSRCDIR)/%) + + $(MESSAGINGGENERATEDFILES):: $(MESSAGING.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -pkgPrefix Messaging org.omg $(MESSAGING.IDL) + + messaging.compile: $(MESSAGINGGENERATEDFILES) + +@@ -195,8 +177,6 @@ + PIHELHOLFILES = $(PI_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%) + + $(PIGENERATEDFILES):: $(INTERCEPTORS.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -pkgPrefix PortableInterceptor org.omg -pkgPrefix Dynamic org.omg -pkgPrefix IOP org.omg -corba 3.0 -D CORBA3 $(INTERCEPTORS.IDL) +- $(RM) $(PIHELHOLFILES) + + 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 +@@ -172,7 +172,6 @@ + ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%) + + $(ACTIVATIONFILES): $(ACTIVATION.IDL) +- $(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL) + + activation.idl.compile: $(ACTIVATIONFILES) + +@@ -195,7 +194,6 @@ + + # REVISIT: remove -oldImplBase + $(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL) +- $(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL) + + 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 +@@ -131,7 +131,8 @@ + memoryMaximumSize="${javac.memoryMaximumSize}" + source="${javac.source}" + debug="${javac.debug}" +- target="${javac.target}"> ++ target="${javac.target}" ++ executable="${jdk.home}/bin/javac"> + <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/> + <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 +@@ -131,7 +131,8 @@ + memoryMaximumSize="${javac.memoryMaximumSize}" + source="${javac.source}" + debug="${javac.debug}" +- target="${javac.target}"> ++ target="${javac.target}" ++ executable="${jdk.home}/bin/javac"> + <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/> + <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/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk +--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2011-01-07 21:32:51.000000000 +0000 ++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2012-01-18 21:43:04.150185964 +0000 +@@ -43,7 +43,8 @@ + @$(prep-target) + @$(MKDIR) -p $(BUILDTOOLCLASSDIR) + $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \ +- -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE) ++ -sourcepath $(BUILDTOOL_SOURCE_ROOT) -classpath $(ICEDTEA_RT) \ ++ $(BUILDTOOL_MAIN_SOURCE_FILE) + $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \ + -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \ + $(JAR_JFLAGS) || $(RM) $@ +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 @@ + $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST) + $(prep-target) + $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@ +-$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE) ++$(RESOURCES_JAR): \ ++ $(if $(JAR_KNOWS_ATFILE),$(RES_JAR_FILELIST),$(RES_JAR_ARGLIST)) \ ++ $(JAR_MANIFEST_FILE) + $(prep-target) ++ifneq (,$(JAR_KNOWS_ATFILE)) ++ (cd $(CLASSBINDIR) && \ + $(BOOT_JAR_CMD) c0mf $(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) $@ \ ++ $(JAR_JFLAGS)) ++else ++ (cd $(CLASSBINDIR) && \ ++ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ ++ $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`) ++endif + @$(java-vm-cleanup) + + # Create jsse.jar containing SunJSSE implementation classes +@@ -708,10 +721,22 @@ + $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST) + $(prep-target) + $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@ +-$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE) ++$(RT_JAR): $(if $(JAR_KNOWS_ATFILE),$(RT_JAR_FILELIST),$(RT_JAR_ARGLIST)) \ ++ $(JAR_MANIFEST_FILE) + $(prep-target) ++ifneq (,$(JAR_KNOWS_ATFILE)) ++ (cd $(CLASSBINDIR) && \ + $(BOOT_JAR_CMD) c0mf $(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) $@ \ ++ $(JAR_JFLAGS)) ++else ++ (cd $(CLASSBINDIR) && \ ++ $(BOOT_JAR_CMD) c0mf $(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 @@ + @$(java-vm-cleanup) + $(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar + @# +- @# lib/ct.sym +- @# +- $(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym +- $(JAVAC_CMD) -XDprocess.packages -proc:only \ +- -processor com.sun.tools.javac.sym.CreateSymbols \ +- -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 \ +- -C $(OUTPUTDIR)/symbols META-INF $(JAR_JFLAGS) +- @$(java-vm-cleanup) +- $(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym +- @# + @# 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 @@ + $(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 +- @# +- @# demo, include +- @# +- $(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR) +- $(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR) +- $(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR) +- @# +- @# Swing BeanInfo generation +- @# +- $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans + ifneq ($(PLATFORM), windows) + $(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 +@@ -235,8 +235,9 @@ + $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ + $(CAT) $(JAVA_SOURCE_LIST); \ + $(ECHO) "# Running javac:"; \ +- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ +- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ ++ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \ ++ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ ++ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + fi + @$(java-vm-cleanup) + +@@ -302,6 +303,8 @@ + $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \ + $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) + @$(java-vm-cleanup) ++ -mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \ ++ $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h + @$(TOUCH) $@ + + classheaders.clean: +diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk +--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2012-01-18 16:50:57.569109033 +0000 ++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2012-01-18 21:43:04.150185964 +0000 +@@ -124,34 +124,18 @@ + JAVACFLAGS += $(OTHER_JAVACFLAGS) + + # Needed for javah +-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) ++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(CLASSDESTDIR) + + # Needed for JAVADOC and BOOT_JAVACFLAGS + NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true + + # Langtools +-ifdef LANGTOOLS_DIST +- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar +- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar +- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar +- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar +- JAVAC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAC_JAR)" \ +- -jar $(JAVAC_JAR) $(JAVACFLAGS) +- JAVAH_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \ +- -jar $(JAVAH_JAR) $(JAVAHFLAGS) +- JAVADOC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \ +- -jar $(JAVADOC_JAR) +-else +- # If no explicit tools, use boot tools (add VM flags in this case) +- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ ++# If no explicit tools, use boot tools (add VM flags in this case) ++JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ + $(JAVACFLAGS) +- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ ++JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ + $(JAVAHFLAGS) +- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) +-endif ++JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) + + # Override of what javac to use (see deploy workspace) + ifdef JAVAC +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 +@@ -31,7 +31,7 @@ + PACKAGE = java.nio + LIBRARY = nio + PRODUCT = java +-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial ++OTHER_JAVACFLAGS += -Xlint:serial + include $(BUILDDIR)/common/Defs.gmk + + NIO_SRC = $(SHARE_SRC)/classes/java/nio +diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile +--- openjdk-ecj.orig/jdk/make/java/text/Makefile 2011-01-07 21:32:51.000000000 +0000 ++++ openjdk-ecj/jdk/make/java/text/Makefile 2012-01-18 21:43:04.150185964 +0000 +@@ -80,8 +80,8 @@ + -sourcepath $(TEXT_SRCDIR) \ + $(TEXT_SOURCES) + $(MKDIR) -p $(TEXT_CLASSDIR) +- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \ +- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \ ++ $(BOOT_JAVA_CMD) -cp $(TEXT_CLASSES):$(GENERATEBREAKITERATORDATA_JARFILE):$(ICEDTEA_CLS_DIR) \ ++ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \ + -o $(TEXT_CLASSDIR) \ + -spec $(UNICODEDATA)/UnicodeData.txt + @$(java-vm-cleanup) +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 +@@ -247,7 +247,7 @@ + + all build:: sanity-all post-sanity-all + +-SUBDIRS = tools java javax org sun sunw com jpda mkdemo mksample launchers ++SUBDIRS = tools java javax org sun sunw com jpda mksample launchers + all build:: + $(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 @@ + COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar + + $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \ +- $(COMPILEFONTCONFIG_JARFILE) +- $(prep-target) +- $(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@ +- $(CHMOD) 444 $(@) ++ $(COMPILEFONTCONFIG_JARFILE) ++ $(CP) -f $(GENSRCDIR)/fontconfig/* $(LIBDIR) ++ $(CHMOD) 444 $(LIBDIR)/*.bfc + @$(java-vm-cleanup) + + fontconfigs.clean : +diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile +--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2011-01-07 21:32:51.000000000 +0000 ++++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2012-01-18 21:43:04.150185964 +0000 +@@ -62,7 +62,8 @@ + $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES) + $(RM) -r $(@D) + $(prep-target) +- $(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/javazic.jar -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES) ++ $(BOOT_JAVA_CMD) -cp $(ICEDTEA_CLS_DIR):$(BUILDTOOLJARDIR)/javazic.jar \ ++ build.tools.javazic.Main -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES) + @$(java-vm-cleanup) + + $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE) +diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile +--- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2011-01-07 21:32:51.000000000 +0000 ++++ openjdk-ecj/jdk/make/sun/text/Makefile 2012-01-18 21:43:04.150185964 +0000 +@@ -85,8 +85,9 @@ + $(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \ + -sourcepath $(TEXT_SRCDIR) \ + $(BIRULES) $(BIINFO) +- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \ +- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \ ++ $(BOOT_JAVA_CMD) \ ++ -cp $(TEXT_CLASSES):$(ICEDTEA_CLS_DIR):$(GENERATEBREAKITERATORDATA_JARFILE) \ ++ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \ + -o $(CLASSDESTDIR)/sun/text/resources \ + -spec $(UNICODEDATA)/UnicodeData.txt \ + -language th +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 +@@ -301,11 +301,7 @@ + + TEMPDIR_CLASSES = $(TEMPDIR)/classes + +-$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java +- @$(prep-target) +- $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< +- +-$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS) ++$(TEMPDIR)/.gen_icons: $(ICONS) + $(prep-target) + for i in $(ICONS); do \ + filename=`basename $$i`; \ +@@ -315,22 +311,14 @@ + $(ECHO) "package sun.awt.X11;" >> $$classname ; \ + $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \ + $(ECHO) "public static int[] $$name = { " >> $$classname; \ +- $(CAT) $$i | \ +- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ +- -Dawt.toolkit=sun.awt.motif.MToolkit \ +- -Djava.awt.headless=true \ +- sun.awt.X11.ToBin >> $$classname; \ ++ $(ECHO) "0,0" >> $$classname ; \ + $(ECHO) "}; }" >> $$classname; \ +- classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ ++ classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ + $(RM) $$classname; \ + $(ECHO) "package sun.awt.X11;" >> $$classname ; \ + $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \ + $(ECHO) "public static long[] $$name = { " >> $$classname; \ +- $(CAT) $$i | \ +- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ +- -Dawt.toolkit=sun.awt.motif.MToolkit \ +- -Djava.awt.headless=true \ +- sun.awt.X11.ToBin >> $$classname; \ ++ $(ECHO) "0,0" >> $$classname ; \ + $(ECHO) "}; }" >> $$classname; \ + 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 +@@ -647,9 +647,6 @@ + throws FileNotFoundException, IOException { + BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName)); + PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName))); +- out.println(commentStart + +- " This file was generated AUTOMATICALLY from a template file " + +- new java.util.Date() + commentEnd); + int marklen = commandMarker.length(); + LOOP: while(true) { + try { +@@ -876,7 +873,6 @@ + // liu : Add a comment showing the source of this table + result.append(commentStart + " The following tables and code generated using:" + + commentEnd + "\n "); +- result.append(commentStart + ' ' + commandLineDescription + commentEnd + "\n "); + + if (plane == 0 && bLatin1 == false) { + genCaseMapTableDeclaration(result); +diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java +--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2011-01-07 21:32:53.000000000 +0000 ++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2012-01-18 21:43:04.150185964 +0000 +@@ -76,7 +76,7 @@ + * {@code 0x1.fffffffffffffP+1023} and also equal to + * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}. + */ +- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308 ++ public static final double MAX_VALUE = 1.7976931348623157e+308; + + /** + * A constant holding the smallest positive normal value of type +@@ -86,7 +86,7 @@ + * + * @since 1.6 + */ +- public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308 ++ public static final double MIN_NORMAL = 2.2250738585072014E-308; + + /** + * A constant holding the smallest positive nonzero value of type +@@ -95,7 +95,7 @@ + * {@code 0x0.0000000000001P-1022} and also equal to + * {@code Double.longBitsToDouble(0x1L)}. + */ +- public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324 ++ public static final double MIN_VALUE = 4.9e-324; + + /** + * Maximum exponent a finite {@code double} variable may have. +diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java +--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2011-01-07 21:32:53.000000000 +0000 ++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2012-01-18 21:43:04.150185964 +0000 +@@ -76,7 +76,7 @@ + * {@code 0x1.fffffeP+127f} and also equal to + * {@code Float.intBitsToFloat(0x7f7fffff)}. + */ +- public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f ++ public static final float MAX_VALUE = 3.4028235e+38f; + + /** + * A constant holding the smallest positive normal value of type +@@ -86,7 +86,7 @@ + * + * @since 1.6 + */ +- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f ++ public static final float MIN_NORMAL = 1.17549435E-38f; + + /** + * A constant holding the smallest positive nonzero value of type +@@ -94,7 +94,7 @@ + * hexadecimal floating-point literal {@code 0x0.000002P-126f} + * and also equal to {@code Float.intBitsToFloat(0x1)}. + */ +- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f ++ public static final float MIN_VALUE = 1.4e-45f; + + /** + * Maximum exponent a finite {@code float} variable may have. It +diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml +--- openjdk-ecj.orig/langtools/make/build.xml 2011-02-17 23:26:23.000000000 +0000 ++++ openjdk-ecj/langtools/make/build.xml 2012-01-18 21:43:04.150185964 +0000 +@@ -523,6 +523,7 @@ + includeAntRuntime="no" + source="@{javac.source}" + target="@{javac.target}"> ++ <compilerarg line="-bootclasspath @{classes.dir}:${boot.java.home}/jre/lib/rt.jar"/> + <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> + <compilerarg line="${javac.version.opt}"/> + <compilerarg line="-Xlint"/> +@@ -539,6 +540,7 @@ + target="@{javac.target}" + debug="${javac.debug}" + debuglevel="${javac.debuglevel}"> ++ <compilerarg line="-bootclasspath @{classes.dir}:${boot.java.home}/jre/lib/rt.jar"/> + <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> + <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/> + <compilerarg line="${javac.no.jdk.warnings}"/> |