rake-compiler 1.1.2 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83d5f854b75073d4180da9ece3502bb86995335a52e8b59a83212ec70b08206d
-  data.tar.gz: cd2840623dd94c1377ad5c9304e19fc37907af1e4f5fb3cb8ce3011e80e9729e
+  metadata.gz: caf70af8b4cadce86d509ce209540e29eb74ad29c1774c2941671b285d805b2b
+  data.tar.gz: 0fedb5d1269d3e6b4cdfa22b4e587f2a39465adf1f43d536a20e55b32fca045a
 SHA512:
-  metadata.gz: 02e09a4a2ee0fb199d54f6f063225be7a731abb7752b2cdd3eb05f409b0bac16c0dc32c5222b4167b3a4b39507093ce5fd6a1e3eb5012c5d77233423ecabbb3b
-  data.tar.gz: ff48af6c3b541170420f5c3351ab328052219fb906052d7813923975c231245c8613f212ce7e6e88ff63ccb8d0f5191a5a03935c382b53885db4e7d858800f8f
+  metadata.gz: b8311e1465dcb310b9cf4623785358572ed510ce81ebd3bcea463ee1fb9fa0c912b642db4467adb5c4ecef462a934562c3551bb7b81e296ce5872374095e760b
+  data.tar.gz: 69bbd41d23b832b735d97ecb709dbb5a28c8a7ffeafcfb6b0615fce44c1ad1cb4702742bc1971baaaefde78dcd47408ba311b24c0456ef64ae53fe7c7542fd6e

data/History.md

@@ -1,3 +1,26 @@
+### 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
 
 * Changes:

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

@@ -109,9 +109,6 @@ module Rake
       # lib_path
       lib_path = lib_dir
 
-      lib_binary_path = "#{lib_path}/#{binary_path}"
-      lib_binary_dir_path = File.dirname(lib_binary_path)
-
       # tmp_path
       tmp_path = "#{@tmp_dir}/#{platf}/#{@name}/#{ruby_ver}"
       stage_path = "#{@tmp_dir}/#{platf}/stage"
@@ -131,7 +128,7 @@ module Rake
       # 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,10 +147,10 @@ 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", chdir: tmp_path
+          sh "#{make} install target_prefix=", chdir: tmp_path
         end
       end
       # copy binary from temporary location to staging directory
@@ -237,7 +234,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_path}/#{File.basename(binary_path)}" => ["copy:#{name}:#{platf}:#{ruby_ver}"]
 
         task "compile:#{@name}" => ["compile:#{@name}:#{platf}"]
         task "compile" => ["compile:#{platf}"]
@@ -416,8 +413,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
 
@@ -455,7 +465,7 @@ Java extension should be preferred.
         end
 
         # FIXME: targeting multiple platforms copies the file twice
-        file "#{lib_path}/#{binary(for_platform)}" => ["copy:#{@name}:#{for_platform}:#{ruby_ver}"]
+        file "#{lib_path}/#{File.basename(binary(for_platform))}" => ["copy:#{@name}:#{for_platform}:#{ruby_ver}"]
 
         # if everything for native task is in place
         if @gem_spec && @gem_spec.platform == 'ruby' then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.6
 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: 2021-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake