Give its own home for the bootstrap truffleruby launcher

* Much cleaner than passing a bunch of properties and using the repository as a home.

Author: eregon

lib/cext/ABI_check.txt

@@ -1 +1 @@
-15
+16

lib/truffle/rbconfig.rb

@@ -135,10 +135,11 @@ module RbConfig
 
   # Set extra flags needed for --building-core-cexts
   if Truffle::Boot.get_option 'building-core-cexts'
-    libtruffleruby = "#{ruby_home}/src/main/c/cext/libtruffleruby.#{soext}"
-    libtrufflerubytrampoline = "#{ruby_home}/src/main/c/cext-trampoline/libtrufflerubytrampoline.#{soext}"
+    repo = Truffle::System.get_java_property 'truffleruby.repository'
+    libtruffleruby = "#{repo}/src/main/c/cext/libtruffleruby.#{soext}"
+    libtrufflerubytrampoline = "#{repo}/src/main/c/cext-trampoline/libtrufflerubytrampoline.#{soext}"
 
-    relative_debug_paths = " -fdebug-prefix-map=#{ruby_home}=."
+    relative_debug_paths = " -fdebug-prefix-map=#{repo}=."
     cppflags << relative_debug_paths
 
     warnflags << '-Wundef' # Warn for undefined preprocessor macros for core C extensions

mx.truffleruby/mx_truffleruby.py

@@ -11,6 +11,7 @@
 import os
 import pipes
 from os.path import join, exists, basename
+import re
 import shutil
 import sys
 
@@ -48,6 +49,27 @@ def add_ext_suffix(name):
 
 mx_subst.results_substitutions.register_with_arg('extsuffix', add_ext_suffix)
 
+# From org.truffleruby.shared.Platform
+def get_cruby_arch():
+    arch = mx.get_arch()
+    if arch == 'amd64':
+        return 'x86_64'
+    elif arch == 'aarch64':
+        return 'aarch64'
+    else:
+        raise Exception("Unknown platform " + arch)
+
+mx_subst.results_substitutions.register_no_arg('cruby_arch', get_cruby_arch)
+
+def get_truffleruby_abi_version():
+    path = join(root, 'lib/cext/include/truffleruby/truffleruby-abi-version.h')
+    with open(path, "r") as f:
+        contents = f.read()
+    m = re.search('"(.+)"', contents)
+    return m.group(1)
+
+mx_subst.results_substitutions.register_no_arg('truffleruby_abi_version', get_truffleruby_abi_version)
+
 # Utilities
 
 class VerboseMx:
@@ -118,10 +140,10 @@ def contents(self, result):
         if debug_args:
             jvm_args.extend(['-ea', '-esa'])
 
-        jvm_args.append('-Dorg.graalvm.language.ruby.home=' + root)
+        bootstrap_home = mx.distribution('TRUFFLERUBY_BOOTSTRAP_HOME').get_output()
+        jvm_args.append('-Dorg.graalvm.language.ruby.home=' + bootstrap_home)
 
-        libyarpbindings = list(mx.project('org.truffleruby.yarp.bindings').getArchivableResults())[0][0]
-        jvm_args.append('-Dtruffleruby.libyarpbindings=' + libyarpbindings)
+        jvm_args.append('-Dtruffleruby.repository=' + root)
 
         main_class = 'org.truffleruby.launcher.RubyLauncher'
         ruby_options = [

mx.truffleruby/suite.py

@@ -368,7 +368,7 @@
                 "TRUFFLERUBY", # We need this jar to run extconf.rb
                 "TRUFFLERUBY-LAUNCHER", # We need this jar to run extconf.rb
                 "sulong:SULONG_NATIVE", # We need this jar to find the toolchain with Toolchain#getToolPath
-                "org.truffleruby.yarp.bindings", # libyarpbindings.so
+                "TRUFFLERUBY_BOOTSTRAP_HOME", # libyarpbindings.so, librubysignal.so
             ],
             "license": ["EPL-2.0"],
         },
