rake-compiler 1.1.5 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc1a9473b798baedf27b268735d3a4ca35899fa524d39311e39085903902c176
-  data.tar.gz: 740e10b92d44ef53ec07ff512b8fafff7b013ea01f096caf3829141a406b30b9
+  metadata.gz: 3dac2b65206bc383a7e2f5bca57d0ef5f6b2e0a79d94af9cfefac60f9b91577a
+  data.tar.gz: 4e7592c9bd0bfa0a2bdcdb8bfe0a67ccff6d0ce47d4d51b68b3c17156083c9dd
 SHA512:
-  metadata.gz: 20809270e0c37bd854462309eeebcb312e04c270a4f6ceff0bff6b6d1ff9bfe48e8d54d53f6aae63f52628b3267b5bda00357dd162b7a8e1f16259c12252e2c9
-  data.tar.gz: 348d0b64112854c43519814ff20b077972ae1fd8e6acce966f287e89e09b25ca4c11f7e7db7b12bd4960780e052047a0cff7665427eec60ae0114fe63ad8e8e9
+  metadata.gz: dc0df40a879127c77bc137af890bd8880395963ce6b133e4ac4c3b2ec207d42503dc67a04856f0d07410161ebd5bd4401dad049afdf2ce9fa8abcaeee9a61df8
+  data.tar.gz: bd91ba1ed6881011a69870933873cd5112a5c6af3ee4fc2977992201e403deb2ffdc31eea874f1b7f32bd3b515b06b7e474fc5bb943f1e381c99d25dfd216205

data/History.md

