Remove RbConfig::CONFIG['extra_bindirs'] and Gem::ExtraExecutablesInstaller

eregon · eregon · commit 53a6066b6702 · 2023-08-08T15:32:44.000+02:00
* Fixes #3160
diff --git a/lib/cext/ABI_check.txt b/lib/cext/ABI_check.txt
@@ -1 +1 @@
-6
+7
diff --git a/lib/patches/rubygems.rb b/lib/patches/rubygems.rb
@@ -7,13 +7,6 @@
 
 require Primitive.get_original_require(__FILE__)
 
-# Add TruffleRuby rubygems hooks to install and uninstall executables from additional
-# GraalVM bin directories (./bin, ./jre/bin on JDK8)
-unless RbConfig::CONFIG['extra_bindirs'].empty?
-  require 'rubygems/extra_executables_installer'
-  Gem::ExtraExecutablesInstaller.install_hooks_for RbConfig::CONFIG['extra_bindirs'].split(File::PATH_SEPARATOR)
-end
-
 # Make sure we don't use foreign gem directories
 unless Truffle::Boot.get_option 'testing-rubygems'
   require 'rubygems/gem_dirs_verification'
diff --git a/lib/truffle/rbconfig.rb b/lib/truffle/rbconfig.rb
@@ -59,8 +59,6 @@ module RbConfig
   rmdir = Truffle::Platform.linux? ? 'rmdir --ignore-fail-on-non-empty' : 'rmdir'
 
   prefix = ruby_home
-  graalvm_home = TruffleRuby.graalvm_home
-  extra_bindirs = graalvm_home ? ["#{graalvm_home}/bin"] : []
   rubyhdrdir = "#{prefix}/lib/cext/include"
 
   ar = Truffle::Boot.toolchain_executable(:AR)
@@ -149,7 +147,6 @@ module RbConfig
     'exeext'            => '',
     'EXEEXT'            => '',
     'EXTOUT'            => '.ext',
-    'extra_bindirs'     => extra_bindirs.join(File::PATH_SEPARATOR),
     'host_alias'        => '',
     'host_cpu'          => host_cpu,
     'host'              => host,
diff --git a/lib/truffle/rubygems/extra_executables_installer.rb b/lib/truffle/rubygems/extra_executables_installer.rb
diff --git a/spec/tags/truffle/launcher_tags.txt b/spec/tags/truffle/launcher_tags.txt
@@ -35,15 +35,6 @@ slow:The launcher runs irb as an -S command
 slow:The launcher runs rake as an -S command
 slow:The launcher runs rdoc as an -S command
 slow:The launcher runs ri as an -S command
-slow:The launcher supports running bundle in any of the bin/ directories
-slow:The launcher supports running bundler in any of the bin/ directories
-slow:The launcher supports running gem in any of the bin/ directories
-slow:The launcher supports running irb in any of the bin/ directories
-slow:The launcher supports running rake in any of the bin/ directories
-slow:The launcher supports running rdoc in any of the bin/ directories
-slow:The launcher supports running ri in any of the bin/ directories
-slow:The launcher supports running ruby in any of the bin/ directories
-slow:The launcher supports running truffleruby in any of the bin/ directories
 slow:The launcher for gem can install and uninstall the hello-world gem
 slow:The launcher for gem shows that bundled gems are installed
 slow:The launcher '--vm.cp=' or '--vm.classpath=' add the jar
@@ -68,19 +59,26 @@ slow:The launcher runs erb as an -S command
 slow:The launcher runs racc as an -S command
 slow:The launcher runs racc2y as an -S command
 slow:The launcher runs y2racc as an -S command
-slow:The launcher supports running erb in any of the bin/ directories
-slow:The launcher supports running racc in any of the bin/ directories
-slow:The launcher supports running racc2y in any of the bin/ directories
-slow:The launcher supports running y2racc in any of the bin/ directories
 slow:The launcher supports running erb symlinked
 slow:The launcher supports running racc symlinked
 slow:The launcher supports running racc2y symlinked
 slow:The launcher supports running y2racc symlinked
 slow:The launcher warns if the locale is not set properly
 slow:The launcher runs rbs as an -S command
-slow:The launcher supports running rbs in any of the bin/ directories
 slow:The launcher supports running rbs symlinked
 slow:The launcher prints help:ruby containing ruby language options
 slow:The launcher runs rdbg as an -S command
-slow:The launcher supports running rdbg in any of the bin/ directories
 slow:The launcher supports running rdbg symlinked
+slow:The launcher supports running bundle in bin/
+slow:The launcher supports running bundler in bin/
+slow:The launcher supports running erb in bin/
+slow:The launcher supports running gem in bin/
+slow:The launcher supports running irb in bin/
+slow:The launcher supports running racc in bin/
+slow:The launcher supports running rake in bin/
+slow:The launcher supports running rbs in bin/
+slow:The launcher supports running rdbg in bin/
+slow:The launcher supports running rdoc in bin/
+slow:The launcher supports running ri in bin/
+slow:The launcher supports running ruby in bin/
+slow:The launcher supports running truffleruby in bin/
diff --git a/spec/truffle/launcher_spec.rb b/spec/truffle/launcher_spec.rb
@@ -34,9 +34,7 @@
   }
 
   before :all do
