Adopt native-image macro changes

Author: gilles-duboscq

mx.fastr/native-image.properties

@@ -1,12 +1,13 @@
 # This file contains native-image arguments needed to fastr
 #
 
-ImageName = RMain
+#ImageName = RMain
+#Requires = tool:chromeinspector \
+#           tool:profiler
+#LauncherClass = com.oracle.truffle.r.launcher.RMain
+#LauncherClassPath = lib/graalvm/launcher-common.jar:languages/R/fastr-launcher.jar
 
-Requires = tool:nfi \
-    tool:chromeinspector \
-    tool:nfi \
-    tool:profiler
+Requires = language:nfi
 
 JavaArgs = \
     -Dfastr.resource.factory.class=com.oracle.truffle.r.nodes.builtin.EagerResourceHandlerFactory \
@@ -17,11 +18,10 @@ JavaArgs = \
     -Dfastr.use.remote.grid.awt.device=true \
     -Xmx6G
 
-LauncherClass = com.oracle.truffle.r.launcher.RMain
-LauncherClassPath = lib/graalvm/launcher-common.jar:languages/R/fastr-launcher.jar
-
 Args = -H:MaxRuntimeCompileMethods=8000 \
     -H:-TruffleCheckFrameImplementation \
     -H:+TruffleCheckNeverPartOfCompilation \
     -H:EnableURLProtocols=http \
     -H:-UseServiceLoaderFeature
+
+ExcludeFromAll=true