[GR-13445] Adopt the new property for pre-initialization.

PullRequest: truffleruby/906

Author: eregon

doc/contributor/pre-initialization.md

@@ -6,7 +6,7 @@ Generator.
 Context pre-initialization is enabled by setting this Java property:
 
 ```
--Dpolyglot.engine.PreinitializeContexts=ruby
+-Dpolyglot.image-build-time.PreinitializeContexts=ruby
 ```
 
 This is enabled by default in `mx.truffleruby/native-image.properties`.
@@ -42,5 +42,5 @@ runtime execution.
 Debugging on the JVM can be achieved with:
 
 ```
-jt ruby --jvm --vm.Dpolyglot.engine.PreinitializeContexts=ruby --log.level=FINE -e 'p :hi'
+jt ruby --jvm --vm.Dpolyglot.image-build-time.PreinitializeContexts=ruby --log.level=FINE -e 'p :hi'
 ```

mx.truffleruby/native-image.properties

@@ -8,5 +8,5 @@ Args = -H:MaxRuntimeCompileMethods=5400 \
        -H:+AddAllCharsets \
        --initialize-at-build-time=org.truffleruby,org.jcodings,org.joni,jline,org.fusesource
 
-JavaArgs = -Dpolyglot.engine.PreinitializeContexts=ruby \
+JavaArgs = -Dpolyglot.image-build-time.PreinitializeContexts=ruby \
            -Dorg.graalvm.launcher.relative.llvm.home=../lib/cext/sulong-libs

mx.truffleruby/suite.py

@@ -9,7 +9,7 @@
                 "name": "tools",
                 "subdir": True,
                 # version must always be equal to the version of the "sulong" import below
-                "version": "0527e987ef67a1a93d14754becd2b3877d961b35",
+                "version": "ce416312365c2756c02afe034173eee431003175",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -19,7 +19,7 @@
                 "name": "sulong",
                 "subdir": True,
                 # version must always be equal to the version of the "tools" import above
-                "version": "0527e987ef67a1a93d14754becd2b3877d961b35",
+                "version": "ce416312365c2756c02afe034173eee431003175",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

src/main/java/org/truffleruby/RubyContext.java

@@ -752,7 +752,7 @@ private String searchRubyHome(Options options) throws IOException {
             final File launcherDir = canonicalLauncherPath.getParentFile();
             final File candidate = launcherDir == null ? null : launcherDir.getParentFile();
             RubyLanguage.LOGGER.config(() -> String.format("trying home %s guessed from executable %s, as the Ruby home", candidate, options.LAUNCHER));
-            if (isRubyHome(candidate)) {
+            if (candidate != null && isRubyHome(candidate)) {
                 return candidate.getCanonicalPath();
             } else {
                 RubyLanguage.LOGGER.warning(String.format("home %s guessed from executable %s does not look like TruffleRuby's home", candidate, options.LAUNCHER));

src/shared/java/org/truffleruby/shared/TruffleRuby.java

@@ -22,7 +22,7 @@ public class TruffleRuby {
     public static final int LANGUAGE_REVISION = BuildInformationImpl.INSTANCE.getRubyRevision();
     public static final String BOOT_SOURCE_NAME = "main_boot_source";
     public static final String RUBY_COPYRIGHT = "truffleruby - Copyright (c) 2013-2019 Oracle and/or its affiliates";
-    public static final boolean PRE_INITIALIZE_CONTEXTS = System.getProperty("polyglot.engine.PreinitializeContexts") != null;
+    public static final boolean PRE_INITIALIZE_CONTEXTS = System.getProperty("polyglot.image-build-time.PreinitializeContexts") != null;
 
     public static String getVersionString(String implementationName, boolean isAOT) {
         final String vm;