changeset in /hg/icedtea: Fix post-merge issues #02.
Andrew John Hughes
gnu_andrew at member.fsf.org
Sat Oct 18 21:23:39 PDT 2008
changeset d07cdbac2dc6 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d07cdbac2dc6
description:
Fix post-merge issues #02.
2008-10-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
* rt/netscape/javascript/JSException.java,
* rt/netscape/javascript/JSObject.java,
* rt/netscape/javascript/JSProxy.java,
* rt/netscape/javascript/JSRunnable.java,
* rt/netscape/javascript/JSUtil.java:
Removed as moved to plugin.
* Makefile.am: Fix errors introduced by merge.
* patches/icedtea-arch.patch,
* patches/icedtea-ecj.patch: Regenerated.
diffstat:
9 files changed, 81 insertions(+), 662 deletions(-)
ChangeLog | 14 +
Makefile.am | 7
patches/icedtea-arch.patch | 8
patches/icedtea-ecj.patch | 129 +++++++--------
rt/netscape/javascript/JSException.java | 140 ----------------
rt/netscape/javascript/JSObject.java | 258 -------------------------------
rt/netscape/javascript/JSProxy.java | 58 ------
rt/netscape/javascript/JSRunnable.java | 70 --------
rt/netscape/javascript/JSUtil.java | 59 -------
diffs (truncated from 1073 to 500 lines):
diff -r d7d27a7f9673 -r d07cdbac2dc6 ChangeLog
--- a/ChangeLog Fri Oct 17 02:52:46 2008 +0100
+++ b/ChangeLog Fri Oct 17 04:03:27 2008 +0100
@@ -1,4 +1,16 @@ 2008-10-16 Andrew John Hughes <gnu_and
-2008-10-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-10-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * rt/netscape/javascript/JSException.java,
+ * rt/netscape/javascript/JSObject.java,
+ * rt/netscape/javascript/JSProxy.java,
+ * rt/netscape/javascript/JSRunnable.java,
+ * rt/netscape/javascript/JSUtil.java:
+ Removed as moved to plugin.
+ * Makefile.am: Fix errors introduced by merge.
+ * patches/icedtea-arch.patch,
+ * patches/icedtea-ecj.patch: Regenerated.
+
+2008-10-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/icedtea-6open-6616825.patch,
* patches/icedtea-6open-6651382.patch,
diff -r d7d27a7f9673 -r d07cdbac2dc6 Makefile.am
--- a/Makefile.am Fri Oct 17 02:52:46 2008 +0100
+++ b/Makefile.am Fri Oct 17 04:03:27 2008 +0100
@@ -545,7 +545,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-memory-limits.patch \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
- patches/icedtea-javafiles.patch \
patches/icedtea-core-build.patch \
patches/icedtea-linker-options.patch \
patches/icedtea-static-libstdc++.patch \
@@ -874,7 +873,7 @@ ICEDTEA_ECJ_PATCHES = patches/icedtea-ec
ICEDTEA_ECJ_PATCHES = patches/icedtea-ecj.patch \
patches/icedtea-ecj-spp.patch
-stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
+stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
mkdir -p stamps; \
rm -f stamps/patch-ecj.stamp.tmp ; \
touch stamps/patch-ecj.stamp.tmp ; \
@@ -1436,10 +1435,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
$(JAR) cf $@ -C lib/rt com -C lib/rt java \
- -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ; \
+ -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
- -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ; \
+ -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \
fi
if test -d bootstrap/ecj/jre/lib ; \
then \
diff -r d7d27a7f9673 -r d07cdbac2dc6 patches/icedtea-arch.patch
--- a/patches/icedtea-arch.patch Fri Oct 17 02:52:46 2008 +0100
+++ b/patches/icedtea-arch.patch Fri Oct 17 04:03:27 2008 +0100
@@ -100,14 +100,6 @@ diff -Nru openjdk.orig/jdk/make/common/s
ifneq ("$(findstring sparc,$(ARCH))", "")
# sparc or sparcv9
REQUIRED_CC_VER = 4.0
-@@ -92,6 +138,7 @@
- endif
- endif
- endif
-+ endif
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -shared -mimpure-text
- SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk
--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2008-10-17 02:24:36.000000000 +0100
+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2008-10-17 02:45:02.000000000 +0100
diff -r d7d27a7f9673 -r d07cdbac2dc6 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch Fri Oct 17 02:52:46 2008 +0100
+++ b/patches/icedtea-ecj.patch Fri Oct 17 04:03:27 2008 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk-ecj.orig/corba/make/co
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 2008-09-25 08:39:53.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2008-10-17 03:21:22.000000000 +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/co
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 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2008-10-17 03:21:22.000000000 +0100
@@ -0,0 +1,38 @@
+#
+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -54,7 +54,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
+include $(BUILDDIR)/common/Classes.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 2008-09-25 08:39:53.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs.gmk 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs.gmk 2008-10-17 03:21:22.000000000 +0100
@@ -53,6 +53,13 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -88,11 +88,11 @@ diff -Nru openjdk-ecj.orig/corba/make/co
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 2008-09-25 08:39:53.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2008-10-17 01:35:53.000000000 +0100
-@@ -252,7 +252,7 @@
- #
- VM_NAME = server
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2008-10-17 03:12:25.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2008-10-17 03:21:22.000000000 +0100
+@@ -276,7 +276,7 @@
+ fi; \
+ done)
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)
@@ -101,7 +101,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
# We want to privatize JVM symbols on Solaris. This is so the user can
diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk
--- openjdk-ecj.orig/corba/make/common/Rules.gmk 2008-09-25 08:39:53.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Rules.gmk 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/corba/make/common/Rules.gmk 2008-10-17 03:21:22.000000000 +0100
@@ -197,8 +197,10 @@
$(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
$(CAT) $(JAVA_SOURCE_LIST); \
@@ -117,7 +117,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
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 2008-09-25 08:39:53.000000000 +0100
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-10-17 03:21:22.000000000 +0100
@@ -117,31 +117,13 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -156,7 +156,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
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 2008-09-25 08:39:53.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2008-10-17 03:21:22.000000000 +0100
@@ -93,8 +93,6 @@
POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
@@ -234,9 +234,9 @@ diff -Nru openjdk-ecj.orig/corba/make/or
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 2008-09-25 08:39:53.000000000 +0100
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2008-10-17 01:35:53.000000000 +0100
-@@ -173,7 +173,6 @@
+--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2008-10-17 03:12:24.000000000 +0100
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2008-10-17 03:21:22.000000000 +0100
+@@ -172,7 +172,6 @@
ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
$(ACTIVATIONFILES): $(ACTIVATION.IDL)
@@ -244,7 +244,7 @@ diff -Nru openjdk-ecj.orig/corba/make/su
activation.idl.compile: $(ACTIVATIONFILES)
-@@ -196,7 +195,6 @@
+@@ -195,7 +194,6 @@
# REVISIT: remove -oldImplBase
$(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
@@ -253,9 +253,9 @@ diff -Nru openjdk-ecj.orig/corba/make/su
portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
---- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-09-25 08:40:31.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/Makefile 2008-10-17 01:35:53.000000000 +0100
-@@ -249,28 +249,24 @@
+--- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-10-17 03:12:25.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/Makefile 2008-10-17 03:21:22.000000000 +0100
+@@ -263,28 +263,24 @@
$(TARGETS_C2): $(SUBDIRS_C2)
cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
@@ -285,8 +285,8 @@ diff -Nru openjdk-ecj.orig/hotspot/make/
cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
endif
diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
---- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-09-25 08:40:31.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-10-17 01:35:53.000000000 +0100
+--- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-10-17 03:12:25.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-10-17 03:21:22.000000000 +0100
@@ -74,8 +74,8 @@
mkdir -p $(SA_CLASSDIR); \
fi
@@ -300,7 +300,7 @@ diff -Nru openjdk-ecj.orig/hotspot/make/
$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
--- openjdk-ecj.orig/jaxp/make/build.xml 2008-09-25 08:40:52.000000000 +0100
-+++ openjdk-ecj/jaxp/make/build.xml 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/jaxp/make/build.xml 2008-10-17 03:21:22.000000000 +0100
@@ -71,7 +71,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -325,8 +325,8 @@ diff -Nru openjdk-ecj.orig/jaxp/make/bui
<compilerarg line="${javac.version.opt}"/>
</javac>
diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile
---- openjdk-ecj.orig/jaxp/make/Makefile 2008-09-25 08:40:52.000000000 +0100
-+++ openjdk-ecj/jaxp/make/Makefile 2008-10-17 01:35:53.000000000 +0100
+--- openjdk-ecj.orig/jaxp/make/Makefile 2008-10-17 03:12:24.000000000 +0100
++++ openjdk-ecj/jaxp/make/Makefile 2008-10-17 03:21:22.000000000 +0100
@@ -80,7 +80,7 @@
endif
@@ -337,8 +337,8 @@ diff -Nru openjdk-ecj.orig/jaxp/make/Mak
ifdef ALT_OUTPUTDIR
diff -Nru openjdk-ecj.orig/jaxws/make/build.properties openjdk-ecj/jaxws/make/build.properties
---- openjdk-ecj.orig/jaxws/make/build.properties 2008-09-25 08:41:11.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.properties 2008-10-17 01:35:53.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/build.properties 2008-10-17 03:12:25.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.properties 2008-10-17 03:21:22.000000000 +0100
@@ -37,7 +37,7 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
@@ -349,8 +349,8 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu
# JVM memory size
javac.memoryInitialSize = 128m
diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml
---- openjdk-ecj.orig/jaxws/make/build.xml 2008-09-25 08:41:11.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.xml 2008-10-17 01:40:43.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/build.xml 2008-10-17 03:12:24.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.xml 2008-10-17 03:28:27.000000000 +0100
@@ -84,7 +84,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -373,17 +373,18 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu
target="${javac.target}"
- excludes="com/sun/tools/internal/txw2/**">
+ excludes="com/sun/tools/internal/txw2/**"
-+ source="1.5">
++ source="1.5">
+ <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/>
<compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
<compilerarg line="${javac.version.opt}"/>
- <compilerarg line="${javac.no.jdk.warnings}"/>
diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile
---- openjdk-ecj.orig/jaxws/make/Makefile 2008-09-25 08:41:11.000000000 +0100
-+++ openjdk-ecj/jaxws/make/Makefile 2008-10-17 01:41:40.000000000 +0100
-@@ -80,7 +80,8 @@
+--- openjdk-ecj.orig/jaxws/make/Makefile 2008-10-17 03:12:24.000000000 +0100
++++ openjdk-ecj/jaxws/make/Makefile 2008-10-17 03:29:11.000000000 +0100
+@@ -80,8 +80,8 @@
endif
ifdef ALT_BOOTDIR
+- ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
+ ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
+ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
@@ -392,7 +393,7 @@ diff -Nru openjdk-ecj.orig/jaxws/make/Ma
ifdef ALT_OUTPUTDIR
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 2008-09-25 08:43:35.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2008-10-17 03:21:22.000000000 +0100
@@ -43,7 +43,8 @@
@$(prep-target)
@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -404,9 +405,9 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
-C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
$(BOOT_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 2008-09-25 08:43:35.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Release.gmk 2008-10-17 01:38:13.000000000 +0100
-@@ -657,10 +657,23 @@
+--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2008-10-17 03:12:24.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Release.gmk 2008-10-17 03:21:22.000000000 +0100
+@@ -651,10 +651,23 @@
$(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
$(prep-target)
$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
@@ -432,7 +433,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
@$(java-vm-cleanup)
# Create jsse.jar containing SunJSSE implementation classes
-@@ -716,10 +729,18 @@
+@@ -710,10 +723,18 @@
$(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
$(prep-target)
$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
@@ -453,7 +454,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
@$(java-vm-cleanup)
# Meta-index construction to make core class loaders lazier
-@@ -957,19 +978,6 @@
+@@ -951,19 +972,6 @@
@$(java-vm-cleanup)
$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
@#
@@ -473,7 +474,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
@# CORBA supported orb.idl and ir.idl should be copied to lib
@#
$(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
-@@ -1046,16 +1054,6 @@
+@@ -1040,16 +1048,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
@@ -492,7 +493,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
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 2008-09-25 08:43:35.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Rules.gmk 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Rules.gmk 2008-10-17 03:21:22.000000000 +0100
@@ -237,8 +237,9 @@
$(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
$(CAT) $<.filtered; \
@@ -519,9 +520,9 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
@$(TOUCH) $@
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 2008-09-25 08:43:35.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2008-10-17 01:35:53.000000000 +0100
-@@ -127,30 +127,19 @@
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2008-10-17 03:12:25.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2008-10-17 03:21:22.000000000 +0100
+@@ -121,30 +121,19 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Needed for javah
@@ -555,7 +556,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
# Override of what javac to use (see deploy workspace)
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 2008-09-25 08:43:36.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/nio/Makefile 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/jdk/make/java/nio/Makefile 2008-10-17 03:21:22.000000000 +0100
@@ -31,7 +31,7 @@
PACKAGE = java.nio
LIBRARY = nio
@@ -567,7 +568,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/java
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 2008-09-25 08:43:36.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/text/Makefile 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/jdk/make/java/text/Makefile 2008-10-17 03:21:22.000000000 +0100
@@ -80,8 +80,8 @@
-sourcepath $(TEXT_SRCDIR) \
$(TEXT_SOURCES)
@@ -581,7 +582,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/java
@$(java-vm-cleanup)
diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile
--- openjdk-ecj.orig/jdk/make/Makefile 2008-09-25 08:43:35.000000000 +0100
-+++ openjdk-ecj/jdk/make/Makefile 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/jdk/make/Makefile 2008-10-17 03:21:22.000000000 +0100
@@ -239,7 +239,7 @@
all build:: sanity-all post-sanity-all
@@ -593,7 +594,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/Make
diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk
--- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2008-09-25 08:43:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2008-10-17 01:35:53.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2008-10-17 03:21:22.000000000 +0100
@@ -188,3 +188,5 @@
java/awt/dnd/DnDConstants.java \
sun/awt/CausedFocusEvent.java
@@ -601,8 +602,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/
+EXPORTED_inner = \
+ sun.java2d.opengl.OGLContext$$OGLContextCaps
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 2008-10-17 01:42:51.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/Makefile 2008-10-17 01:44:19.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2008-09-25 08:43:37.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2008-10-17 03:21:22.000000000 +0100
@@ -395,10 +395,9 @@
COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
@@ -619,7 +620,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/
fontconfigs.clean :
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 2008-09-25 08:43:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/text/Makefile 2008-10-17 01:48:02.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/text/Makefile 2008-10-17 03:21:22.000000000 +0100
@@ -85,8 +85,9 @@
$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
-sourcepath $(TEXT_SRCDIR) \
@@ -634,7 +635,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/
-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 2008-09-25 08:43:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2008-10-17 01:48:02.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2008-10-17 03:21:22.000000000 +0100
@@ -276,11 +276,7 @@
TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -672,8 +673,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/sun/
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 2008-09-25 08:43:38.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-10-17 01:48:02.000000000 +0100
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-10-17 03:13:56.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-10-17 03:21:22.000000000 +0100
@@ -647,9 +647,6 @@
throws FileNotFoundException, IOException {
BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -693,8 +694,8 @@ diff -Nru openjdk-ecj.orig/jdk/make/tool
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 2008-09-25 08:43:48.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2008-10-17 01:48:02.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2008-10-17 03:13:50.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2008-10-17 03:21:22.000000000 +0100
@@ -76,7 +76,7 @@
* {@code 0x1.fffffffffffffP+1023} and also equal to
* {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -723,8 +724,8 @@ diff -Nru openjdk-ecj.orig/jdk/src/share
/**
* 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 2008-09-25 08:43:48.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2008-10-17 01:48:02.000000000 +0100
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2008-10-17 03:13:51.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2008-10-17 03:21:22.000000000 +0100
@@ -76,7 +76,7 @@
* {@code 0x1.fffffeP+127f} and also equal to
* {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -754,7 +755,7 @@ diff -Nru openjdk-ecj.orig/jdk/src/share
* Maximum exponent a finite {@code float} variable may have. It
diff -Nru openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
--- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2008-09-25 08:44:18.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2008-10-17 01:48:02.000000000 +0100
++++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2008-10-17 03:21:22.000000000 +0100
@@ -27,6 +27,7 @@
#define OGLContext_h_Included
@@ -821,7 +822,7 @@ diff -Nru openjdk-ecj.orig/jdk/src/share
* Evaluates to true if the given capability bitmask is present for the
diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml
--- openjdk-ecj.orig/langtools/make/build.xml 2008-09-25 08:45:02.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.xml 2008-10-17 01:48:02.000000000 +0100
++++ openjdk-ecj/langtools/make/build.xml 2008-10-17 03:21:22.000000000 +0100
@@ -498,7 +498,10 @@
includes="@{includes}"
sourcepath=""
@@ -860,8 +861,8 @@ diff -Nru openjdk-ecj.orig/langtools/mak
classname="CompilePropertiesTask"
classpath="${build.toolclasses.dir}/"/>
diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile
---- openjdk-ecj.orig/langtools/make/Makefile 2008-09-25 08:45:02.000000000 +0100
-+++ openjdk-ecj/langtools/make/Makefile 2008-10-17 01:48:02.000000000 +0100
+--- openjdk-ecj.orig/langtools/make/Makefile 2008-10-17 03:12:24.000000000 +0100
++++ openjdk-ecj/langtools/make/Makefile 2008-10-17 03:21:22.000000000 +0100
@@ -113,7 +113,7 @@
ifdef ALT_BOOTDIR
@@ -872,9 +873,9 @@ diff -Nru openjdk-ecj.orig/langtools/mak
ifdef ALT_OUTPUTDIR
diff -Nru openjdk-ecj.orig/make/jdk-rules.gmk openjdk-ecj/make/jdk-rules.gmk
---- openjdk-ecj.orig/make/jdk-rules.gmk 2008-09-25 08:39:45.000000000 +0100
-+++ openjdk-ecj/make/jdk-rules.gmk 2008-10-17 01:48:02.000000000 +0100
-@@ -63,7 +63,7 @@
+--- openjdk-ecj.orig/make/jdk-rules.gmk 2008-10-17 03:12:25.000000000 +0100
++++ openjdk-ecj/make/jdk-rules.gmk 2008-10-17 03:21:22.000000000 +0100
+@@ -58,7 +58,7 @@
endif
ifndef DEV_ONLY
diff -r d7d27a7f9673 -r d07cdbac2dc6 rt/netscape/javascript/JSException.java
--- a/rt/netscape/javascript/JSException.java Fri Oct 17 02:52:46 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/* -*- Mode: Java; tab-width: 8; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
More information about the distro-pkg-dev
mailing list