@@ -1,3 +1,27 @@
+### 1.1.9 / 2022-01-22
+
+* Enhancements:
+  * Add support for `--release` option to build JRuby extension.
+    [#200](https://github.com/rake-compiler/rake-compiler/issues/200) [Reported by Pavel Rosický]
+    [#201](https://github.com/rake-compiler/rake-compiler/issues/201) [Patch by Satoshi Tagomori]
+
+### 1.1.8 / 2022-01-18
+
+* Fixes:
+  * Fix wrong `required_ruby_version` when some `RUBY_CC_VERSION`s are missing.
+    [#198](https://github.com/rake-compiler/rake-compiler/issues/198) [Patch by Lars Kanis]
+
+### 1.1.7 / 2022-01-04
+
+* Fixes:
+  * Fix binary paths for staging and clobber.
+    [#197](https://github.com/rake-compiler/rake-compiler/issues/197) [Patch by konsolebox]
+
+### 1.1.6 / 2021-12-12
+
+* Fixes:
+  * Fix a regression bug that `Symbol` can't be used for `name` of `Rake::ExtensionTask.new`.
+
 ### 1.1.5 / 2021-12-12
 
 * Fixes:

data/lib/rake/baseextensiontask.rb

@@ -40,8 +40,8 @@ module Rake
       @tmp_dir = 'tmp'
       @ext_dir = "ext/#{@name}"
       @lib_dir = 'lib'
-      if @name and File.dirname(@name) != "."
-        @lib_dir += "/#{File.dirname(@name)}"
+      if @name and File.dirname(@name.to_s) != "."
+        @lib_dir += "/#{File.dirname(@name.to_s)}"
       end
       @config_options = []
       @extra_options = ARGV.select { |i| i =~ /\A--?/ }

data/lib/rake/extensiontask.rb

@@ -82,9 +82,12 @@ module Rake
     private
     # copy other gem files to staging directory
     def define_staging_file_tasks(files, lib_path, stage_path, platf, ruby_ver)
+      # lib_binary_path
+      lib_binary_path = "#{lib_path}/#{File.basename(binary(platf))}"
+
       files.each do |gem_file|
         # ignore directories and the binary extension
-        next if File.directory?(gem_file) || gem_file == "#{lib_path}/#{binary(platf)}"
+        next if File.directory?(gem_file) || gem_file == lib_binary_path
         stage_file = "#{stage_path}/#{gem_file}"
 
         # copy each file from base to stage directory
@@ -105,12 +108,13 @@ module Rake
       platf = for_platform || platform
 
       binary_path = binary(platf)
+      binary_base_name = File.basename(binary_path)
 
       # lib_path
       lib_path = lib_dir
 
-      lib_binary_path = "#{lib_path}/#{binary_path}"
-      lib_binary_dir_path = File.dirname(lib_binary_path)
+      # lib_binary_path
+      lib_binary_path = "#{lib_path}/#{binary_base_name}"
 
       # tmp_path
       tmp_path = "#{@tmp_dir}/#{platf}/#{@name}/#{ruby_ver}"
@@ -119,19 +123,19 @@ module Rake
       siteconf_path = "#{tmp_path}/.rake-compiler-siteconf.rb"
       tmp_binary_path = "#{tmp_path}/#{binary_path}"
       tmp_binary_dir_path = File.dirname(tmp_binary_path)
-      stage_binary_path = "#{stage_path}/#{lib_path}/#{binary_path}"
+      stage_binary_path = "#{stage_path}/#{lib_binary_path}"
       stage_binary_dir_path = File.dirname(stage_binary_path)
 
       # cleanup and clobbering
       CLEAN.include(tmp_path)
       CLEAN.include(stage_path)
-      CLOBBER.include("#{lib_path}/#{binary(platf)}")
+      CLOBBER.include(lib_binary_path)
       CLOBBER.include("#{@tmp_dir}")
 
       # directories we need
       directory tmp_path
       directory tmp_binary_dir_path
-      directory lib_binary_dir_path
+      directory lib_path
       directory stage_binary_dir_path
 
       directory File.dirname(siteconf_path)
@@ -150,7 +154,7 @@ module Rake
 
       # copy binary from temporary location to final lib
       # tmp/extension_name/extension_name.{so,bundle} => lib/
-      task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_binary_dir_path, tmp_binary_path, "#{tmp_path}/Makefile"] do
+      task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_path, tmp_binary_path, "#{tmp_path}/Makefile"] do
         # install in lib for native platform only
         unless for_platform
           sh "#{make} install target_prefix=", chdir: tmp_path
@@ -175,8 +179,8 @@ Java extension should be preferred.
 
         chdir tmp_path do
           sh make
-          if binary_path != File.basename(binary_path)
-            cp File.basename(binary_path), binary_path
+          if binary_path != binary_base_name
+            cp binary_base_name, binary_path
           end
         end
       end
@@ -237,7 +241,7 @@ Java extension should be preferred.
       # platform matches the indicated one.
       if platf == RUBY_PLATFORM then
         # ensure file is always copied
-        file "#{lib_path}/#{binary_path}" => ["copy:#{name}:#{platf}:#{ruby_ver}"]
+        file lib_binary_path => ["copy:#{name}:#{platf}:#{ruby_ver}"]
 
         task "compile:#{@name}" => ["compile:#{@name}:#{platf}"]
         task "compile" => ["compile:#{platf}"]
@@ -253,6 +257,9 @@ Java extension should be preferred.
       # lib_path
       lib_path = lib_dir
 
+      # lib_binary_path
+      lib_binary_path = "#{lib_path}/#{File.basename(binary(platf))}"
+
       # Update compiled platform/version combinations
       @ruby_versions_per_platform[platf] << ruby_ver
 
@@ -332,13 +339,13 @@ Java extension should be preferred.
       end
 
       # add binaries to the dependency chain
-      task "native:#{@gem_spec.name}:#{platf}" => ["#{stage_path}/#{lib_path}/#{binary(platf)}"]
+      task "native:#{@gem_spec.name}:#{platf}" => ["#{stage_path}/#{lib_binary_path}"]
 
       # ensure the extension get copied
-      unless Rake::Task.task_defined?("#{lib_path}/#{binary(platf)}") then
-        file "#{lib_path}/#{binary(platf)}" => ["copy:#{@name}:#{platf}:#{ruby_ver}"]
+      unless Rake::Task.task_defined?(lib_binary_path) then
+        file lib_binary_path => ["copy:#{@name}:#{platf}:#{ruby_ver}"]
       end
-      file "#{stage_path}/#{lib_dir}/#{binary(platf)}" => ["copy:#{@name}:#{platf}:#{ruby_ver}"]
+      file "#{stage_path}/#{lib_binary_path}" => ["copy:#{@name}:#{platf}:#{ruby_ver}"]
 
       # Allow segmented packaging by platform (open door for 'cross compile')
       task "native:#{platf}" => ["native:#{@gem_spec.name}:#{platf}"]
@@ -370,9 +377,6 @@ Java extension should be preferred.
           @lib_dir = "#{@lib_dir}/#{$1}"
         end
 
-        # Update cross compiled platform/version combinations
-        @ruby_versions_per_platform[for_platform] << version
-
         define_cross_platform_tasks_with_version(for_platform, version)
 
         # restore lib_dir
@@ -397,6 +401,9 @@ Java extension should be preferred.
       # lib_path
       lib_path = lib_dir
 
+      # lib_binary_path
+      lib_binary_path = "#{lib_path}/#{File.basename(binary(for_platform))}"
+
       unless rbconfig_file = config_file["rbconfig-#{for_platform}-#{ruby_ver}"] then
         warn "no configuration section for specified version of Ruby (rbconfig-#{for_platform}-#{ruby_ver})"
         return
@@ -463,12 +470,12 @@ Java extension should be preferred.
 
         # clear lib/binary dependencies and trigger cross platform ones
         # check if lib/binary is defined (damn bundle versus so versus dll)
-        if Rake::Task.task_defined?("#{lib_path}/#{binary(for_platform)}") then
-          Rake::Task["#{lib_path}/#{binary(for_platform)}"].prerequisites.clear
+        if Rake::Task.task_defined?(lib_binary_path) then
+          Rake::Task[lib_binary_path].prerequisites.clear
         end
 
         # FIXME: targeting multiple platforms copies the file twice
-        file "#{lib_path}/#{binary(for_platform)}" => ["copy:#{@name}:#{for_platform}:#{ruby_ver}"]
+        file lib_binary_path => ["copy:#{@name}:#{for_platform}:#{ruby_ver}"]
 
         # if everything for native task is in place
         if @gem_spec && @gem_spec.platform == 'ruby' then

data/lib/rake/javaextensiontask.rb

@@ -17,6 +17,9 @@ module Rake
     # Generate class files for specific VM version
     attr_accessor :target_version
 
+    # Compile for oldeer platform version
+    attr_accessor :release
+
     attr_accessor :encoding
 
     # Specify lint option
@@ -37,6 +40,7 @@ module Rake
       @debug          = false
       @source_version = '1.7'
       @target_version = '1.7'
+      @release        = nil
       @encoding       = nil
       @java_compiling = nil
       @lint_option    = nil
@@ -53,15 +57,20 @@ module Rake
       # platform usage
       platf = for_platform || platform
 
+      binary_path = binary(platf)
+
       # lib_path
       lib_path = lib_dir
 
+      # lib_binary_path
+      lib_binary_path = "#{lib_path}/#{File.basename(binary_path)}"
+
       # tmp_path
       tmp_path = "#{@tmp_dir}/#{platf}/#{@name}"
 
       # cleanup and clobbering
       CLEAN.include(tmp_path)
-      CLOBBER.include("#{lib_path}/#{binary(platf)}")
+      CLOBBER.include(lib_binary_path)
       CLOBBER.include("#{@tmp_dir}")
 
       # directories we need
@@ -70,11 +79,11 @@ module Rake
 
       # copy binary from temporary location to final lib
       # tmp/extension_name/extension_name.{so,bundle} => lib/
-      task "copy:#{@name}:#{platf}" => [lib_path, "#{tmp_path}/#{binary(platf)}"] do
-        install "#{tmp_path}/#{binary(platf)}", "#{lib_path}/#{binary(platf)}"
+      task "copy:#{@name}:#{platf}" => [lib_path, "#{tmp_path}/#{binary_path}"] do
+        install "#{tmp_path}/#{binary_path}", lib_binary_path
       end
 
-      file "#{tmp_path}/#{binary(platf)}" => "#{tmp_path}/.build" do
+      file "#{tmp_path}/#{binary_path}" => "#{tmp_path}/.build" do
 
         class_files = FileList["#{tmp_path}/**/*.class"].
           gsub("#{tmp_path}/", '')
@@ -86,7 +95,7 @@ module Rake
           ["-C #{tmp_path}", path]
         }.flatten
 
-        sh "jar cf #{tmp_path}/#{binary(platf)} #{args.join(' ')}"
+        sh "jar cf #{tmp_path}/#{binary_path} #{args.join(' ')}"
       end
 
       file "#{tmp_path}/.build" => [tmp_path] + source_files do
@@ -101,8 +110,7 @@ execute the Rake compilation task using the JRuby interpreter.
 
         javac_command_line = [
           "javac",
-          "-target", @target_version,
-          "-source", @source_version,
+          *java_target_args,
           java_lint_arg,
           "-d", tmp_path,
         ]
@@ -137,7 +145,7 @@ execute the Rake compilation task using the JRuby interpreter.
       # platform matches the indicated one.
       if platf == RUBY_PLATFORM then
         # ensure file is always copied
-        file "#{lib_path}/#{binary(platf)}" => ["copy:#{name}:#{platf}"]
+        file lib_binary_path => ["copy:#{name}:#{platf}"]
 
         task "compile:#{@name}" => ["compile:#{@name}:#{platf}"]
         task "compile" => ["compile:#{platf}"]
@@ -184,12 +192,15 @@ execute the Rake compilation task using the JRuby interpreter.
           end
         end
 
+        # lib_binary_path
+        lib_binary_path = "#{lib_path}/#{File.basename(binary(platform))}"
+
         # add binaries to the dependency chain
-        task "java:#{@gem_spec.name}" => ["#{lib_path}/#{binary(platform)}"]
+        task "java:#{@gem_spec.name}" => [lib_binary_path]
 
         # ensure the extension get copied
-        unless Rake::Task.task_defined?("#{lib_path}/#{binary(platform)}") then
-          file "#{lib_path}/#{binary(platform)}" => ["copy:#{name}:#{platform}"]
+        unless Rake::Task.task_defined?(lib_binary_path) then
+          file lib_binary_path => ["copy:#{name}:#{platform}"]
         end
 
         task 'java' => ["java:#{@gem_spec.name}"]
@@ -200,6 +211,14 @@ execute the Rake compilation task using the JRuby interpreter.
       end
     end
 
+    def java_target_args
+      if @release
+        ["--release=#{@release}"]
+      else
+        ["-target", @target_version, "-source", @source_version]
+      end
+    end
+
     #
     # Discover Java Extension Directories and build an extdirs arguments
     #

data/spec/lib/rake/extensiontask_spec.rb

@@ -456,14 +456,17 @@ describe Rake::ExtensionTask do
 
       it "should set required_ruby_version from RUBY_CC_VERSION, set platform, clear extensions but keep metadata" do
         platforms = ["x86-mingw32", "x64-mingw32"]
-        ruby_cc_versions = ["1.8.6", "2.1.10", "2.2.6", "2.3.3", "2.10.1"]
+        ruby_cc_versions = ["1.8.6", "2.1.10", "2.2.6", "2.3.3", "2.10.1", "2.11.0"]
         ENV["RUBY_CC_VERSION"] = ruby_cc_versions.join(":")
         config = Hash.new
         ruby_cc_versions.each do |ruby_cc_version|
           platforms.each do |platform|
+            unless platform == "x64-mingw32" && ruby_cc_version == "2.11.0"
+              rbconf = "/rubies/#{ruby_cc_version}/rbconfig.rb"
+            end
             allow(config).to receive(:[]).
               with("rbconfig-#{platform}-#{ruby_cc_version}").
-              and_return("/rubies/#{ruby_cc_version}/rbconfig.rb")
+              and_return(rbconf)
           end
         end
         allow(YAML).to receive(:load_file).and_return(config)
@@ -490,7 +493,7 @@ describe Rake::ExtensionTask do
         end
 
         expected_required_ruby_versions = [
-          Gem::Requirement.new([">= 1.8", "< 2.11.dev"]),
+          Gem::Requirement.new([">= 1.8", "< 2.12.dev"]),
           Gem::Requirement.new([">= 1.8", "< 2.11.dev"]),
         ]
         cross_specs.collect(&:required_ruby_version).should == expected_required_ruby_versions

data/spec/lib/rake/javaextensiontask_spec.rb

@@ -175,11 +175,13 @@ describe Rake::JavaExtensionTask do
       let(:extension) do
         Rake::JavaExtensionTask.new('extension_two') do |ext|
           ext.lint_option = lint_option if lint_option
+          ext.release = release if release
         end
       end
 
       context 'without a specified lint option' do
         let(:lint_option) { nil }
+        let(:release) { nil }
 
         it 'should honor the lint option' do
           (extension.lint_option).should be_falsey
@@ -189,12 +191,35 @@ describe Rake::JavaExtensionTask do
 
       context "with a specified lint option of 'deprecated'" do
         let(:lint_option) { 'deprecated'.freeze }
+        let(:release) { nil }
 
         it 'should honor the lint option' do
           (extension.lint_option).should eq lint_option
           (extension.send :java_lint_arg).should eq '-Xlint:deprecated'
         end
       end
+
+      context "without release option" do
+        let(:lint_option) { nil }
+        let(:release) { nil }
+
+        it 'should generate -target and -source build options' do
+          extension.target_version = "1.8"
+          extension.source_version = "1.8"
+          (extension.send :java_target_args).should eq ["-target", "1.8", "-source", "1.8"]
+        end
+      end
+
+      context "with release option" do
+        let(:lint_option) { nil }
+        let(:release) { '8' }
+
+        it 'should generate --release option even with target_version/source_version' do
+          extension.target_version = "1.8"
+          extension.source_version = "1.8"
+          (extension.send :java_target_args).should eq ["--release=8"]
+        end
+      end
     end
   end
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.9
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2022-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: Rake-based Ruby Extension (C, Java) task generator.