rake-compiler-dock 1.1.0 → 1.2.2

data/mingw64-ucrt/binutils-mingw-w64-ignore-check-errors.patch

@@ -0,0 +1,13 @@
+diff --git a/debian/rules b/debian/rules
+index 4401493..62c8fe4 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -91,7 +91,7 @@ override_dh_auto_test-arch:
+ 	unset CFLAGS CPPFLAGS LDFLAGS; \
+ 	env > $(build_dir)/env; \
+ 	for target in $(targets); do \
+-		dh_auto_test -B$(build_dir)/$$target; \
++		dh_auto_test -B$(build_dir)/$$target || true; \
+ 	done
+ 
+ override_dh_auto_install-arch:

data/mingw64-ucrt/gcc-mingw-w64-only-c-c++.patch

@@ -0,0 +1,13 @@
+diff --git a/debian/rules b/debian/rules
+index 9e7e40c..fa9a8a2 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -58,7 +58,7 @@ ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+     INSTALL_TARGET := install-gcc
+ else
+ # Build the full GCC.
+-    languages := c,c++,fortran,objc,obj-c++,ada
++    languages := c,c++
+     BUILD_TARGET :=
+     INSTALL_TARGET := install install-lto-plugin
+ endif

data/mingw64-ucrt/mingw-w64-enable-ucrt.patch

