rake-compiler-dock 1.2.2 → 1.3.0

data/test/rcd_test/Rakefile

@@ -27,7 +27,7 @@ namespace "gem" do
     task 'prepare' do
       require 'rake_compiler_dock'
       require 'io/console'
-      sh "bundle package --all"
+      sh "bundle package"
       sh "mkdir -p tmp/gem"
       sh "cp ~/.gem/gem-*.pem tmp/gem/ || true"
       unless ENV['CI']
@@ -42,11 +42,13 @@ namespace "gem" do
       desc "Build the native gem for #{plat}"
       task plat => 'prepare' do
         config = "-- #{ENV['RCD_TEST_CONFIG']}"
-        # Set mountdir of the directory where .git resides, so that git ls-files in the gemspec works
-        RakeCompilerDock.sh <<-EOT, platform: plat, mountdir: Dir.pwd + "/../.."
+        # Set mountdir of the directory where .git resides,
+        # - so that git ls-files in the gemspec works
+        # - and to bundle the rake-compiler-dock under test
+        RakeCompilerDock.sh <<-EOT, platform: plat, mountdir: Dir.pwd + "/../..", verbose: true
           (cp tmp/gem/gem-*.pem ~/.gem/ || true) &&
           bundle --local &&
-          rake native:#{plat} pkg/#{exttask.gem_spec.full_name}-#{plat}.gem #{config}
+          rake native:#{plat} pkg/#{exttask.gem_spec.full_name}-#{plat}.gem "MAKE=make V=1" #{config}
         EOT
       end
     end
@@ -55,8 +57,8 @@ namespace "gem" do
   desc "Build a jruby gem"
   task "jruby" do
     require 'rake_compiler_dock'
-    sh "bundle package --all"
-    RakeCompilerDock.sh <<-EOT, rubyvm: "jruby", platform: "jruby", mountdir: Dir.pwd + "/../.."
+    sh "bundle package"
+    RakeCompilerDock.sh <<-EOT, rubyvm: "jruby", platform: "jruby", mountdir: Dir.pwd + "/../..", verbose: true
       mvn archetype:generate -DartifactId=test -DarchetypeVersion=1.4 -DinteractiveMode=false -DgroupId=test -Dpackage=test &&
       bundle --local &&
       bundle exec rake java gem

data/test/rcd_test/ext/mri/extconf.rb

@@ -11,9 +11,11 @@ else
   puts "-"*70
   puts "CONFIG['arch']: #{CONFIG['arch'].inspect}"
   puts "CONFIG['sitearch']: #{CONFIG['sitearch'].inspect}"
+  puts "CONFIG['host']: #{CONFIG['host'].inspect}"
   puts "CONFIG['RUBY_SO_NAME']: #{CONFIG['RUBY_SO_NAME'].inspect}"
   puts "RUBY_PLATFORM: #{RUBY_PLATFORM.inspect}"
   puts "Gem::Platform.local.to_s: #{Gem::Platform.local.to_s.inspect}"
+  puts "cc --version: #{ %x[#{CONFIG['CC']} --version].lines.first}"
   puts "-"*70
 
   have_func('rb_thread_call_without_gvl', 'ruby/thread.h') ||
@@ -23,6 +25,70 @@ else
     # https://github.com/rake-compiler/rake-compiler-dock/issues/69
     puts "Linking with '-static' flag"
     $LDFLAGS << ' -static'
