.github/workflows/release.yml

@@ -18,6 +18,8 @@ jobs:
             History.md > release-note.md
       - name: Upload to release
         run: |
-          gh release create \
+          gh release create ${GITHUB_REF_NAME} \
             --discussion-category Announcements \
-            --notes-file release-node.md
+            --notes-file release-note.md
+        env:
+          GH_TOKEN: ${{ github.token }}

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:

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'

lib/rake/baseextensiontask.rb

@@ -18,6 +18,7 @@ class BaseExtensionTask < TaskLib
     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 @@ def init(name = nil, gem_spec = nil)
       end
       @config_options = []
       @extra_options = ARGV.select { |i| i =~ /\A--?/ }
+      @extra_sources = FileList[]
     end
 
     def define
@@ -71,7 +73,7 @@ def binary(platform = nil)
     end
 
     def source_files
-      FileList["#{@ext_dir}/#{@source_pattern}"]
+      FileList["#{@ext_dir}/#{@source_pattern}"] + @extra_sources
     end
 
     def warn_once(message)

lib/rake/extensiontask.rb

@@ -199,7 +199,7 @@ def define_compile_tasks(for_platform = nil, ruby_ver = RUBY_VERSION)
         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 @@ def define_compile_tasks(for_platform = nil, ruby_ver = RUBY_VERSION)
         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
 

lib/rake/javaextensiontask.rb

@@ -212,7 +212,7 @@ def define_java_platform_tasks
     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 @@ def java_lint_arg
 
       "-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

rake-compiler.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   # basic information
   s.name        = "rake-compiler"
-  s.version     = "1.2.1"
+  s.version     = "1.2.2"
   s.platform    = Gem::Platform::RUBY
 
   # description and details

spec/lib/rake/extensiontask_spec.rb

@@ -58,6 +58,15 @@
         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