[GR-15032] [GR-15033] Broken install.packages when native image is installed.

PullRequest: fastr/1995

Author: steve-s

com.oracle.truffle.r.native/run/install_r_native_image

@@ -63,7 +63,7 @@ if [[ $uninstall -eq 1 ]]; then
 fi
 
 if [[ $silent -eq 0 ]]; then
-    echo "This script is going to build a native image of the R runtime and update the R launchers to use that image as the default, i.e., when '--jvm' option is not used."
+    echo "This script is going to build a native image of the R runtime and update the R launchers to use that image as the default, i.e., when '--jvm' option is not used. You can uninstall the native image by running this script with the 'uninstall' argument. Run this script with '--help' for more details."
     echo "The build takes several minutes and needs a minimum of 6GB of RAM and 150MB of free disk space. The computer may lag during the build."
     read -p "Are you sure you want to build and install the native image of the R runtime? (Yy/Nn) " -n 1 -r
     echo
@@ -78,6 +78,6 @@ cd "$fastr_home/bin"
 cp "exec/R" "exec_R.backup"
 cp "Rscript" "Rscript.backup"
 sed -e '/^## REMOVE FOR NATIVE IMAGE: BEGIN/,/^## REMOVE FOR NATIVE IMAGE: END/d;' "exec_R.backup" | \
-    sed -e 's|^exec "$JAVA_HOME/bin/java" .*|exec "$R_HOME/bin/RMain" R "${FASTR_INTERNAL_ARGS[@]}" "$@"|' > "exec/R"
+    sed -e 's|^exec "$JAVA_HOME/bin/java" .*|exec "$R_HOME/bin/RMain" R ${FASTR_INTERNAL_ARGS[@]} "$@"|' > "exec/R"
 sed -e '/^## REMOVE FOR NATIVE IMAGE: BEGIN/,/^## REMOVE FOR NATIVE IMAGE: END/d;' "Rscript.backup" | \
-    sed -e 's|^exec "$JAVA_HOME/bin/java" .*|exec "$R_HOME/bin/RMain" Rscript "${FASTR_INTERNAL_ARGS[@]}" "$@"|' > "Rscript"
+    sed -e 's|^exec "$JAVA_HOME/bin/java" .*|exec "$R_HOME/bin/RMain" Rscript ${FASTR_INTERNAL_ARGS[@]} "$@"|' > "Rscript"

mx.fastr/mx_fastr_dists.py

@@ -310,7 +310,7 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
 "   ${graalvm_home}/jre/languages/R/bin/install_r_native_image\n\n" +
 "The native image is then used by default. Pass '--jvm' flag to the R or Rscript launcher to " +
 "use JVM instead of the native image. Note that the native image is not stable yet and is intended for evaluation " +
-"purposes and experiments. Some features may not work when the native image is installed, most notably the --polyglot switch. " +
+"purposes and experiments. Some features may not work in the native image mode, most notably some Rcpp based packages. " +
 "The native image can be uninstalled using the installation script with 'uninstall' argument.\n\n" +
 "See http://www.graalvm.org/docs/reference-manual/languages/r for more."
 ))