+  else
+    if RbConfig::CONFIG["target_os"].include?("darwin")
+      ## In ruby 3.2, symbol resolution changed on Darwin, to introduce the `-bundle_loader` flag.
+      ##
+      ## See https://github.com/rake-compiler/rake-compiler-dock/issues/87 for a lot of context, but
+      ## I'll try to summarize here.
+      ##
+      ## > -bundle_loader executable
+      ## >   This specifies the executable that will be loading the bundle output file being linked.
+      ## >   Undefined symbols from the bundle are checked against the specified executable like it
+      ## >   was one of the dynamic libraries the bundle was linked with.
+      ##
+      ## There are good reasons to do this, including faster initialiation/loading as the Darwin
+      ## toolchain gets improved over time.
+      ##
+      ## Unfortunately, this flag prevents us from building a shared object that works with both a
+      ## Ruby compiled with `--enable-shared` and one compiled with `--disabled-shared`. The result
+      ## is usually an "Symbol not found" error about `_rb_cObject`, or a "dyld: missing symbol
+      ## called" error.
+      ##
+      ## There are two workarounds that I know of (there may be others I don't know of), and
+      ## they are ...
+
+      ## ----------------------------------------
+      ## SOLUTION 1, the `-flat_namespace` flag
+      ##
+      ## > Two-level namespace
+      ## >   By default all references resolved to a dynamic library record the library to which
+      ## >   they were resolved. At runtime, dyld uses that information to directly resolve symbols.
+      ## >   The alternative is to use the -flat_namespace option.  With flat namespace, the library
+      ## >   is not recorded.  At runtime, dyld will search each dynamic library in load order when
+      ## >   resolving symbols. This is slower, but more like how other operating systems resolve
+      ## >   symbols.
+      ##
+      #
+      # puts "Adding '-flat_namespace'"
+      # $LDFLAGS << ' -flat_namespace'
+      #
+      ## This solution unfortunately introduces new behavior that any symbols statically linked into
+      ## the shared object (e.g., libxml2 in nokogiri.bundle) may not be resolved locally from the
+      ## shared object, but instead resolved from a shared object loaded in the main process.
+      ##
+      ## This solution might be good for you if:
+      ## - you don't statically link things into your bundle,
+      ## - or you don't export those symbols,
+      ## - or you can avoid exporting those symbols (e.g., by using `-load_hidden`, or
+      ##   `-exported_symbols_list` or some other mechanism)
+      ##
+
+      ## ----------------------------------------
+      ## BUT ... if that is a problem, try SOLUTION 2, remove the `-bundle-loader` flag
+      ##
+      ## This returns us to the symbol resolution we had in previous Rubies. It feels gross but may
+      ## be a workaround for gem maintainers until we all figure out a better way to deal with this.
+      #
+      # extdldflags = RbConfig::MAKEFILE_CONFIG["EXTDLDFLAGS"].split
+      # if found = extdldflags.index("-bundle_loader")
+      #   removed_1 = extdldflags.delete_at(found) # flag
+      #   removed_2 = extdldflags.delete_at(found) # and its argument
+      #   puts "Removing '#{removed_1} #{removed_2}' from EXTDLDFLAGS"
+      # end
+      # RbConfig::MAKEFILE_CONFIG["EXTDLDFLAGS"] = extdldflags.join(" ")
+      #
+    end
   end
 
   create_makefile("rcd_test/rcd_test_ext")

data/test/test_environment_variables.rb

@@ -8,7 +8,13 @@ end
 
 class TestEnvironmentVariables
   module Common
-    IMAGE_NAME = "larskanis/rake-compiler-dock-mri-x86-mingw32:#{RakeCompilerDock::IMAGE_VERSION}"
+    TEST_PLATFORM = ENV["TEST_PLATFORM"] || "x64-mingw-ucrt"
+    IS_JRUBY = TEST_PLATFORM.to_s == "jruby"
+    TEST_IMAGE_NAME = if IS_JRUBY
+      RakeCompilerDock::Starter.container_image_name(rubyvm: "jruby")
+    else
+      RakeCompilerDock::Starter.container_image_name(platform: TEST_PLATFORM)
+    end
 
     def rcd_env
       self.class.instance_variable_get("@rcd_env") || begin
@@ -23,24 +29,26 @@ class TestEnvironmentVariables
       end
     end
 
-    def test_RUBY_CC_VERSION
-      df = File.read(File.expand_path("../../Dockerfile.mri.erb", __FILE__))
-      df =~ /^ENV RUBY_CC_VERSION\s+(.*)\s+$/
-      assert_equal $1, rcd_env['RUBY_CC_VERSION']
-    end
+    unless IS_JRUBY
+      def test_RUBY_CC_VERSION
+        df = File.read(File.expand_path("../../Dockerfile.mri.erb", __FILE__))
+        df =~ /^ENV RUBY_CC_VERSION\s+(.*)\s+$/
+        assert_equal $1, rcd_env['RUBY_CC_VERSION']
+      end
 
