changeset in /hg/icedtea: 2008-07-23 Lillian Angel <langel@red...

[Lillian Angel]

changeset 471b9b923eb5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=471b9b923eb5
description:
        2008-07-23  Lillian Angel  <langel@...>

                * patches/icedtea-rhino.patch: Updated.

diffstat:

2 files changed, 63 insertions(+), 59 deletions(-)
ChangeLog                   |    4 +
patches/icedtea-rhino.patch |  118 +++++++++++++++++++++----------------------

diffs (150 lines):

diff -r 6fa13641fb8a -r 471b9b923eb5 ChangeLog
--- a/ChangeLog Tue Jul 22 20:25:20 2008 +0100
+++ b/ChangeLog Wed Jul 23 11:25:20 2008 -0400
@@ -1,3 +1,7 @@ 2008-07-22  Andrew John Hughes  <gnu_and
[phone]  Lillian Angel  <langel@...>
+
+ * patches/icedtea-rhino.patch: Updated.
+
 2008-07-22  Andrew John Hughes  <gnu_andrew@...>
 
  * patches/icedtea-gcc-4.3.patch,
diff -r 6fa13641fb8a -r 471b9b923eb5 patches/icedtea-rhino.patch
--- a/patches/icedtea-rhino.patch Tue Jul 22 20:25:20 2008 +0100
+++ b/patches/icedtea-rhino.patch Wed Jul 23 11:25:20 2008 -0400
@@ -1,44 +1,3 @@
---- openjdk.orig/jdk/make/com/sun/Makefile 2008-06-22 18:53:03.000000000 +0200
-+++ openjdk/jdk/make/com/sun/Makefile 2008-06-22 18:56:41.000000000 +0200
-@@ -31,15 +31,8 @@
- PRODUCT = sun
- include $(BUILDDIR)/common/Defs.gmk
-
--ifndef OPENJDK
--  ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,)
--  ifneq ("$(ORG_EXISTS)", "")
--    SCRIPT_SUBDIR = script
--  endif
--endif
--
- # Omit mirror since it's built with the apt tool.
--SUBDIRS = $(SCRIPT_SUBDIR) image security crypto/provider jndi jmx \
-+SUBDIRS = script image security crypto/provider jndi jmx \
-     java inputmethods org xml rowset net/httpserver net/ssl demo \
-     tools jarsigner
-
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2008-06-22 18:52:46.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2008-06-22 19:02:39.000000000 +0200
-@@ -26,7 +26,7 @@
- package com.sun.script.javascript;
- import com.sun.script.util.*;
- import javax.script.*;
--import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
- import java.lang.reflect.Method;
- import java.io.*;
- import java.util.*;
---- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2008-06-22 18:52:46.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2008-06-22 19:02:49.000000000 +0200
-@@ -25,7 +25,7 @@
-
- package com.sun.script.javascript;
-
--import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
- import java.util.*;
-
- /**
 --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2008-06-22 18:52:46.000000000 +0200
 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2008-06-22 19:03:00.000000000 +0200
 @@ -26,7 +26,7 @@
@@ -116,17 +75,6 @@
  import javax.script.*;
  import java.util.*;
 
---- openjdk.orig/jdk/make/com/sun/script/Makefile 2008-06-22 18:53:02.000000000 +0200
-+++ openjdk/jdk/make/com/sun/script/Makefile 2008-06-22 21:12:35.000000000 +0200
-@@ -31,6 +31,8 @@
-
- AUTO_FILES_JAVA_DIRS = com/sun/script
-
-+OTHER_JAVACFLAGS = -classpath $(RHINO_JAR)
-+
- #
- # Files that need to be copied
- #
 --- openjdk.orig/jdk/make/common/Release.gmk 2008-06-22 18:53:02.000000000 +0200
 +++ openjdk/jdk/make/common/Release.gmk 2008-06-23 00:14:02.000000000 +0200
 @@ -772,6 +772,7 @@
@@ -137,13 +85,65 @@
  @# Generate meta-index to make boot and extension class loaders lazier
  $(CD) $(JRE_IMAGE_DIR)/lib && \
     $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
---- openjdk/hotspot/src/share/vm/runtime/os.cpp.orig 2008-06-23 00:17:03.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2008-06-22 22:34:33.000000000 +0200
-@@ -949,6 +949,7 @@
- "%/lib/jsse.jar:"
- "%/lib/jce.jar:"
+--- /old/openjdk/jdk/make/com/sun/Makefile 2008-07-17 03:43:07.000000000 -0400
++++ openjdk/jdk/make/com/sun/Makefile 2008-07-23 11:19:02.000000000 -0400
+@@ -31,15 +31,8 @@
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
+
+-ifndef OPENJDK
+-  ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,)
+-  ifneq ("$(ORG_EXISTS)", "")
+-    SCRIPT_SUBDIR = script
+-  endif
+-endif
+-
+ # Omit mirror since it's built with the apt tool.
+-SUBDIRS = $(SCRIPT_SUBDIR) image security crypto/provider jndi jmx \
++SUBDIRS = script image security crypto/provider jndi jmx \
+     java inputmethods org xml rowset net/httpserver net/ssl demo \
+     tools jarsigner tracing
+
+--- /old/openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2008-07-17 03:43:16.000000000 -0400
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2008-07-23 11:19:56.000000000 -0400
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+ import com.sun.script.util.*;
+ import javax.script.*;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ import java.lang.reflect.Method;
+ import java.io.*;
+ import java.util.*;
+--- /old/openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2008-07-17 03:43:16.000000000 -0400
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2008-07-23 11:20:49.000000000 -0400
+@@ -25,7 +25,7 @@
+
+ package com.sun.script.javascript;
+
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ import java.util.*;
+
+ /**
+--- /old/openjdk/jdk/make/com/sun/script/Makefile 2008-07-17 03:43:08.000000000 -0400
++++ openjdk/jdk/make/com/sun/script/Makefile 2008-07-23 11:22:03.000000000 -0400
+@@ -31,6 +31,8 @@
+
+ AUTO_FILES_JAVA_DIRS = com/sun/script
+
++OTHER_JAVACFLAGS = -classpath $(RHINO_JAR)
++
+ #
+ # Files that need to be copied
+ #
+--- /old/openjdk/hotspot/src/share/vm/runtime/os.cpp 2008-07-17 03:40:34.000000000 -0400
++++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2008-07-23 11:22:42.000000000 -0400
+@@ -877,6 +877,7 @@
+         "%/lib/jsse.jar:"
+         "%/lib/jce.jar:"
          "%/lib/charsets.jar:"
-+        "%/lib/rhino.jar:"
- "%/classes";
++ "%/lib/rhino.jar:"
+         "%/classes";
      char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);
      if (sysclasspath == NULL) return false;