Update Rhino jar (cvs build of rhino1_7R3pre) and use "Xbootclasspath…

…" for Rhino jar (fixes OpenJDK 1.6 bug).
tlrobinson · Sep 19, 2009 · a2f26e5 · a2f26e5
1 parent 0bf495a
commit a2f26e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/engines/rhino/bin/narwhal-rhino b/engines/rhino/bin/narwhal-rhino
@@ -19,13 +19,15 @@ if [ -z "$NARWHAL_HOME" ]; then
 	export NARWHAL_HOME=$(dirname -- "$(dirname -- "$NARWHAL_ENGINE_HOME")")
 fi
 
-CLASSPATH=$NARWHAL_ENGINE_HOME/jars/js.jar:$NARWHAL_ENGINE_HOME/jars/jline.jar
+CLASSPATH=$NARWHAL_ENGINE_HOME/jars/jline.jar
+BOOTCLASSPATH=$NARWHAL_ENGINE_HOME/jars/js.jar
 if [ -n "$NARWHAL_CLASSPATH" ]; then
     CLASSPATH=$NARWHAL_CLASSPATH:$CLASSPATH
 fi
 
 if [ "$(which cygpath 2>/dev/null)" ]; then
     CLASSPATH=$(cygpath -wp -- "$CLASSPATH")
+    BOOTCLASSPATH=$(cygpath -wp -- "$BOOTCLASSPATH")
     BOOTSTRAP=$(cygpath -wa -- "$BOOTSTRAP")
     export NARWHAL_HOME=$(cygpath -wa -- "$NARWHAL_HOME")
     export NARWHAL_ENGINE_HOME=$(cygpath -wa -- "$NARWHAL_ENGINE_HOME")
@@ -43,8 +45,8 @@ fi
 
 # drop into shell if there are no additional arguments
 if [ $# -lt 1 ]; then
-    java $NARWHAL_JAVA_ARGUMENTS -cp "$CLASSPATH" "$JAVA_MAIN" -f "$BOOTSTRAP" -f -
+    java $NARWHAL_JAVA_ARGUMENTS "-Xbootclasspath/p:$BOOTCLASSPATH" -cp "$CLASSPATH" "$JAVA_MAIN" -f "$BOOTSTRAP" -f -
 else
-    java $NARWHAL_JAVA_ARGUMENTS -cp "$CLASSPATH" "$JAVA_MAIN" "$BOOTSTRAP" "$0" "$@"
+    java $NARWHAL_JAVA_ARGUMENTS "-Xbootclasspath/p:$BOOTCLASSPATH" -cp "$CLASSPATH" "$JAVA_MAIN" "$BOOTSTRAP" "$0" "$@"
 fi
 
diff --git a/engines/rhino/jars/js.jar b/engines/rhino/jars/js.jar