-    def test_RAKE_EXTENSION_TASK_NO_NATIVE
-      assert_equal "true", rcd_env['RAKE_EXTENSION_TASK_NO_NATIVE']
-    end
+      def test_RAKE_EXTENSION_TASK_NO_NATIVE
+        assert_equal "true", rcd_env['RAKE_EXTENSION_TASK_NO_NATIVE']
+      end
 
-    def test_symlink_rake_compiler
-      cmd = invocation("if test -h $HOME/.rake-compiler ; then echo yes ; else echo no ; fi")
-      assert_equal("yes", %x(#{cmd}).strip)
-    end
+      def test_symlink_rake_compiler
+        cmd = invocation("if test -h $HOME/.rake-compiler ; then echo yes ; else echo no ; fi")
+        assert_equal("yes", %x(#{cmd}).strip)
+      end
 
-    def test_gem_directory
-      cmd = invocation("if test -d $HOME/.gem ; then echo yes ; else echo no ; fi")
-      assert_equal("yes", %x(#{cmd}).strip)
+      def test_gem_directory
+        cmd = invocation("if test -d $HOME/.gem ; then echo yes ; else echo no ; fi")
+        assert_equal("yes", %x(#{cmd}).strip)
+      end
     end
   end
 
@@ -49,7 +57,7 @@ class TestEnvironmentVariables
 
     def invocation(command)
       idir = File.join(File.dirname(__FILE__), '../lib')
-      "#{RbConfig::CONFIG['RUBY_INSTALL_NAME']} -I#{idir.inspect} bin/rake-compiler-dock bash -c '#{command}'"
+      "RCD_PLATFORM=#{TEST_PLATFORM} RCD_RUBYVM=#{IS_JRUBY ? 'jruby' : 'mri'} #{RbConfig::CONFIG['RUBY_INSTALL_NAME']} -I#{idir.inspect} bin/rake-compiler-dock bash -c '#{command}'"
     end
 
     def test_HOST_RUBY_PLATFORM
@@ -61,7 +69,7 @@ class TestEnvironmentVariables
     end
 
     def test_IMAGE
-      assert_equal IMAGE_NAME, rcd_env['RCD_IMAGE']
+      assert_equal TEST_IMAGE_NAME, rcd_env['RCD_IMAGE']
     end
 
     def test_PWD
@@ -73,7 +81,7 @@ class TestEnvironmentVariables
     include Common
 
     def invocation(command)
-      "docker run -it #{IMAGE_NAME} bash -c '#{command}'"
+      "docker run --rm #{TEST_IMAGE_NAME} bash -c '#{command}'"
     end
   end
 end

data/test/test_parallel_docker_build.rb

@@ -65,6 +65,6 @@ class TestParallelDockerBuild < Test::Unit::TestCase
   end
 
   def read_df(fn)
-    File.read("tmp/docker/#{fn}").each_line.map(&:lstrip).join
+    File.read(File.join(@tmpdir, "/tmp/docker", fn)).each_line.map(&:lstrip).join
   end
 end

data/test/test_starter.rb

@@ -30,4 +30,123 @@ class TestStarter < Test::Unit::TestCase
     assert_equal "_", Starter.make_valid_group_name(nil)
   end
 
+  def test_container_image_name
+    # with env vars
+    with_env({"RCD_IMAGE" => "env-var-value"}) do
+      assert_equal("env-var-value", Starter.container_image_name)
+    end
+    with_env({"RAKE_COMPILER_DOCK_IMAGE" => "env-var-value"}) do
+      assert_equal("env-var-value", Starter.container_image_name)
+    end
+
+    # with image option
+    assert_equal("option-value", Starter.container_image_name({:image => "option-value"}))
+
+    # with env var and image option, image option wins
+    with_env({"RCD_IMAGE" => "env-var-value"}) do
+      assert_equal("option-value", Starter.container_image_name({:image => "option-value"}))
+    end
+
+    # mri platform arg
+    assert_equal(
+      "ghcr.io/rake-compiler/rake-compiler-dock-image:#{IMAGE_VERSION}-mri-platform-option-value",
+      Starter.container_image_name({:platform => "platform-option-value"}),
+    )
+
+    # jruby rubyvm arg
+    assert_equal(
+      "ghcr.io/rake-compiler/rake-compiler-dock-image:#{IMAGE_VERSION}-jruby",
+      Starter.container_image_name({:rubyvm => "jruby"}),
+    )
+
+    # jruby platform arg
+    assert_equal(
+      "ghcr.io/rake-compiler/rake-compiler-dock-image:#{IMAGE_VERSION}-jruby",
+      Starter.container_image_name({:platform => "jruby"}),
+    )
+
+    # container registry env var
+    with_env({"CONTAINER_REGISTRY" => "registry-value"}) do
+      assert_equal(
+        "registry-value/rake-compiler-dock-image:#{IMAGE_VERSION}-mri-x86_64-darwin",
+        Starter.container_image_name({:platform => "x86_64-darwin"}),
+      )
+    end
+
+    # snapshots
+    assert_equal(
+      "ghcr.io/rake-compiler/rake-compiler-dock-image:snapshot-mri-x86_64-darwin",
+      Starter.container_image_name({:platform =>"x86_64-darwin", :version => "snapshot"}),
+    )
+  end
+
+  def test_container_registry
+    assert_equal("ghcr.io/rake-compiler", Starter.container_registry)
+
+    with_env({"CONTAINER_REGISTRY" => "env-var-value"}) do
+      assert_equal("env-var-value", Starter.container_registry)
+    end
+  end
+
+  def test_container_rubyvm
+    # no args
+    assert_equal("mri", Starter.container_rubyvm)
+
+    # with env var
+    with_env({"RCD_RUBYVM" => "env-var-value"}) do
+      assert_equal("env-var-value", Starter.container_rubyvm)
+    end
+
+    # with rubyvm option
+    assert_equal("option-value", Starter.container_rubyvm({:rubyvm => "option-value"}))
+
+    # with rubyvm option and env var, rubyvm option wins
+    with_env({"RCD_RUBYVM" => "env-var-value"}) do
+      assert_equal("option-value", Starter.container_rubyvm({:rubyvm => "option-value"}))
+    end
+
+    # with jruby platform option
+    assert_equal("jruby", Starter.container_rubyvm({:platform => "jruby"}))
+  end
+
+  def test_container_jrubyvm?
+    assert(Starter.container_jrubyvm?({:rubyvm => "jruby"}))
+    assert(Starter.container_jrubyvm?({:platform => "jruby"}))
+    refute(Starter.container_jrubyvm?({:rubyvm => "mri"}))
+    refute(Starter.container_jrubyvm?({:platform => "x86_64-linux"}))
+  end
+
+  def test_platforms
+    # no args
+    assert_equal("x86-mingw32 x64-mingw32", Starter.platforms)
+
+    # with env var
+    with_env({"RCD_PLATFORM" => "env-var-value"}) do
+      assert_equal("env-var-value", Starter.platforms)
+    end
+
+    # with platform option
+    assert_equal("option-value", Starter.platforms({:platform => "option-value"}))
+
+    # with platform option and env var, platform option wins
+    with_env({"RCD_PLATFORM" => "arm64-darwin"}) do
+      assert_equal("option-value", Starter.platforms({:platform => "option-value"}))
+    end
+
+    # when options rubyvm is set to jruby
+    assert_equal("jruby", Starter.platforms({:rubyvm => "jruby"}))
+  end
+
+  def with_env(env = {})
+    original_env = {}
+    env.each do |k, v|
+      original_env[k] = ENV[k]
+      ENV[k] = v
+    end
+    yield
+  ensure
+    original_env.each do |k, v|
+      ENV[k] = v
+    end
+  end
 end

metadata

@@ -1,41 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIETTCCArWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
-  L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yMjAyMTQxMzMwNTZaFw0yMzAy
-  MTQxMzMwNTZaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
-  PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/
-  mZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN
-  eSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/
-  8nBMvR0mHo77kIkapHc26UzVq/G0nKLfDsIHXVylto3PjzOumjG6GhmFN4r3cP6e
-  SDfl1FSeRYVpt4kmQULz/zdSaOH3AjAq7PM2Z91iGwQvoUXMANH2v89OWjQO/NHe
-  JMNDFsmHK/6Ji4Kk48Z3TyscHQnipAID5GhS1oD21/WePdj7GhmbF5gBzkV5uepd
-  eJQPgWGwrQW/Z2oPjRuJrRofzWfrMWqbOahj9uth6WSxhNexUtbjk6P8emmXOJi5
-  chQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg
-  9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjgYEwfzAJ
-  BgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUOIdbSMr3VFrTCO9/cTM0
-  0exHzBcwIgYDVR0RBBswGYEXbGFyc0BncmVpei1yZWluc2RvcmYuZGUwIgYDVR0S
-  BBswGYEXbGFyc0BncmVpei1yZWluc2RvcmYuZGUwDQYJKoZIhvcNAQELBQADggGB
-  AFWP7F/y3Oq3NgrqUOnjKOeDaBa7AqNhHS+PZg+C90lnJzMgOs4KKgZYxqSQVSab
-  SCEmzIO/StkXY4NpJ4fYLrHemf/fJy1wPyu+fNdp5SEEUwEo+2toRFlzTe4u4LdS
-  QC636nPPTMt8H3xz2wf/lUIUeo2Qc95Qt2BQM465ibbG9kmA3c7Sopx6yOabYOAl
-  KPRbOSEPiWYcF9Suuz8Gdf8jxEtPlnZiwRvnYJ+IHMq3XQCJWPpMzdDMbtlgHbXE
-  vq1zOTLMSYAS0UB3uionR4yo1hLz60odwkCm7qf0o2Ci/5OjtB0a89VuyqRU2vUJ
-  QH95WBjDJ6lCCW7J0mrMPnJQSUFTmufsU6jOChvPaCeAzW1YwrsP/YKnvwueG7ip
-  VOdW6RitjtFxhS7evRL0201+KUvLz12zZWWjOcujlQs64QprxOtiv/MiisKb1Ng+
-  oL1mUdzB8KrZL4/WbG5YNX6UTtJbIOu9qEFbBAy4/jtIkJX+dlNoFwd4GXQW1YNO
-  nA==
-  -----END CERTIFICATE-----
-date: 2022-06-27 00:00:00.000000000 Z
+cert_chain: []
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +69,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
+- ".github/workflows/publish-images.yml"
 - ".gitignore"
+- CONTRIBUTING.md
 - Dockerfile.jruby
 - Dockerfile.mri.erb
 - Gemfile
@@ -108,10 +83,12 @@ files:
 - build/gem_helper.rb
 - build/math_h.patch
 - build/mk_i686.rb
+- build/mk_osxcross.sh
 - build/parallel_docker_build.rb
 - build/patches/ruby-2.5.9/no_sendfile.patch
-- build/patches/ruby-3.1.0/no_sendfile.patch
-- build/patches2/rake-compiler-1.1.6/0004-Enable-build-of-static-libruby.patch
+- build/patches/ruby-3.1.3/no_sendfile.patch
+- build/patches2/rake-compiler-1.2.1/0004-Enable-build-of-static-libruby.patch
+- build/patches2/rake-compiler-1.2.1/0005-make-miniruby.patch
 - build/rcd-env.sh
 - build/runas
 - build/sigfw.c
@@ -163,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.2
 signing_key: 
 specification_version: 4
 summary: Easy to use and reliable cross compiler environment for building Windows

metadata.gz.sig

@@ -1,2 +0,0 @@
-,1o�0����o����ɂl��4.y��Ɩ
Ǚ^(���/�

F^P�A��F��"M2��0����3O�tY��?��AYͨ\:L�4��M�QZͩY&~�w�����#t܆-�;鼍_�>�J06܉���X#E�M+�����K�;0-�I(N@*���M��J���2�2h�(cS�+��+L�C���6���/����Kr��N�2Kz����Ց��(����e�	�R�D��߬ªRɲ��j��2[j���.P֭�OE�
��Op:z�zP�ɀ=�y�%Y飗^�MRjo�8b9�~W�#Uq�=�p�
-\��AP�"�e(�3�\�2Xm�
��n��$����¼jU��c7����).�f|��y�v��mH��M�LՍ��