[GR-13760] Explicitly depend on 'tool:nfi'

PullRequest: truffleruby/676

Author: eregon

CHANGELOG.md

@@ -15,6 +15,7 @@ Changes:
 * `-Xoption=value` has been removed - use `--option=value` instead.
 * The `-X` option now works as in MRI.
 * `--help:debug` is now `--help:internal`.
+* `--jvm.` and `--native.` have been deprecated, use `--vm.` instead to pass VM options.
 
 # 1.0 RC 13
 

doc/contributor/pre-initialization.md

@@ -41,5 +41,5 @@ runtime execution.
 Debugging on the JVM can be achieved with:
 
 ```
-bin/truffleruby --jvm.Dpolyglot.engine.PreinitializeContexts=ruby --log.level=FINE -e 'p :hi'
+jt ruby --jvm --vm.Dpolyglot.engine.PreinitializeContexts=ruby --log.level=FINE -e 'p :hi'
 ```

doc/contributor/workflow.md

@@ -120,10 +120,10 @@ $ jt ruby --native ...
 
 ## Options
 
-Specify JVM options with `--jvm.option`.
+Specify JVM options with `--vm.option`.
 
 ```bash
-$ jt ruby --jvm.Xmx1G test.rb
+$ jt ruby --vm.Xmx1G test.rb
 ```
 
 TruffleRuby options are set with `--name=value`. For example
@@ -143,8 +143,8 @@ See the document on [build graal](building-graal.md), and then run `jt ruby`
 with the `--graal` option.
 
 We have flags in `jt` to set some options, such as `--trace` for
-`--jvm.Dgraal.TraceTruffleCompilation=true` and `--igv` for
-`--jvm.Dgraal.Dump=Truffle`.
+`--vm.Dgraal.TraceTruffleCompilation=true` and `--igv` for
+`--vm.Dgraal.Dump=Truffle`.
 
 ## Testing with Graal
 

doc/samples/can-we-fold-yet.rb

@@ -1,12 +1,12 @@
 # Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
-# 
+#
 # Eclipse Public License version 1.0, or
 # GNU General Public License version 2, or
 # GNU Lesser General Public License version 2.1.
 
-# Use --jvm.Dgraal.TruffleIterativePartialEscape=true
+# Use --vm.Dgraal.TruffleIterativePartialEscape=true
 
 require 'readline'
 

doc/user/faq.md

@@ -115,12 +115,12 @@ end
 ```
 
 As well as the instructions for running with GraalVM that are described in
-[Using GraalVM](using-graalvm.md), we'll also use the `--jvm.Dgraal.TraceTruffleCompilation=true`
+[Using GraalVM](using-graalvm.md), we'll also use the `--vm.Dgraal.TraceTruffleCompilation=true`
 to ask Truffle to tell us when it compiles something.
 
 ```
-$ ruby --jvm.Dgraal.TraceTruffleCompilation=true test.rb
-[truffle] opt done         block in <main> test.rb:1 <opt> <split-3a9ffa1b>         |ASTSize       8/    8 |Time   103(  99+4   )ms |DirectCallNodes I    0/D    0 |GraalNodes    24/    3 |CodeSize           69 |CodeAddress 0x11245cf50 |Source   ../test.rb:1 
+$ ruby --vm.Dgraal.TraceTruffleCompilation=true test.rb
+[truffle] opt done         block in <main> test.rb:1 <opt> <split-3a9ffa1b>         |ASTSize       8/    8 |Time   103(  99+4   )ms |DirectCallNodes I    0/D    0 |GraalNodes    24/    3 |CodeSize           69 |CodeAddress 0x11245cf50 |Source   ../test.rb:1
 ```
 
 Here you can see that Truffle has decided to use Graal to compile the block of

doc/user/optcarrot.md

@@ -11,13 +11,13 @@ You will need `SDL2` to be installed, then you can play Lan Master  with the
 following command.
 
 ```
-$ path/to/graalvm/bin/ruby bin/optcarrot --sdl2 --audio=none examples/Lan_Master.nes
+$ path/to/graalvm/bin/ruby --jvm bin/optcarrot --sdl2 --audio=none examples/Lan_Master.nes
 ```
 
 On macOS, you might need an extra flag for the GUI to appear:
 
 ```
