Skip to content
Snippets Groups Projects
Commit 73fc8f17 authored by Danilo Ansaloni's avatar Danilo Ansaloni Committed by Gilles Duboscq
Browse files

Update the launchers to the latest in vm-enterprise.

parent ec661118
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
com.oracle.truffle.r.release/src/R_legacy
+ 9
− 4
View file @ 73fc8f17
...@@ -25,9 +25,9 @@ PROGRAM_ARGS=() ...@@ -25,9 +25,9 @@ PROGRAM_ARGS=()
for opt in "${@:1}" for opt in "${@:1}"
do do
case $opt in case $opt in
-J:*) --jvm.*)
opt=${opt:3} opt=${opt:6}
JAVA_ARGS+=("$opt") ;; JAVA_ARGS+=("-$opt") ;;
*) *)
PROGRAM_ARGS+=("$opt") ;; PROGRAM_ARGS+=("$opt") ;;
esac esac
...@@ -42,6 +42,11 @@ do ...@@ -42,6 +42,11 @@ do
GRAALVMCP="$GRAALVMCP$JAVA_HOME/$cp:" GRAALVMCP="$GRAALVMCP$JAVA_HOME/$cp:"
done done
# internal variable used to pass args to child R processes
if [ -z "$FASTR_INTERNAL_ARGS" ]; then
FASTR_INTERNAL_ARGS=()
fi
# we can invoke FastR directly, but we do have to set R_HOME # we can invoke FastR directly, but we do have to set R_HOME
export R_HOME="$JRE/languages/R" export R_HOME="$JRE/languages/R"
exec "$JAVA_HOME/bin/java" -cp "$GRAALVMCP" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx8g "${JAVA_ARGS[@]}" com.oracle.truffle.r.launcher.LegacyLauncher com.oracle.truffle.r.launcher.RCommand "${PROGRAM_ARGS[@]}" exec "$JAVA_HOME/bin/java" -cp "$GRAALVMCP" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx8g "${JAVA_ARGS[@]}" com.oracle.truffle.r.launcher.LegacyLauncher com.oracle.truffle.r.launcher.RCommand "${FASTR_INTERNAL_ARGS[@]}" "${PROGRAM_ARGS[@]}"
com.oracle.truffle.r.release/src/Rscript_legacy
+ 9
− 4
View file @ 73fc8f17
...@@ -25,9 +25,9 @@ PROGRAM_ARGS=() ...@@ -25,9 +25,9 @@ PROGRAM_ARGS=()
for opt in "${@:1}" for opt in "${@:1}"
do do
case $opt in case $opt in
-J:*) --jvm.*)
opt=${opt:3} opt=${opt:6}
JAVA_ARGS+=("$opt") ;; JAVA_ARGS+=("-$opt") ;;
*) *)
PROGRAM_ARGS+=("$opt") ;; PROGRAM_ARGS+=("$opt") ;;
esac esac
...@@ -42,6 +42,11 @@ do ...@@ -42,6 +42,11 @@ do
GRAALVMCP="$GRAALVMCP$JAVA_HOME/$cp:" GRAALVMCP="$GRAALVMCP$JAVA_HOME/$cp:"
done done
# internal variable used to pass args to child R processes
if [ -z "$FASTR_INTERNAL_ARGS" ]; then
FASTR_INTERNAL_ARGS=()
fi
# we can invoke FastR directly, but we do have to set R_HOME # we can invoke FastR directly, but we do have to set R_HOME
export R_HOME="$JRE/languages/R" export R_HOME="$JRE/languages/R"
exec "$JAVA_HOME/bin/java" -cp "$GRAALVMCP" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx4g "${JAVA_ARGS[@]}" com.oracle.truffle.r.launcher.LegacyLauncher com.oracle.truffle.r.launcher.RscriptCommand "${PROGRAM_ARGS[@]}" exec "$JAVA_HOME/bin/java" -cp "$GRAALVMCP" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx4g "${JAVA_ARGS[@]}" com.oracle.truffle.r.launcher.LegacyLauncher com.oracle.truffle.r.launcher.RscriptCommand "${FASTR_INTERNAL_ARGS[@]}" "${PROGRAM_ARGS[@]}"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment