rake-compiler 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 530d28062d0a6bc7601e7aec15adba736048594ad4e0026dff17594f4462a2ca
-  data.tar.gz: 94dea28437dd1dedaef5a48f7eb13672102bc11d43a371e755d593126cac20b7
+  metadata.gz: 1307a1f8d635b6fa407ce62a9e301a9d2ccfb358fb77e3ed85c3d22492fd6a1e
+  data.tar.gz: d562c91bfee82d65d39b67b118c9b9395e33be402b2c41058d4251ae2e88a37f
 SHA512:
-  metadata.gz: 8c4066120b1718f19299eacfee717a8efd7ca381078124e38107b372f3925791b9016aa6048bd773c6aebf6875e94937cb5eff38365e759c665102e6f55e8b1f
-  data.tar.gz: 804376554f6efa4c5b4e62b28b2d18cbffb0273c0de6e0bbc3fb7674dc4669a1bab83e121c3dd2bb1f5c1a1cffc89b5977ca96410c7599b589affbe075c0abd9
+  metadata.gz: 1d1c34c803284711dff655cd8b4d7a34766d1ade90556ffeed111349777c67e143a55705bda5bce95f6629c2bc45a7e528da666f20595cb45c7e2986ee3c9269
+  data.tar.gz: dfabaa0805a27ee2150a406a2e7e26c6345ea279866e271c1936ab95b8090a0bb6fa0919a42509ae4d6652e8d249a694c4b70b7ace351335afb7cbace8fa7cf8

data/History.md

@@ -1,3 +1,23 @@
+### 1.2.2 / 2023-05-25
+
+* Enhancements:
+  * GH-211: Added `extra_sources` that is for dynamic sources.
+    [Patch by James Tucker]
+  * GH-213: Stopped using `--release` on Java 8.
+    [Patch by James Pavel Rosický]
+  * GH-215: Added support for extra options with space.
+    [Reported by Jun Aruga]
+
+* Fixes:
+  * GH-211: Fixed a typo in documentation.
+    [Patch by Jan-Benedikt Jagusch]
+
+* Thanks:
+  * James Tucker
+  * Jan-Benedikt Jagusch
+  * Pavel Rosický
+  * Jun Aruga
+
 ### 1.2.1 / 2022-12-16
 
 * Enhancements:

data/README.md

@@ -349,7 +349,7 @@ Now, you only need specify a few additional options in your extension definition
       # platform build, with platform-specific options in a hash.
       ext.cross_config_options << '--with-common-option'
       ext.cross_config_options << {
-        'x86-mswin32-60 => '--with-some-option',
+        'x86-mswin32-60' => '--with-some-option',
         'x64-mingw32'   => '--enable-64bits',
       }
       ext.cross_config_options << '--with-final-option'

data/lib/rake/baseextensiontask.rb

@@ -18,6 +18,7 @@ module Rake
     attr_accessor :config_options
     attr_accessor :source_pattern
     attr_accessor :extra_options
+    attr_accessor :extra_sources
     attr_writer :platform
 
     def platform
@@ -41,6 +42,7 @@ module Rake
       end
       @config_options = []
       @extra_options = ARGV.select { |i| i =~ /\A--?/ }
+      @extra_sources = FileList[]
     end
 
     def define
@@ -71,7 +73,7 @@ module Rake
     end
 
     def source_files
-      FileList["#{@ext_dir}/#{@source_pattern}"]
+      FileList["#{@ext_dir}/#{@source_pattern}"] + @extra_sources
     end
 
     def warn_once(message)

data/lib/rake/extensiontask.rb

@@ -199,7 +199,7 @@ Java extension should be preferred.
         abs_extconf = (Pathname.new(Dir.pwd) + extconf).realpath
 
         # now add the extconf script
-        cmd << abs_extconf.relative_path_from(abs_tmp_path)
+        cmd << abs_extconf.relative_path_from(abs_tmp_path).to_s
 
         # fake.rb will be present if we are cross compiling
         if t.prerequisites.include?("#{tmp_path}/fake.rb") then
@@ -215,9 +215,7 @@ Java extension should be preferred.
         end
 
         chdir tmp_path do
-          # FIXME: Rake is broken for multiple arguments system() calls.
-          # Add current directory to the search path of Ruby
-          sh cmd.join(' ')
+          sh *cmd
         end
       end
 

data/lib/rake/javaextensiontask.rb

@@ -212,7 +212,7 @@ execute the Rake compilation task using the JRuby interpreter.
     end
 
     def java_target_args
-      if @release
+      if @release && release_flag_supported?
         ["--release=#{@release}"]
       else
         ["-target", @target_version, "-source", @source_version]
@@ -303,5 +303,11 @@ execute the Rake compilation task using the JRuby interpreter.
 
       "-Xlint:#{@lint_option}"
     end
+
+    def release_flag_supported?
+      return true unless RUBY_PLATFORM =~ /java/
+      
+      Gem::Version.new(Java::java.lang.System.getProperty('java.version')) >= Gem::Version.new("9")
+    end
   end
 end

data/spec/lib/rake/extensiontask_spec.rb

@@ -58,6 +58,15 @@ describe Rake::ExtensionTask do
         end
         ext.platform.should == 'universal-foo-bar-10.5'
       end
+
+      it 'should allow extra sources to be added' do
+        ext = Rake::ExtensionTask.new('extension_one') do |ext|
+          ext.extra_sources << 'extra.c'
+        end
+        ext.extra_sources.should include('extra.c')
+        # Private API between the base task and the extension task
+        ext.send(:source_files).should include('extra.c')
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-16 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Rake-based Ruby Extension (C, Java) task generator.