@@ -0,0 +1,22 @@
+diff --git a/debian/rules b/debian/rules
+index 9fb970c..5473839 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -94,7 +94,7 @@ build-arch-stamp: $(patsubst %,$(host)~$(host)~tools-%-install-stamp,$(HOST_TOOL
+ %~headers-configure-stamp: autoreconf-stamp
+ 	mkdir -p $(call buildfolder,$*~headers) && \
+ 	cd $(call buildfolder,$*~headers) && \
+-	$(call sourcefolder,$*~headers)/configure --prefix=/usr/$(call ruletarget,$*~headers) --host=$(call rulehost,$*~headers) --enable-sdk=all --enable-secure-api
++	$(call sourcefolder,$*~headers)/configure --prefix=/usr/$(call ruletarget,$*~headers) --host=$(call rulehost,$*~headers) --enable-sdk=all --with-default-msvcrt=ucrt
+ 	touch $*-headers-configure-stamp
+ 
+ # Override CRT configuration to avoid multilib builds
+@@ -108,7 +108,7 @@ target64crt := $(target64)~$(target64)~crt
+ $(target64crt)-configure-stamp: $(target64)~$(target64)~headers-install-stamp autoreconf-stamp
+ 	mkdir -p $(call buildfolder,$(target64crt)) && \
+ 	cd $(call buildfolder,$(target64crt)) && \
+-	$(call sourcefolder,$(target64crt))/configure --prefix=/usr/$(call ruletarget,$(target64crt)) --host=$(call rulehost,$(target64crt)) --target=$(call ruletarget,$(target64crt)) --disable-lib32 --enable-lib64 CPPFLAGS="$(CPPFLAGS) -I$(top_dir)/debian/tmp/usr/$(call ruletarget,$(target64crt))/include"
++	$(call sourcefolder,$(target64crt))/configure --prefix=/usr/$(call ruletarget,$(target64crt)) --host=$(call rulehost,$(target64crt)) --target=$(call ruletarget,$(target64crt)) --disable-lib32 --enable-lib64 --with-default-msvcrt=ucrt CPPFLAGS="$(CPPFLAGS) -I$(top_dir)/debian/tmp/usr/$(call ruletarget,$(target64crt))/include"
+ 	touch $@
+ 
+ build-indep-stamp: $(foreach target,$(targets),$(patsubst %,$(target)~$(target)~%-install-stamp,$(TARGET_PROJECTS))) $(patsubst %,$(target32)~$(target32)~%-install-stamp,$(TARGET32_PROJECTS))

data/rake-compiler-dock.gemspec

@@ -22,7 +22,7 @@ Use rake-compiler-dock to enter an interactive shell session or add a task to yo
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "bundler", ">= 1.7", "< 3.0"
+  spec.add_development_dependency "rake", ">= 12"
   spec.add_development_dependency "test-unit", "~> 3.0"
 end

data/test/env/Dockerfile.alpine

@@ -0,0 +1,17 @@
+ARG from_image
+FROM ${from_image}
+
+RUN uname -a
+RUN apk add ruby ruby-etc ruby-rake git
+
+RUN ruby --version
+RUN gem env
+RUN gem inst bundler
+
+WORKDIR /build
+
+CMD ruby -e "puts Gem::Platform.local.to_s" && \
+  gem install --local *.gem --verbose --no-document && \
+  cd test/rcd_test/ && \
+  bundle install && \
+  rake test

data/test/env/Dockerfile.centos

@@ -0,0 +1,22 @@
+ARG from_image
+FROM ${from_image}
+
+RUN uname -a
+
+# Change download address of Centos-8 which is EOL
+RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+
+RUN yum install -y ruby git
+
+RUN ruby --version
+RUN gem env
+RUN gem inst bundler
+
+WORKDIR /build
+
+CMD ruby -e "puts Gem::Platform.local.to_s" && \
+  gem install --local *.gem --verbose --no-document && \
+  cd test/rcd_test/ && \
+  bundle install && \
+  rake test

data/test/env/Dockerfile.debian

@@ -0,0 +1,24 @@
+ARG from_image
+FROM ${from_image}
+
+# To prevent installed tzdata deb package to show interactive dialog.
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN uname -a
+RUN apt-get update -qq && \
+  apt-get install -yq \
+  -o Dpkg::Options::='--force-confnew' \
+  ruby \
+  git
+
+RUN ruby --version
+RUN gem env
+RUN gem inst bundler
+
+WORKDIR /build
+
+CMD  ruby -e "puts Gem::Platform.local.to_s" && \
+  gem install --local *.gem --verbose --no-document && \
+  cd test/rcd_test/ && \
+  bundle install && \
+  rake test

data/test/rcd_test/Gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in rcd_test.gemspec
+gemspec
+
+gem "rake", "~> 13.0"
+gem "rake-compiler"
+gem "rake-compiler-dock"
+gem "minitest", "~> 5.0"

data/test/rcd_test/Rakefile

@@ -0,0 +1,76 @@
+require "bundler/gem_tasks"
+require "rubygems/package_task"
+require "rake/testtask"
+
+rcd_test_spec = Bundler.load_gemspec("rcd_test.gemspec")
+
+if RUBY_ENGINE == "jruby"
+  require "rake/javaextensiontask"
+
+  Rake::JavaExtensionTask.new("rcd_test_ext", rcd_test_spec) do |ext|
+    ext.ext_dir = 'ext/java'
+    ext.lib_dir = 'lib/rcd_test'
+  end
+else
+  require "rake/extensiontask"
+
+  exttask = Rake::ExtensionTask.new('rcd_test_ext', rcd_test_spec) do |ext|
+    ext.ext_dir = 'ext/mri'
+    ext.lib_dir = 'lib/rcd_test'
+    ext.cross_compile = true
+    ext.cross_platform = %w[x86-mingw32 x64-mingw-ucrt x64-mingw32 x86-linux x86_64-linux aarch64-linux arm-linux x86_64-darwin arm64-darwin]
+  end
+end
+
+namespace "gem" do
+  if exttask
+    task 'prepare' do
+      require 'rake_compiler_dock'
+      require 'io/console'
+      sh "bundle package --all"
+      sh "mkdir -p tmp/gem"
+      sh "cp ~/.gem/gem-*.pem tmp/gem/ || true"
+      unless ENV['CI']
+        ENV["GEM_PRIVATE_KEY_PASSPHRASE"] = STDIN.getpass("Enter passphrase of gem signature key: ")
+      end
+    end
+
+    exttask.cross_platform.each do |plat|
+      desc "Build all native binary gems"
+      multitask 'native' => plat
+
+      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 + "/../.."
+          (cp tmp/gem/gem-*.pem ~/.gem/ || true) &&
+          bundle --local &&
+          rake native:#{plat} pkg/#{exttask.gem_spec.full_name}-#{plat}.gem #{config}
+        EOT
+      end
+    end
+  end
+
+  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 + "/../.."
+      mvn archetype:generate -DartifactId=test -DarchetypeVersion=1.4 -DinteractiveMode=false -DgroupId=test -Dpackage=test &&
+      bundle --local &&
+      bundle exec rake java gem
+    EOT
+  end
+end
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/test_*.rb"]
+end
+
+task default: [:clobber, :compile, :test]
+task gem: :build
+
+CLEAN.add("{ext,lib}/**/*.{o,so}", "pkg", "tmp")

data/test/rcd_test/ext/java/RcdTestExtService.java

@@ -0,0 +1,19 @@
+package rcd_test;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyModule;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.load.BasicLibraryService;
+
+import java.io.IOException;
+
+public class RcdTestExtService  implements BasicLibraryService {
+    @Override
+    public boolean basicLoad(final Ruby ruby) throws IOException {
+        RubyModule rb_mRcdTest = ruby.defineModule("RcdTest");
+        rb_mRcdTest.defineAnnotatedMethods(RubyRcdTest.class);
+        return true;
+    }
+}

data/test/rcd_test/ext/java/RubyRcdTest.java

@@ -0,0 +1,16 @@
+package rcd_test;
+
+import org.jruby.Ruby;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.anno.JRubyModule;
+import org.jruby.runtime.ThreadContext;
+
+@JRubyModule(name = "RcdTest")
+public class RubyRcdTest {
+    @JRubyMethod(name = "do_something", module = true, meta = true)
+    public static IRubyObject buildSelfString(ThreadContext context, IRubyObject recv) {
+        Ruby runtime = context.getRuntime();
+        return runtime.newString("something has been done");
+    }
+}

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

@@ -0,0 +1,29 @@
+if RUBY_ENGINE == "jruby"
+  File.open("Makefile", "w") do |mf|
+    mf.puts "# Dummy makefile for JRuby"
+    mf.puts "all install::\n"
+  end
+else
+  require "mkmf"
+
+  include RbConfig
+
+  puts "-"*70
+  puts "CONFIG['arch']: #{CONFIG['arch'].inspect}"
+  puts "CONFIG['sitearch']: #{CONFIG['sitearch'].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 "-"*70
+
+  have_func('rb_thread_call_without_gvl', 'ruby/thread.h') ||
+      raise("rb_thread_call_without_gvl() not found")
+
+  if arg_config("--link-static", false)
+    # https://github.com/rake-compiler/rake-compiler-dock/issues/69
+    puts "Linking with '-static' flag"
+    $LDFLAGS << ' -static'
+  end
+
+  create_makefile("rcd_test/rcd_test_ext")
+end

data/test/rcd_test/ext/mri/rcd_test_ext.c

@@ -0,0 +1,51 @@
+#include "rcd_test_ext.h"
+
+#ifndef __has_builtin
+  #define __has_builtin(x) 0
+#endif
+
+VALUE rb_mRcdTest;
+
+static VALUE
+rcdt_isinf_eh(VALUE self, VALUE rb_float) {
+  Check_Type(rb_float, T_FLOAT);
+
+  return isinf(RFLOAT_VALUE(rb_float)) ? Qtrue : Qfalse;
+}
+
+static VALUE
+rcdt_isnan_eh(VALUE self, VALUE rb_float) {
+  Check_Type(rb_float, T_FLOAT);
+
+  return isnan(RFLOAT_VALUE(rb_float)) ? Qtrue : Qfalse;
+}
+
+static VALUE
+rcdt_do_something(VALUE self)
+{
+  return rb_str_new_cstr("something has been done");
+}
+
+static VALUE
+rcdt_darwin_builtin_available_eh(VALUE self)
+{
+#if __has_builtin(__builtin_available)
+  // This version must be higher than MACOSX_DEPLOYMENT_TARGET to prevent clang from optimizing it away
+  if (__builtin_available(macOS 10.14, *)) {
+    return Qtrue;
+  }
+  return Qfalse;
+#else
+  rb_raise(rb_eRuntimeError, "__builtin_available is not defined");
+#endif
+}
+
+void
+Init_rcd_test_ext(void)
+{
+  rb_mRcdTest = rb_define_module("RcdTest");
+  rb_define_singleton_method(rb_mRcdTest, "do_something", rcdt_do_something, 0);
+  rb_define_singleton_method(rb_mRcdTest, "darwin_builtin_available?", rcdt_darwin_builtin_available_eh, 0);
+  rb_define_singleton_method(rb_mRcdTest, "isinf?", rcdt_isinf_eh, 1);
+  rb_define_singleton_method(rb_mRcdTest, "isnan?", rcdt_isnan_eh, 1);
+}

data/test/rcd_test/ext/mri/rcd_test_ext.h

@@ -0,0 +1,6 @@
+#ifndef RCD_TEST_EXT_H
+#define RCD_TEST_EXT_H 1
+
+#include "ruby.h"
+
+#endif /* RCD_TEST_EXT_H */

data/test/rcd_test/lib/rcd_test.rb

@@ -0,0 +1,6 @@
+begin
+  RUBY_VERSION =~ /(\d+\.\d+)/
+  require "rcd_test/#{$1}/rcd_test_ext"
+rescue LoadError
+  require 'rcd_test/rcd_test_ext'
+end

data/test/rcd_test/rcd_test.gemspec

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+Gem::Specification.new do |spec|
+  spec.name          = "rcd_test"
+  spec.version       = "1.0.0"
+  spec.authors       = ["Lars Kanis"]
+  spec.email         = ["lars@greiz-reinsdorf.de"]
+
+  spec.summary       = "C extension for testing rake-compiler-dock"
+  spec.description   = "This gem has no real use other than testing builds of binary gems."
+  spec.homepage      = "https://github.com/rake-compiler/rake-compiler-dock"
+  spec.required_ruby_version = ">= 2.0.0"
+  spec.license = "MIT"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.extensions    = ["ext/mri/extconf.rb"]
+
+  # Uncomment to register a new dependency of your gem
+  # spec.add_dependency "example-gem", "~> 1.0"
+end

data/test/rcd_test/test/test_basic.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "minitest/autorun"
+require "rcd_test"
+
+class TestBasic < Minitest::Test
+
+  def test_do_something
+    assert_equal "something has been done", RcdTest.do_something
+  end
+
+  def test_check_darwin_compiler_rt_symbol_resolution
+    skip("jruby should not run libc-specific tests") if RUBY_ENGINE == "jruby"
+
+    if RUBY_PLATFORM.include?("darwin")
+      assert(RcdTest.darwin_builtin_available?)
+    else
+      e = assert_raises(RuntimeError) { RcdTest.darwin_builtin_available? }
+      assert_equal("__builtin_available is not defined", e.message)
+    end
+  end
+
+  def test_floating_point_classification_macros
+    skip("jruby should not run libc-specific tests") if RUBY_ENGINE == "jruby"
+    refute(RcdTest.isinf?(42.0))
+    assert(RcdTest.isinf?(Float::INFINITY))
+    refute(RcdTest.isnan?(42.0))
+    assert(RcdTest.isnan?(Float::NAN))
+  end
+
+end

data/test/test_environment_variables.rb

@@ -6,49 +6,74 @@ begin
 rescue LoadError
 end
 
-class TestEnvironmentVariables < Test::Unit::TestCase
-  @@rcd_env = nil
+class TestEnvironmentVariables
+  module Common
+    IMAGE_NAME = "larskanis/rake-compiler-dock-mri-x86-mingw32:#{RakeCompilerDock::IMAGE_VERSION}"
 
-  def setup
-    @@rcd_env ||= begin
-      args = "bash -c 'set'"
-      idir = File.join(File.dirname(__FILE__), '../lib')
-      cmd = "#{RbConfig::CONFIG['RUBY_INSTALL_NAME']} -I#{idir.inspect} bin/rake-compiler-dock #{args}"
-      output = `#{cmd}`
+    def rcd_env
+      self.class.instance_variable_get("@rcd_env") || begin
+        command = "env"
+        output = %x(#{invocation(command)})
 
-      output.split("\n").inject({}) do |hash, line|
-        if line =~ /\A(\w+)=(.*)\z/
-          hash[$1] = $2.chomp
+        env = output.split("\n").each_with_object({}) do |line, hash|
+          hash[Regexp.last_match(1)] = Regexp.last_match(2).chomp if line =~ /\A(\w+)=(.*)\z/
         end
-        hash
+
+        self.class.instance_variable_set("@rcd_env", env)
       end
     end
-  end
 
-  def rcd_env
-    @@rcd_env
-  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
 
-  def test_IMAGE
-    assert_equal "larskanis/rake-compiler-dock-mri-x86-mingw32:#{RakeCompilerDock::IMAGE_VERSION}", rcd_env['RCD_IMAGE']
-  end
+    def test_RAKE_EXTENSION_TASK_NO_NATIVE
+      assert_equal "true", rcd_env['RAKE_EXTENSION_TASK_NO_NATIVE']
+    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
+    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_HOST_RUBY_PLATFORM
-    assert_equal RUBY_PLATFORM, rcd_env['RCD_HOST_RUBY_PLATFORM']
+    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
 
-  def test_HOST_RUBY_VERSION
-    assert_equal RUBY_VERSION, rcd_env['RCD_HOST_RUBY_VERSION']
-  end
+  class UsingWrapper < Test::Unit::TestCase
+    include Common
+
+    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}'"
+    end
+
+    def test_HOST_RUBY_PLATFORM
+      assert_equal RUBY_PLATFORM, rcd_env['RCD_HOST_RUBY_PLATFORM']
+    end
+
+    def test_HOST_RUBY_VERSION
+      assert_equal RUBY_VERSION, rcd_env['RCD_HOST_RUBY_VERSION']
+    end
 
-  def test_PWD
-    assert_equal Dir.pwd, rcd_env['PWD']
+    def test_IMAGE
+      assert_equal IMAGE_NAME, rcd_env['RCD_IMAGE']
+    end
+
+    def test_PWD
+      assert_equal Dir.pwd, rcd_env['PWD']
+    end
   end
 
+  class AsIfContinuousIntegration < Test::Unit::TestCase
+    include Common
+
+    def invocation(command)
+      "docker run -it #{IMAGE_NAME} bash -c '#{command}'"
+    end
+  end
 end

data/test/test_parallel_docker_build.rb

@@ -1,36 +1,47 @@
 require 'test/unit'
 require_relative "../build/parallel_docker_build"
+require "tmpdir"
 
 class TestParallelDockerBuild < Test::Unit::TestCase
   def setup
-    File.write "File0", <<-EOT
+    @tmpdir ||= Dir.mktmpdir
+
+    Dir.chdir(@tmpdir) do
+      File.write "File0", <<-EOT
       FROM a
       RUN a
       RUN d
     EOT
-    File.write "File1", <<-EOT
+      File.write "File1", <<-EOT
       FROM a
       RUN a
       RUN d
       RUN f \\
           g
     EOT
-    File.write "File2", <<-EOT
+      File.write "File2", <<-EOT
       FROM a
       RUN b
       RUN c
       RUN d
     EOT
-    File.write "File3", <<-EOT
+      File.write "File3", <<-EOT
       FROM a
       RUN b
       RUN c
       RUN d
     EOT
+    end
+  end
+
+  def teardown
+    FileUtils.rm_rf @tmpdir
   end
 
   def test_tasks
-    RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 ], task_prefix: "y")
+    Dir.chdir(@tmpdir) do
+      RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 ], task_prefix: "y")
+    end
 
     assert_operator Rake::Task["File0"].prerequisites, :include?, "yFile0File1"
     assert_operator Rake::Task["File1"].prerequisites, :include?, "yFile1"
@@ -43,7 +54,9 @@ class TestParallelDockerBuild < Test::Unit::TestCase
   end
 
   def test_common_files
-    RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 ], task_prefix: "y")
+    Dir.chdir(@tmpdir) do
+      RakeCompilerDock::ParallelDockerBuild.new(%w[ File0 File1 File2 File3 ], task_prefix: "y")
+    end
 
     assert_equal "FROM a\nRUN a\nRUN d\nRUN f \\\ng\n", read_df("yFile1")
     assert_equal "FROM a\nRUN a\nRUN d\n", read_df("yFile0File1")