@@ -667,6 +667,30 @@
             "maven": False,
         },
 
+        "TRUFFLERUBY_BOOTSTRAP_HOME": {
+            "description": "TruffleRuby bootstrap home used by a minimal TruffleRuby to run extconf.rb of default & bundled gems C extensions",
+            "native": True,
+            "platformDependent": True,
+            "layout": {
+                "lib/": [
+                    "file:lib/json",
+                    "file:lib/mri",
+                    "file:lib/patches",
+                    "file:lib/truffle",
+                    "dependency:org.truffleruby.yarp.bindings",
+                ],
+                "lib/cext/": [
+                    "file:lib/cext/*.rb",
+                    # libtruffleposix is handled specially in posix.rb to avoid a cyclic dependency between org.truffleruby.cext and TRUFFLERUBY-BOOTSTRAP-LAUNCHER
+                    "dependency:org.truffleruby.librubysignal",
+                ],
+                "lib/cext/include/": [
+                    "file:lib/cext/include/*",
+                ],
+            },
+            "maven": False,
+        },
+
         "TRUFFLERUBY_GRAALVM_SUPPORT_PLATFORM_AGNOSTIC": {
             "description": "Platform-agnostic TruffleRuby home files",
             "fileListPurpose": 'native-image-resources',
@@ -732,8 +756,10 @@
                     "dependency:org.truffleruby.cext/src/main/c/cext-trampoline/<lib:trufflerubytrampoline>",
                     "dependency:org.truffleruby.librubysignal",
                 ],
+                # Create the complete files to let RubyGems know the gems are fully built
+                "lib/gems/extensions/<cruby_arch>-<os>/<truffleruby_abi_version>/debug-1.7.1/gem.build_complete": "string:",
+                "lib/gems/extensions/<cruby_arch>-<os>/<truffleruby_abi_version>/rbs-2.8.2/gem.build_complete": "string:",
                 # The platform-specific files from debug and rbs, see comment above