-    @default_bindir = RbConfig::CONFIG['bindir']
-    @bin_dirs = [RbConfig::CONFIG['bindir']]
-    @bin_dirs += RbConfig::CONFIG['extra_bindirs'].to_s.split(File::PATH_SEPARATOR) if defined?(::TruffleRuby)
+    @bindir = RbConfig::CONFIG['bindir']
   end
 
   before :each do
@@ -76,7 +74,7 @@ def check_status_or_print(stdout_and_stderr)
   end
 
   it "is in the bindir" do
-    File.dirname(RbConfig.ruby).should == @default_bindir
+    File.dirname(RbConfig.ruby).should == @bindir
   end
 
   it "all launchers are in @launchers" do
@@ -98,30 +96,26 @@ def check_status_or_print(stdout_and_stderr)
   end
 
   @launchers.each do |launcher, test|
-    it "supports running #{launcher} in any of the bin/ directories" do
+    it "supports running #{launcher} in bin/" do
       redirect = launcher == :erb ? (touch @stderr; '2>&1') : @redirect
-      @bin_dirs.each do |bin_dir|
-        out = `#{bin_dir}/#{launcher} --version #{redirect}`
-        check_status_and_empty_stderr
-        out.should =~ test
-      end
+      out = `#{@bindir}/#{launcher} --version #{redirect}`
+      check_status_and_empty_stderr
+      out.should =~ test
     end
   end
 
   @launchers.each do |launcher, test|
     it "supports running #{launcher} symlinked" do
       redirect = launcher == :erb ? (touch @stderr; '2>&1') : @redirect
       require 'tmpdir'
-      @bin_dirs.each do |bin_dir|
-        # Use the system tmp dir to not be under the Ruby home dir
-        Dir.mktmpdir do |path|
-          Dir.chdir(path) do
-            linkname = "linkto#{launcher}"
-            File.symlink("#{bin_dir}/#{launcher}", linkname)
-            out = `./#{linkname} --version #{redirect}`
-            check_status_and_empty_stderr
-            out.should =~ test
-          end
+      # Use the system tmp dir to not be under the Ruby home dir
+      Dir.mktmpdir do |path|
+        Dir.chdir(path) do
+          linkname = "linkto#{launcher}"
+          File.symlink("#{@bindir}/#{launcher}", linkname)
+          out = `./#{linkname} --version #{redirect}`
+          check_status_and_empty_stderr
+          out.should =~ test
         end
       end
     end
@@ -130,35 +124,31 @@ def check_status_or_print(stdout_and_stderr)
   it "for gem can install and uninstall the hello-world gem" do
     # install
     Dir.chdir(__dir__ + '/fixtures/hello-world') do
-      `"#{@default_bindir}/gem" build hello-world.gemspec #{@redirect}`
+      `"#{@bindir}/gem" build hello-world.gemspec #{@redirect}`
       check_status_and_empty_stderr
-      `"#{@default_bindir}/gem" install --local hello-world-0.0.1.gem #{@redirect}`
+      `"#{@bindir}/gem" install --local hello-world-0.0.1.gem #{@redirect}`
       check_status_and_empty_stderr
     end
 
     begin
-      # check that hello-world launchers are created and work
-      @bin_dirs.each do |bin_dir|
-        path = "#{bin_dir}/hello-world.rb"
-        shebang = File.binread(path).lines.first.chomp
-        if shebang.size > 127
-          skip "shebang of #{path} is too long and might fail in execve(): #{shebang.size}\n#{shebang}"
-        end
-        out = `#{path} 2>&1`
-        out.should == "Hello world! from #{RUBY_DESCRIPTION}\n"
+      # check that hello-world launcher is created and works
+      path = "#{@bindir}/hello-world.rb"
+      shebang = File.binread(path).lines.first.chomp
+      if shebang.size > 127
+        skip "shebang of #{path} is too long and might fail in execve(): #{shebang.size}\n#{shebang}"
       end
+      out = `#{path} 2>&1`
+      out.should == "Hello world! from #{RUBY_DESCRIPTION}\n"
     ensure
       # uninstall
-      `#{@default_bindir}/gem uninstall hello-world -x #{@redirect}`
+      `#{@bindir}/gem uninstall hello-world -x #{@redirect}`
       check_status_and_empty_stderr
-      @bin_dirs.each do |bin_dir|
-        File.exist?(bin_dir + '/hello-world.rb').should == false
-      end
+      File.should_not.exist?(@bindir + '/hello-world.rb')
     end
   end
 
   it "for gem shows that bundled gems are installed" do
-    gem_list = `#{@default_bindir}/gem list #{@redirect}`
+    gem_list = `#{@bindir}/gem list #{@redirect}`
     check_status_and_empty_stderr
     # see doc/contributor/stdlib.md
     @bundled_gems.each_pair do |gem, version|
diff --git a/test/truffle/ecosystem/restore-rake.rb b/test/truffle/ecosystem/restore-rake.rb
@@ -1,10 +1,8 @@
 require 'fileutils'
+require 'rbconfig'
 
 repo = ARGV.fetch(0)
 src = "#{repo}/exe/rake"
 raise src unless File.exist? src
 
-bin_dirs = [RbConfig::CONFIG['bindir'], *RbConfig::CONFIG['extra_bindirs'].split(File::PATH_SEPARATOR)]
-bin_dirs.each do |dir|
-  FileUtils::Verbose.cp(src, "#{dir}/rake")
-end
+FileUtils::Verbose.cp(src, "#{RbConfig::CONFIG['bindir']}/rake")
