Skip to content

Commit

Permalink
Drops Xbootclasspath since no longer needed
Browse files Browse the repository at this point in the history
Fixes #381, `js.jar` no longer exists in Ringo
  • Loading branch information
botic committed Nov 6, 2017
1 parent 5e968b2 commit dc8b8cc
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 10 deletions.
2 changes: 0 additions & 2 deletions bin/ringo
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ esac
# To put $app_args back into the position arguments $1, $2 etc
# set -- "${app_args[@]}"

# prepend rhino to bootclasspath to work around openjdk bug
java_args=("${java_args[@]}" "-Xbootclasspath/a:$RINGO_HOME/lib/js.jar")

# echo "java_args ${java_args[@]}"
# echo "ringo_args ${ringo_args[@]}"
Expand Down
2 changes: 0 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@
includeAntRuntime="false">
<compilerarg value="-Xlint:unchecked"/>
<classpath refid="classpath"/>
<!-- fix for openjdk rhino bootclasspath bug -->
<compilerarg value="-Xbootclasspath/a:${lib}/js.jar"/>
</javac>
</target>

Expand Down
6 changes: 2 additions & 4 deletions debian/ringojs-daemon.ringojs.init
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ DEFAULT=/etc/default/$NAME
# direct both stdout and stderr to ringo-out.log
RINGO_OUT=/var/log/ringojs/${NAME}-out.log
RINGO_ERR="&1"
# fix for Rhino on bootclasspath in OpenJDK
RHINO_CLASSPATH=-Xbootclasspath/a:${RINGO_HOME}lib/js.jar

if [ `id -u` -ne 0 ]; then
echo "You need root privileges to run this script"
Expand Down Expand Up @@ -138,7 +136,7 @@ case "$1" in
>/dev/null
then
cd "$RINGO_BASE"
$DAEMON $RHINO_CLASSPATH -cp "$JSVC_CLASSPATH" \
$DAEMON -cp "$JSVC_CLASSPATH" \
-user "$RINGO_USER" -outfile "$RINGO_OUT" -errfile "$RINGO_ERR" \
-pidfile "$RINGO_PID" $JAVA_OPTS "$BOOTSTRAP_CLASS" \
$RINGO_OPTS "$RINGO_APPLICATION" $APPLICATION_OPTS
Expand All @@ -165,7 +163,7 @@ case "$1" in
then
log_progress_msg "(not running)"
else
$DAEMON $RHINO_CLASSPATH -cp "$JSVC_CLASSPATH" \
$DAEMON -cp "$JSVC_CLASSPATH" \
-pidfile "$RINGO_PID" -stop "$BOOTSTRAP_CLASS"
fi
log_end_msg 0
Expand Down
2 changes: 0 additions & 2 deletions debian/usr/bin/ringo
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ esac
# To put $app_args back into the position arguments $1, $2 etc
# set -- "${app_args[@]}"

# prepend rhino to bootclasspath to work around openjdk bug
java_args=("${java_args[@]}" "-Xbootclasspath/a:$RINGO_HOME/lib/js.jar")

# echo "java_args ${java_args[@]}"
# echo "ringo_args ${ringo_args[@]}"
Expand Down

0 comments on commit dc8b8cc

Please sign in to comment.