-                "lib/gems/": "file:lib/gems/extensions",
                 "lib/gems/gems/debug-1.7.1/lib/debug/": "dependency:org.truffleruby.cext/lib/gems/gems/debug-1.7.1/lib/debug/<extsuffix:debug>",
                 "lib/gems/gems/rbs-2.8.2/lib/": "dependency:org.truffleruby.cext/lib/gems/gems/rbs-2.8.2/lib/<extsuffix:rbs_extension>",
                 "lib/mri/": [
@@ -764,9 +790,9 @@
         },
 
         "TRUFFLERUBY_GRAALVM_SUPPORT_NO_NI_RESOURCES": {
+            "description": "TruffleRuby support distribution for the GraalVM, the contents is not included as native image resources.",
             "native": True,
             "platformDependent": True,
-            "description": "TruffleRuby support distribution for the GraalVM, the contents is not included as native image resources.",
             "layout": {
                 "./": [
                     "file:CHANGELOG.md",

src/main/c/Makefile

@@ -186,7 +186,6 @@ $(DEBUG_GEM_EXT_SO): $(DEBUG_GEM_EXT)/Makefile $(DEBUG_GEM_EXT)/*.c
 
 $(DEBUG_GEM_LIB_SO): $(DEBUG_GEM_EXT_SO)
 	$(Q) cp $< $@
-	$(Q) $(RUBY) $(ROOT)/tool/mark-gem-extension-as-built.rb debug
 
 # rbs bundled gem
 $(RBS_GEM_EXT)/Makefile: $(RBS_GEM_EXT)/extconf.rb $(EXTCONF_DEPS)
@@ -197,4 +196,3 @@ $(RBS_GEM_EXT_SO): $(RBS_GEM_EXT)/Makefile $(RBS_GEM_EXT)/*.c $(RBS_GEM_EXT)/*.h
 
 $(RBS_GEM_LIB_SO): $(RBS_GEM_EXT_SO)
 	$(Q) cp $< $@
-	$(Q) $(RUBY) $(ROOT)/tool/mark-gem-extension-as-built.rb rbs

src/main/java/org/truffleruby/RubyLanguage.java

@@ -816,17 +816,12 @@ private TruffleFile searchRubyHome(Env env) {
     private boolean isRubyHome(TruffleFile path) {
         var lib = path.resolve("lib");
         return lib.resolve("truffle").isDirectory() &&
-                lib.resolve("gems").isDirectory() &&
+                (options.BUILDING_CORE_CEXTS || lib.resolve("gems").isDirectory()) &&
                 lib.resolve("patches").isDirectory();
     }
 
     private void loadLibYARPBindings() {
-        String libyarpbindings;
-        if (options.BUILDING_CORE_CEXTS) {
-            libyarpbindings = System.getProperty("truffleruby.libyarpbindings");
-        } else {
-            libyarpbindings = getRubyHome() + "/lib/libyarpbindings" + Platform.LIB_SUFFIX;
-        }
+        String libyarpbindings = getRubyHome() + "/lib/libyarpbindings" + Platform.LIB_SUFFIX;
         Parser.loadLibrary(libyarpbindings);
     }
 

src/main/java/org/truffleruby/core/thread/ThreadManager.java

@@ -99,7 +99,7 @@ public ThreadManager(RubyContext context, RubyLanguage language) {
     }
 
     public void initialize() {
-        useLibRubySignal = context.getOptions().NATIVE_PLATFORM && !language.options.BUILDING_CORE_CEXTS;
+        useLibRubySignal = context.getOptions().NATIVE_PLATFORM;
         nativeInterrupt = context.getOptions().NATIVE_INTERRUPT && useLibRubySignal;
         if (useLibRubySignal) {
             LibRubySignal.loadLibrary(language.getRubyHome(), Platform.LIB_SUFFIX);

src/main/ruby/truffleruby/core/posix.rb

@@ -41,7 +41,8 @@ def resolve
   LIBTRUFFLEPOSIX = LazyLibrary.new do
     home = Truffle::Boot.ruby_home
     if Truffle::Boot.get_option 'building-core-cexts'
-      libtruffleposix = "#{home}/src/main/c/truffleposix/libtruffleposix.#{Truffle::Platform::SOEXT}"
+      repo = Truffle::System.get_java_property 'truffleruby.repository'
+      libtruffleposix = "#{repo}/src/main/c/truffleposix/libtruffleposix.#{Truffle::Platform::SOEXT}"
     else
       libtruffleposix = "#{home}/lib/cext/libtruffleposix.#{Truffle::Platform::SOEXT}"
     end

src/options.yml

@@ -167,7 +167,7 @@ INTERNAL: # Options for debugging the TruffleRuby implementation
     # Used internally for the launcher to communicate with the RubyContext
     ARGV_GLOBAL_VALUES: [argv-global-values, string-array, '<key>,<value>,...', Parsed options from script argv with a value]
     ARGV_GLOBAL_FLAGS: [argv-global-flags, string-array, '<flag>,<flag>,...', Parsed options from script argv acting as flags (no value)]
-    BUILDING_CORE_CEXTS: [building-core-cexts, boolean, false, 'Used while building TruffleRuby to build core C extensions']
+    BUILDING_CORE_CEXTS: [building-core-cexts, boolean, false, 'Used while building TruffleRuby to build default & bundled gems C extensions']
 
     # Low-level logging of implementation details
     LAZY_TRANSLATION_LOG: [lazy-translation-log, boolean, false, Log lazy translations from the parser AST to the Truffle AST]

src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java

@@ -759,7 +759,7 @@ public final class OptionsCatalog {
 
     public static final OptionDescriptor BUILDING_CORE_CEXTS = OptionDescriptor
             .newBuilder(BUILDING_CORE_CEXTS_KEY, "ruby.building-core-cexts")
-            .help("Used while building TruffleRuby to build core C extensions")
+            .help("Used while building TruffleRuby to build default & bundled gems C extensions")
             .category(OptionCategory.INTERNAL)
             .stability(OptionStability.EXPERIMENTAL)
             .usageSyntax("")