rake-compiler 1.1.3 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a440a2d8c83bb1c19ded360f560ed350a7872385ac1ecb3c00eed20243824a37
-  data.tar.gz: fb1a76fa0de52441b3307fb6a228b363581b1a10f1ead12340be380c88a21030
+  metadata.gz: 02cad822f10b4321127ce0c91ecb9ce1b7465897be75cb63864598f67a0862f9
+  data.tar.gz: e892ced800adc8b779b7a248f726590d2a9967c6efb95817778af4b51f650d4a
 SHA512:
-  metadata.gz: 3af072dc0c061056c366876d13a57fbaa9d219cf80b20733c6aecabd23cfeb99d174a8028fb06db0fb7190c51e7beb37c4731227553293b720ed0c2524856ce3
-  data.tar.gz: 827b37a381927c52dbf53e132aef924801339c6b441283f09a5708d0d80e234073cb7c0dc1957239ab65fc4ab59bafdccb95f7b3d08a212056f3cd2e19baea40
+  metadata.gz: b773ca5038495c9301561f7f093dd292a90c8987d71964234359e742e159e3dcceba66762a12c161a79b60c0d8eb55b2fc1d65dfb186a64b8905ea75148090f5
+  data.tar.gz: 281a93c3f8e00a01ede2150bff92f8898406fef693192d1a83710eb7e40c07e53229f91aeee8c661489a4901e81c702e8d55f667858f59ddeb47f8f93da75ab3

data/History.md

@@ -1,7 +1,30 @@
-### 1.1.3/ 2021-12-08
+### 1.1.7 / 2022-01-04
 
 * Fixes:
-  * Fix a bug that wrong install location is used.
+  * 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:
+  * Fix a regression bug that wrong install location is used when name that includes `/` is specified to `Rake::ExtensionTask.new`.
+    [#196](https://github.com/rake-compiler/rake-compiler/issues/196) [Reported by konsolebox]
+
+### 1.1.4 / 2021-12-11
+
+* Fixes:
+  * Fix a regression bug that installed gem can't be found on cross compile.
+    [#195](https://github.com/rake-compiler/rake-compiler/issues/195) [Reported by Mike Dalessio]
+
+### 1.1.3 / 2021-12-08
+
+* Fixes:
+  * Fix a regression bug that wrong install location is used.
     [#194](https://github.com/rake-compiler/rake-compiler/issues/194) [Reported by Andrew Kane]
 
 ### 1.1.2 / 2021-12-07

data/lib/rake/baseextensiontask.rb

@@ -40,6 +40,9 @@ module Rake
       @tmp_dir = 'tmp'
       @ext_dir = "ext/#{@name}"
       @lib_dir = 'lib'
+      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--?/ }
     end

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}"]
@@ -397,6 +404,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
@@ -416,8 +426,21 @@ Java extension should be preferred.
       # genearte fake.rb for different ruby versions
       file "#{tmp_path}/fake.rb" => [rbconfig_file] do |t|
         File.open(t.name, 'w') do |f|
-          f.write fake_rb(for_platform, ruby_ver)
-          f.write File.read(t.prerequisites.first)
+          # Keep the original RbConfig::CONFIG["ENABLE_SHARED"] to use
+          # the same RubyGems extension directory. See also
+          # Gem::BasicSpecificaion#extenions_dir and
+          # Gem.extension_api_version.
+          #
+          # if RbConfig::CONFIG["ENABLE_SHARED"] == "no"
+          #   "extensions/x86_64-linux/2.5.0-static"
+          # else
+          #   "extensions/x86_64-linux/2.5.0"
+          # end
+          f.puts("require 'rbconfig'")
+          f.puts("original_enable_shared = RbConfig::CONFIG['ENABLE_SHARED']")
+          f.puts(fake_rb(for_platform, ruby_ver))
+          f.puts(File.read(t.prerequisites.first))
+          f.puts("RbConfig::CONFIG['ENABLE_SHARED'] = original_enable_shared")
         end
       end
 
@@ -450,12 +473,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

@@ -53,15 +53,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 +75,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 +91,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
@@ -137,7 +142,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 +189,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}"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.7
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2022-01-03 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.