/hg/icedtea: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Mar 14 14:22:12 PDT 2011
changeset c52c8d297c79 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c52c8d297c79
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 07 20:15:21 2011 +0000
Remove remaining plugin bits.
2011-01-26 Damien Raude-Morvan <drazzib at drazzib.com>
Remove NetX and the IcedTea plugin (drop remaining bits from
acinclude.m4 and configure.ac)
* acinclude.m4: (IT_CHECK_PLUGIN): Removed.
(IT_CHECK_PLUGIN_DEPENDENCIES): Likewise.
(IT_CHECK_XULRUNNER_VERSION): Likewise.
* configure.ac: Don't call IT_CHECK_XULRUNNER_VERSION.
changeset 0811a305cdb3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0811a305cdb3
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 14 21:22:03 2011 +0000
Perform minimal compilation prior to bootstrap build.
2011-03-14 Andrew John Hughes <ahughes at redhat.com>
Perform minimal compilation prior to bootstrap
build.
* Makefile.am: (ICEDTEA_BOOTSTRAP_DIRS): Removed.
(ICEDTEA_BOOTSTRAP_RESOURCES): Removed.
(ICEDTEA_BOOTSTRAP_CLASSES): Reduced to classes missing
altogether or missing required methods.
* patches/4964490-generify_hotspot_jdi.patch: Update the
servicability agent to build with source/target 1.6.
* patches/boot/corba-dependencies.patch: Access JDK sources
and classes from langtools build.
* patches/boot/ecj-opts.patch: Dropped PREFER_SOURCE CORBA
change, incorporated in corba-dependencies.
* patches/boot/hotspot-jdk-dependency.patch: Access JDK and
generated sources to build servicability agent.
* patches/boot/jaxws-jdk-dependency.patch: Access JDK sources
for com.sun.net.httpserver.
* patches/boot/jaxws-langtools-dependency.patch: Access
langtools classes for Javadoc.
* patches/boot/langtools-force-old-jdk.patch: Always assume an
old JDK is being used, don't try and detect this based on
presence of NIO2 classes as these may be prebuilt by rt-
class-files.
diffstat:
ChangeLog | 39 +++
Makefile.am | 46 +---
THANKYOU | 3 +-
acinclude.m4 | 46 ----
configure.ac | 3 -
patches/4964490-generify_hotspot_jdi.patch | 256 ++++++++++++++++++++++++++
patches/boot/corba-dependencies.patch | 37 +++
patches/boot/ecj-opts.patch | 14 -
patches/boot/hotspot-jdk-dependency.patch | 23 ++
patches/boot/jaxws-jdk-dependency.patch | 40 ++++
patches/boot/jaxws-langtools-dependency.patch | 45 ++++
patches/boot/langtools-force-old-jdk.patch | 15 +
12 files changed, 473 insertions(+), 94 deletions(-)
diffs (truncated from 688 to 500 lines):
diff -r 5cdaab119e8a -r 0811a305cdb3 ChangeLog
--- a/ChangeLog Sat Jan 22 21:47:34 2011 +0100
+++ b/ChangeLog Mon Mar 14 21:22:03 2011 +0000
@@ -1,3 +1,42 @@
+2011-03-14 Andrew John Hughes <ahughes at redhat.com>
+
+ Perform minimal compilation prior to bootstrap
+ build.
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_DIRS): Removed.
+ (ICEDTEA_BOOTSTRAP_RESOURCES): Removed.
+ (ICEDTEA_BOOTSTRAP_CLASSES): Reduced to
+ classes missing altogether or missing required
+ methods.
+ * patches/4964490-generify_hotspot_jdi.patch:
+ Update the servicability agent to build with
+ source/target 1.6.
+ * patches/boot/corba-dependencies.patch:
+ Access JDK sources and classes from langtools build.
+ * patches/boot/ecj-opts.patch: Dropped PREFER_SOURCE
+ CORBA change, incorporated in corba-dependencies.
+ * patches/boot/hotspot-jdk-dependency.patch:
+ Access JDK and generated sources to build servicability
+ agent.
+ * patches/boot/jaxws-jdk-dependency.patch:
+ Access JDK sources for com.sun.net.httpserver.
+ * patches/boot/jaxws-langtools-dependency.patch:
+ Access langtools classes for Javadoc.
+ * patches/boot/langtools-force-old-jdk.patch:
+ Always assume an old JDK is being used, don't
+ try and detect this based on presence of NIO2
+ classes as these may be prebuilt by rt-class-files.
+
+2011-01-26 Damien Raude-Morvan <drazzib at drazzib.com>
+
+ Remove NetX and the IcedTea plugin (drop remaining bits from acinclude.m4
+ and configure.ac)
+ * acinclude.m4:
+ (IT_CHECK_PLUGIN): Removed.
+ (IT_CHECK_PLUGIN_DEPENDENCIES): Likewise.
+ (IT_CHECK_XULRUNNER_VERSION): Likewise.
+ * configure.ac: Don't call IT_CHECK_XULRUNNER_VERSION.
+
2010-01-22 Mark Wielaard <mark at klomp.org>
* configure.ac: Add xvfb-run AC_CHECK_PROG.
diff -r 5cdaab119e8a -r 0811a305cdb3 Makefile.am
--- a/Makefile.am Sat Jan 22 21:47:34 2011 +0100
+++ b/Makefile.am Mon Mar 14 21:22:03 2011 +0000
@@ -102,35 +102,15 @@
# Sources used from OpenJDK.
if LACKS_SUN_AWT_TOOLKIT
-ICEDTEA_BOOTSTRAP_DIRS = \
- $(SHARE)/com/sun/jdi \
- $(SHARE)/com/sun/tools/jdi \
- $(SHARE)/com/sun/net/httpserver \
- $(SHARE)/java/io \
- $(SHARE)/java/security/cert \
- $(SHARE)/java/util \
- $(SHARE)/java/rmi \
- $(SHARE)/javax/net/ssl \
- $(SHARE)/javax/rmi/ssl \
- $(SHARE)/javax/script \
- $(SHARE)/javax/security/auth/kerberos \
- $(SHARE)/javax/security/sasl \
- $(SHARE)/sun/awt/ \
- $(SHARE)/sun/rmi/rmic \
- $(SHARE)/sun/tools/java \
- $(LANGTOOLS)/com/sun/mirror \
- $(LANGTOOLS)/com/sun/tools/apt
-
-ICEDTEA_BOOTSTRAP_RESOURCES = \
- $(LANGTOOLS)/com/sun/tools/javac/resources
-
-# PR42003 - javax.swing.plaf.basic.BasicDirectoryModel
-# PR43389 - javax.management.StandardMBean
+#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement
+#PR48033 - Missing javax.management.remote.JMXServiceURL
+#PR48034 - javax.management.modelmbean.ModelMBeanInfo
+#PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure
ICEDTEA_BOOTSTRAP_CLASSES = \
- $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \
- $(SHARE)/javax/management/StandardMBean.java \
- $(SHARE)/java/nio/file/SimpleFileVisitor.java \
- $(SHARE)/javax/management/modelmbean/ModelMBeanInfo.java
+ $(SHARE)/java/util/regex/Matcher.java \
+ $(SHARE)/javax/management/remote/JMXServiceURL.java \
+ $(SHARE)/javax/management/modelmbean/ModelMBeanInfo.java \
+ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
endif
# Settings for javac
@@ -304,7 +284,8 @@
patches/parisc.patch \
patches/sh4-support.patch \
patches/jtreg-httpTest.patch \
- patches/icedtea-update-bootclasspath.patch
+ patches/icedtea-update-bootclasspath.patch \
+ patches/4964490-generify_hotspot_jdi.patch
# Conditional patches
@@ -380,7 +361,12 @@
patches/boot/break-processbuilder-dependency.patch \
patches/boot/revert-6973616.patch \
patches/boot/revert-6941137.patch \
- patches/boot/ecj-stringswitch.patch
+ patches/boot/ecj-stringswitch.patch \
+ patches/boot/langtools-force-old-jdk.patch \
+ patches/boot/corba-dependencies.patch \
+ patches/boot/jaxws-langtools-dependency.patch \
+ patches/boot/jaxws-jdk-dependency.patch \
+ patches/boot/hotspot-jdk-dependency.patch
if CP39408_JAVAH
ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch
diff -r 5cdaab119e8a -r 0811a305cdb3 THANKYOU
--- a/THANKYOU Sat Jan 22 21:47:34 2011 +0100
+++ b/THANKYOU Mon Mar 14 21:22:03 2011 +0000
@@ -5,4 +5,5 @@
us know. Please keep this list in alphabetic order.
Alon Bar-Lev (alon.barlev at gmail.com)
-C. K. Jester-Young (cky944 at gmail.com)
\ No newline at end of file
+C. K. Jester-Young (cky944 at gmail.com)
+Damien Raude-Morvan (drazzib at drazzib.com)
diff -r 5cdaab119e8a -r 0811a305cdb3 acinclude.m4
--- a/acinclude.m4 Sat Jan 22 21:47:34 2011 +0100
+++ b/acinclude.m4 Mon Mar 14 21:22:03 2011 +0000
@@ -1654,52 +1654,6 @@
AM_CONDITIONAL([HAS_JDK_REVISION], test "x${JDK_REVISION}" != xnone)
AM_CONDITIONAL([HAS_HOTSPOT_REVISION], test "x${HOTSPOT_REVISION}" != xnone)
])
-AC_DEFUN_ONCE([IT_CHECK_PLUGIN],
-[
-AC_MSG_CHECKING([whether to build the browser plugin])
-AC_ARG_ENABLE([plugin],
- [AS_HELP_STRING([--disable-plugin],
- [Disable compilation of browser plugin])],
- [enable_plugin="${enableval}"], [enable_plugin="yes"])
-AC_MSG_RESULT(${enable_plugin})
-])
-
-AC_DEFUN_ONCE([IT_CHECK_PLUGIN_DEPENDENCIES],
-[
-dnl Check for plugin support headers and libraries.
-dnl FIXME: use unstable
-AC_REQUIRE([IT_CHECK_PLUGIN])
-if test "x${enable_plugin}" = "xyes" ; then
- PKG_CHECK_MODULES(GTK, gtk+-2.0)
- PKG_CHECK_MODULES(GLIB, glib-2.0)
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
-
- PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
-
- AC_SUBST(MOZILLA_CFLAGS)
- AC_SUBST(MOZILLA_LIBS)
-fi
-AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes")
-])
-
-AC_DEFUN_ONCE([IT_CHECK_XULRUNNER_VERSION],
-[
-AC_REQUIRE([IT_CHECK_PLUGIN_DEPENDENCIES])
-if test "x${enable_plugin}" = "xyes"
-then
- AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
- if pkg-config --modversion libxul >/dev/null 2>&1
- then
- xulrunner_cv_collapsed_version=`pkg-config --modversion libxul | awk -F. '{power=6; v=0; for (i=1; i <= NF; i++) {v += $i * 10 ^ power; power -=2}; print v}'`
- else
- AC_MSG_FAILURE([cannot determine xulrunner version])
- fi])
- AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version)
-fi
-])
AC_DEFUN_ONCE([IT_OBTAIN_DEFAULT_LIBDIR],
[
diff -r 5cdaab119e8a -r 0811a305cdb3 configure.ac
--- a/configure.ac Sat Jan 22 21:47:34 2011 +0100
+++ b/configure.ac Mon Mar 14 21:22:03 2011 +0000
@@ -179,9 +179,6 @@
AC_PATH_TOOL([GCJ],[gcj])
AC_SUBST([GCJ])
-dnl Plugin
-IT_CHECK_XULRUNNER_VERSION
-
dnl pkgconfig cannot be used to find these headers and libraries.
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
,[AC_MSG_ERROR("CUPS headers were not found -
diff -r 5cdaab119e8a -r 0811a305cdb3 patches/4964490-generify_hotspot_jdi.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/4964490-generify_hotspot_jdi.patch Mon Mar 14 21:22:03 2011 +0000
@@ -0,0 +1,274 @@
+# HG changeset patch
+# User andrew
+# Date 1300124050 0
+# Node ID e452443363a7f9dcff60404a0ef0fa5369380ddd
+# Parent 7f338a5e5e66b24a3dd82c57c8d1847e5c6f3878
+4964490: Generify HotSpot JDI implementation
+Summary: Fix errors produced by removing -source/-target 1.4 from SA build.
+
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java Mon Mar 14 17:34:10 2011 +0000
+@@ -55,7 +55,7 @@
+ synchronized(lock) {
+ if (useMethodInvoke) {
+ try {
+- Method method = HelloWorld.class.getMethod("e", null);
++ Method method = HelloWorld.class.getMethod("e");
+ Integer result = (Integer) method.invoke(null, new Object[0]);
+ return result.intValue();
+ }
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -52,12 +52,10 @@
+ return intValue();
+ }
+
+- public int compareTo(Object obj) {
+- byte other = ((ByteValue)obj).value();
+- return value() - other;
++ public int compareTo(ByteValue byteVal) {
++ return value() - byteVal.value();
+ }
+
+-
+ public Type type() {
+ return vm.theByteType();
+ }
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -52,9 +52,8 @@
+ return intValue();
+ }
+
+- public int compareTo(Object obj) {
+- char other = ((CharValue)obj).value();
+- return value() - other;
++ public int compareTo(CharValue charVal) {
++ return value() - charVal.value();
+ }
+
+ public Type type() {
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -186,7 +186,7 @@
+ // assert isVMVersionMismatch(throwable), "not a VMVersionMismatch"
+ Class expClass = throwable.getClass();
+ Method targetVersionMethod = expClass.getMethod("getTargetVersion", new Class[0]);
+- return (String) targetVersionMethod.invoke(throwable, null);
++ return (String) targetVersionMethod.invoke(throwable);
+ }
+
+ /** If the causal chain has a sun.jvm.hotspot.runtime.VMVersionMismatchException,
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -45,8 +45,8 @@
+ }
+ }
+
+- public int compareTo(Object obj) {
+- double other = ((DoubleValue)obj).value();
++ public int compareTo(DoubleValue doubleVal) {
++ double other = doubleVal.value();
+ if (value() < other) {
+ return -1;
+ } else if (value() == other) {
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -145,8 +145,7 @@
+ }
+
+ // From interface Comparable
+- public int compareTo(Object object) {
+- Field field = (Field)object;
++ public int compareTo(Field field) {
+ ReferenceTypeImpl declaringType = (ReferenceTypeImpl)declaringType();
+ int rc = declaringType.compareTo(field.declaringType());
+ if (rc == 0) {
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -52,8 +52,8 @@
+ return intValue();
+ }
+
+- public int compareTo(Object obj) {
+- float other = ((FloatValue)obj).value();
++ public int compareTo(FloatValue floatVal) {
++ float other = floatVal.value();
+ if (value() < other) {
+ return -1;
+ } else if (value() == other) {
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -52,9 +52,8 @@
+ return intValue();
+ }
+
+- public int compareTo(Object obj) {
+- int other = ((IntegerValue)obj).value();
+- return value() - other;
++ public int compareTo(IntegerValue integerVal) {
++ return value() - integerVal.value();
+ }
+
+ public Type type() {
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -67,8 +67,8 @@
+ return (int)method.hashCode() + slot();
+ }
+
+- public int compareTo(Object object) {
+- LocalVariableImpl other = (LocalVariableImpl)object;
++ public int compareTo(LocalVariable localVar) {
++ LocalVariableImpl other = (LocalVariableImpl) localVar;
+ int rc = method.compareTo(other.method);
+ if (rc == 0) {
+ rc = slot() - other.slot();
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -78,8 +78,7 @@
+ return method().hashCode() + (int)codeIndex();
+ }
+
+- public int compareTo(Object object) {
+- LocationImpl other = (LocationImpl)object;
++ public int compareTo(Location other) {
+ int rc = method().compareTo(other.method());
+ if (rc == 0) {
+ long diff = codeIndex() - other.codeIndex();
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -52,8 +52,8 @@
+ return intValue();
+ }
+
+- public int compareTo(Object obj) {
+- long other = ((LongValue)obj).value();
++ public int compareTo(LongValue longVal) {
++ long other = longVal.value();
+ if (value() < other) {
+ return -1;
+ } else if (value() == other) {
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -200,8 +200,7 @@
+ }
+
+ // From interface Comparable
+- public int compareTo(Object object) {
+- Method method = (Method)object;
++ public int compareTo(Method method) {
+ ReferenceTypeImpl declaringType = (ReferenceTypeImpl)declaringType();
+ int rc = declaringType.compareTo(method.declaringType());
+ if (rc == 0) {
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -99,7 +99,7 @@
+ return saKlass.hashCode();
+ }
+
+- public int compareTo(Object object) {
++ public int compareTo(ReferenceType refType) {
+ /*
+ * Note that it is critical that compareTo() == 0
+ * implies that equals() == true. Otherwise, TreeSet
+@@ -108,7 +108,7 @@
+ * (Classes of the same name loaded by different class loaders
+ * or in different VMs must not return 0).
+ */
+- ReferenceTypeImpl other = (ReferenceTypeImpl)object;
++ ReferenceTypeImpl other = (ReferenceTypeImpl)refType;
+ int comp = name().compareTo(other.name());
+ if (comp == 0) {
+ Oop rf1 = ref();
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -52,9 +52,8 @@
+ return intValue();
+ }
+
+- public int compareTo(Object obj) {
+- short other = ((ShortValue)obj).value();
+- return value() - other;
++ public int compareTo(ShortValue shortVal) {
++ return value() - shortVal.value();
+ }
+
+ public Type type() {
+diff -r 7f338a5e5e66 -r e452443363a7 agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java
+--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java Mon Mar 14 17:34:10 2011 +0000
+@@ -798,12 +798,11 @@
+ }
+
+ public String description() {
+- String[] versionParts = {"" + vmmgr.majorInterfaceVersion(),
+- "" + vmmgr.minorInterfaceVersion(),
+- name()};
+ return java.text.MessageFormat.format(java.util.ResourceBundle.
+ getBundle("com.sun.tools.jdi.resources.jdi").getString("version_format"),
+- versionParts);
++ "" + vmmgr.majorInterfaceVersion(),
++ "" + vmmgr.minorInterfaceVersion(),
++ name());
+ }
+
+ public String version() {
+diff -r 7f338a5e5e66 -r e452443363a7 make/linux/makefiles/sa.make
+--- openjdk/hotspot/make/linux/makefiles/sa.make Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/make/linux/makefiles/sa.make Mon Mar 14 17:34:10 2011 +0000
+@@ -97,8 +97,8 @@
+ $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
+ $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
+
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
+
+ $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+diff -r 7f338a5e5e66 -r e452443363a7 make/solaris/makefiles/sa.make
+--- openjdk/hotspot/make/solaris/makefiles/sa.make Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/make/solaris/makefiles/sa.make Mon Mar 14 17:34:10 2011 +0000
+@@ -88,8 +88,8 @@
+ $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
+ $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
+
+- $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
+- $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
++ $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
++ $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
+
+ $(QUIETLY) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+diff -r 7f338a5e5e66 -r e452443363a7 make/windows/makefiles/sa.make
+--- openjdk/hotspot/make/windows/makefiles/sa.make Mon Jan 10 16:57:36 2011 +0000
++++ openjdk/hotspot/make/windows/makefiles/sa.make Mon Mar 14 17:34:10 2011 +0000
+@@ -55,9 +55,9 @@
+ $(GENERATED)\sa-jdi.jar: $(AGENT_FILES1:/=\) $(AGENT_FILES2:/=\)
+ @if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR)
+ @echo ...Building sa-jdi.jar
+- @echo ...$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) ....
+- @$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\)
+- @$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\)
++ @echo ...$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) ....
++ @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\)
++ @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\)
+ $(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES)
+ $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
diff -r 5cdaab119e8a -r 0811a305cdb3 patches/boot/corba-dependencies.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/corba-dependencies.patch Mon Mar 14 21:22:03 2011 +0000
@@ -0,0 +1,39 @@
+diff -Nru openjdk-boot.orig/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
+--- openjdk-boot.orig/corba/make/common/Defs.gmk 2011-03-08 18:49:48.566665532 +0000
++++ openjdk-boot/corba/make/common/Defs.gmk 2011-03-08 18:47:51.734115218 +0000
+@@ -50,6 +50,9 @@
+ ifndef SHARE_SRC
+ SHARE_SRC = $(TOPDIR)/src/share
+ endif
++ifndef JDK_SRC
++ JDK_SRC = $(JDK_TOPDIR)/src/share
++endif
+
+ _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
+
+@@ -172,7 +175,7 @@
+ # We define an intermediate variable for Java files because
+ # we use its value later to help define $SOURCEPATH
+
+-VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
++VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes$(CLASSPATH_SEPARATOR)$(JDK_SRC)/classes
+ VPATH.java = $(VPATH0.java)
+ vpath %.java $(VPATH.java)
More information about the distro-pkg-dev
mailing list