In GraalVM, move the legacy launcher to a subdir.

com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/LegacyLauncher.java → com.oracle.truffle.r.legacylauncher/src/com/oracle/truffle/r/legacylauncher/LegacyLauncher.java

@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.truffle.r.launcher;
+package com.oracle.truffle.r.legacylauncher;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;

com.oracle.truffle.r.release/src/R_legacy

@@ -36,7 +36,7 @@ done
 JAVA_HOME="$( dirname "$JRE" )"
 
 GRAALVMCP=""
-TMPCP="jre/languages/R/fastr.jar"
+TMPCP="jre/languages/R/legacy/fastr-legacy-launcher.jar"
 for cp in ${TMPCP//:/ }
 do
     GRAALVMCP="$GRAALVMCP$JAVA_HOME/$cp:"
@@ -49,4 +49,4 @@ fi
 
 # we can invoke FastR directly, but we do have to set R_HOME
 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 "${FASTR_INTERNAL_ARGS[@]}" "${PROGRAM_ARGS[@]}"
+exec "$JAVA_HOME/bin/java" -cp "$GRAALVMCP" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx8g "${JAVA_ARGS[@]}" com.oracle.truffle.r.legacylauncher.LegacyLauncher com.oracle.truffle.r.launcher.RCommand "${FASTR_INTERNAL_ARGS[@]}" "${PROGRAM_ARGS[@]}"

com.oracle.truffle.r.release/src/Rscript_legacy

@@ -36,7 +36,7 @@ done
 JAVA_HOME="$( dirname "$JRE" )"
 
 GRAALVMCP=""
-TMPCP="jre/languages/R/fastr.jar"
+TMPCP="jre/languages/R/legacy/fastr-legacy-launcher.jar"
 for cp in ${TMPCP//:/ }
 do
     GRAALVMCP="$GRAALVMCP$JAVA_HOME/$cp:"
@@ -49,4 +49,4 @@ fi
 
 # we can invoke FastR directly, but we do have to set R_HOME
 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 "${FASTR_INTERNAL_ARGS[@]}" "${PROGRAM_ARGS[@]}"
+exec "$JAVA_HOME/bin/java" -cp "$GRAALVMCP" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx4g "${JAVA_ARGS[@]}" com.oracle.truffle.r.legacylauncher.LegacyLauncher com.oracle.truffle.r.launcher.RscriptCommand "${FASTR_INTERNAL_ARGS[@]}" "${PROGRAM_ARGS[@]}"

mx.fastr/mx_fastr_dists.py

@@ -204,6 +204,9 @@ def mx_post_parse_cmd_line(opts):
     if not mx.distribution('FASTR_RELEASE{}'.format(val), fatalIfMissing=False):
         mx.instantiateDistribution('FASTR_RELEASE<rffi>', dict(rffi=val))
 
+    if not val and os.environ.has_key('FASTR_RELEASE') and not mx.distribution('fastr:FASTR_GRAALVM_SUPPORT', fatalIfMissing=False):
+        mx.instantiateDistribution('fastr:FASTR_GRAALVM_SUPPORT<rffi>', dict(rffi=''))
+
     for dist in mx_fastr._fastr_suite.dists:
         if isinstance(dist, mx.JARDistribution):
             dist.set_archiveparticipant(FastRArchiveParticipant(dist))

mx.fastr/suite.py

@@ -241,6 +241,19 @@ suite = {
       "jacoco" : "include",
     },
 
+    "com.oracle.truffle.r.legacylauncher" : {
+      "sourceDirs" : ["src"],
+      "dependencies" : [
+        "sdk:GRAAL_SDK",
+      ],
+      "checkstyle" : "com.oracle.truffle.r.runtime",
+      "javaCompliance" : "1.8",
+      "annotationProcessors" : [
+      ],
+      "workingSets" : "Truffle,FastR",
+      "jacoco" : "include",
+    },
+
     "com.oracle.truffle.r.ffi.impl" : {
       "sourceDirs" : ["src"],
       "dependencies" : [
@@ -352,6 +365,14 @@ suite = {
       "maven" : "False",
     },
 
+    "FASTR_LEGACY_LAUNCHER" : {
+      "description" : "legacy launcher for the GraalVM",
+      "dependencies" : ["com.oracle.truffle.r.legacylauncher"],
+      "distDependencies" : [
+        "sdk:GRAAL_SDK"
+      ],
+    },
+
     "FASTR" : {
       "description" : "class files for compiling against FastR in a separate suite",
       "dependencies" : [
@@ -478,6 +499,7 @@ suite = {
         "README_FASTR" : "extracted-dependency:fastr:FASTR_RELEASE<rffi>/README.md",
         "bin/Rscript" : "file:com.oracle.truffle.r.release/src/Rscript_legacy",
         "bin/exec/R" : "file:com.oracle.truffle.r.release/src/R_legacy",
+        "legacy/" : "dependency:fastr:FASTR_LEGACY_LAUNCHER",
       },
     }
   },