[GR-14768] Adopt macro options changes, integrate changes from 19.

PullRequest: truffleruby/850

Author: gilles-duboscq

mx.truffleruby/mx_truffleruby.py

@@ -118,14 +118,28 @@ def ruby_testdownstream_sulong(args):
     jt('test', 'cexts')
     jt('test', 'bundle')
 
+mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
+    suite=_suite,
+    name='TruffleRuby license files',
+    short_name='rbyl',
+    dir_name='ruby',
+    license_files=['LICENSE_TRUFFLERUBY.txt'],
+    third_party_license_files=['3rd_party_licenses_truffleruby.txt'],
+    truffle_jars=[],
+    support_distributions=[
+        'truffleruby:TRUFFLERUBY_GRAALVM_LICENSES',
+    ],
+    priority=5,
+))
+
 mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
     suite=_suite,
     name='TruffleRuby',
     short_name='rby',
     dir_name='ruby',
     standalone_dir_name='truffleruby-<version>-<graalvm_os>-<arch>',
-    license_files=['LICENSE_TRUFFLERUBY.md'],
-    third_party_license_files=['3rd_party_licenses_truffleruby.txt'],
+    license_files=[],
+    third_party_license_files=[],
     truffle_jars=[
         'truffleruby:TRUFFLERUBY',
         'truffleruby:TRUFFLERUBY-SHARED',
@@ -153,8 +167,8 @@ def ruby_testdownstream_sulong(args):
             main_class='org.truffleruby.launcher.RubyLauncher',
             build_args=[
                 '--language:llvm',
-                '--language:ruby',
             ],
+            language='ruby',
             links=['bin/<exe:ruby>'],
         )
     ],

mx.truffleruby/native-image.properties

@@ -1,12 +1,7 @@
 # This file contains native-image arguments needed to build truffleruby
 #
 
-ImageName = truffleruby
-
-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
+Requires = language:nfi
 
 Args = -H:MaxRuntimeCompileMethods=5400 \
        -H:SubstitutionResources=org/truffleruby/aot/substitutions.json \

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": "e7df682fc26830b5e5df74996c948a087c23b3be",
+                "version": "5dc4d8b4f772e90475a00c2093846cf11b2fd480",
                 "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": "e7df682fc26830b5e5df74996c948a087c23b3be",
+                "version": "5dc4d8b4f772e90475a00c2093846cf11b2fd480",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -379,8 +379,6 @@
                     "file:README.md",
                     "file:mx.truffleruby/native-image.properties",
                 ],
-                "LICENSE_TRUFFLERUBY.md": "file:LICENCE.md",
-                "3rd_party_licenses_truffleruby.txt": "file:3rd_party_licenses.txt",
                 "bin/": [
                     "file:bin/bundle",
                     "file:bin/bundler",
@@ -479,6 +477,16 @@
             ],
         },
 
+        "TRUFFLERUBY_GRAALVM_LICENSES": {
+            "native": True,
+            "platformDependent": True,
+            "description": "TruffleRuby support distribution for the GraalVM license files",
+            "layout": {
+                "LICENSE_TRUFFLERUBY.txt": "file:LICENCE.md",
+                "3rd_party_licenses_truffleruby.txt": "file:3rd_party_licenses.txt",
+            },
+        },
+
         "TRUFFLERUBY-TEST": {
             "dependencies": [
                 "org.truffleruby.test",

spec/truffle/identity_spec.rb

@@ -20,8 +20,8 @@
     RUBY_VERSION.should =~ /\A\d+\.\d+\.\d+\z/
   end
 
-  it 'RUBY_ENGINE_VERSION matches /\A\d+(\.\d+)*(-rc\d+)?(\-dev)?(-\h+)?\z/' do
-    RUBY_ENGINE_VERSION.should =~ /\A\d+(\.\d+)*(-rc\d+)?(\-dev)?(-\h+)?\z/
+  it 'RUBY_ENGINE_VERSION matches /\A\d+(\.\d+)*(-(rc|beta\.)\d+)?(\-dev)?(-\h+)?\z/' do
+    RUBY_ENGINE_VERSION.should =~ /\A\d+(\.\d+)*(-(rc|beta\.)\d+)?(\-dev)?(-\h+)?\z/
   end
 
   it "RUBY_ENGINE_VERSION can be parsed as a Gem::Version" do