-$ path/to/graalvm/bin/ruby --jvm.XstartOnFirstThread bin/optcarrot --sdl2 --audio=none examples/Lan_Master.nes
+$ path/to/graalvm/bin/ruby --jvm --vm.XstartOnFirstThread bin/optcarrot --sdl2 --audio=none examples/Lan_Master.nes
 ```
 
 If you have a local checkout of TruffleRuby, you can also use the version of

doc/user/options.md

@@ -69,7 +69,7 @@ Additionally set `--help:expert` and `--help:internal` to see those categories o
 options. All options all experimental and subject to change at any time.
 
 Options can also be set as JVM system properties, where they have a prefix
-`polyglot.ruby.`. For example `--jvm.Dpolyglot.ruby.cexts.remap=true`, or via
+`polyglot.ruby.`. For example `--vm.Dpolyglot.ruby.cexts.remap=true`, or via
 any other way of setting JVM system properties. Finally, options can be set as
 Graal-SDK polyglot API configuration options.
 
@@ -85,13 +85,13 @@ options in the same way it stops processing of Ruby arguments.
 
 ## VM options
 
-To set options in the underlying VM, use `--native.` in the native
-configuration, and `--jvm.` in the JVM configuration.
+To set options in the underlying VM, use `--vm.`, valid for both the native
+configuration and the JVM configuration.
 
-For example `--native.Dsystem_property=value` or `--jvm.ea`.
+For example `--vm.Dsystem_property=value` or `--vm.ea`.
 
 To set the classpath, use the `=` notation, rather than two separate arguments.
-For example `--jvm.cp=lib.jar` or `--jvm.classpath=lib.jar`.
+For example `--vm.cp=lib.jar` or `--vm.classpath=lib.jar`.
 
 ## Other binary switches
 

doc/user/reporting-performance-problems.md

@@ -34,12 +34,12 @@ tool, like `benchmark-ips` described below, to run the benchmark, or the slower
 warmup time will mean that you don't see TruffleRuby's true performance in the
 benchmark. If you want to write simpler benchmarks that just run a while loop
 with a simple timer (which we would not recommend anyway), then use the default
-native mode so that startup and warmup time is shorter. 
+native mode so that startup and warmup time is shorter.
 
 ## How to check for basic performance problems
 
 If you are examining the performance of TruffleRuby, we would recommend that you
-always run with the `--jvm.Dgraal.TraceTruffleCompilation=true` flag. If you see
+always run with the `--vm.Dgraal.TraceTruffleCompilation=true` flag. If you see
 compilation failures or repeated compilation of the same methods, this is an
 indicator that something is not working as intended and you may need to examine
 why, or ask us to help you do so. If you don't run with this flag Truffle will
@@ -58,13 +58,13 @@ A benchmark could look like this:
 require 'benchmark/ips'
 
 Benchmark.ips do |x|
-  
+
   x.iterations = 3
-  
+
   x.report("adding") do
     14 + 2
   end
-  
+
 end
 ```
 

mx.truffleruby/mx_truffleruby_benchmark.py

@@ -587,7 +587,7 @@ def name(self):
     def runBenchmark(self, benchmark, bmSuiteArgs):
         arguments = ['ruby']
         if 'MX_NO_GRAAL' not in os.environ and not bmSuiteArgs:
-            arguments.extend(['--graal', '--jvm.Dgraal.TruffleCompilationExceptionsAreFatal=true'])
+            arguments.extend(['--graal', '--vm.Dgraal.TruffleCompilationExceptionsAreFatal=true'])
         arguments.extend(['bench/servers/' + benchmark + '.rb'])
 
         server = BackgroundJT(arguments + bmSuiteArgs)

mx.truffleruby/native-image.properties

@@ -3,7 +3,7 @@
 
 ImageName = truffleruby
 
-Requires = tool:truffle
+Requires = tool:truffle tool:nfi
 
 LauncherClass = org.truffleruby.launcher.RubyLauncher
 LauncherClassPath = languages/ruby/truffleruby-annotations.jar:languages/ruby/truffleruby-shared.jar:lib/graalvm/launcher-common.jar:lib/graalvm/truffleruby-launcher.jar