rake-compiler 1.1.5 → 1.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/History.md +5 -0
- data/lib/rake/baseextensiontask.rb +2 -2
- data/lib/rake/extensiontask.rb +4 -7
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: caf70af8b4cadce86d509ce209540e29eb74ad29c1774c2941671b285d805b2b
|
4
|
+
data.tar.gz: 0fedb5d1269d3e6b4cdfa22b4e587f2a39465adf1f43d536a20e55b32fca045a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b8311e1465dcb310b9cf4623785358572ed510ce81ebd3bcea463ee1fb9fa0c912b642db4467adb5c4ecef462a934562c3551bb7b81e296ce5872374095e760b
|
7
|
+
data.tar.gz: 69bbd41d23b832b735d97ecb709dbb5a28c8a7ffeafcfb6b0615fce44c1ad1cb4702742bc1971baaaefde78dcd47408ba311b24c0456ef64ae53fe7c7542fd6e
|
data/History.md
CHANGED
@@ -40,8 +40,8 @@ module Rake
|
|
40
40
|
@tmp_dir = 'tmp'
|
41
41
|
@ext_dir = "ext/#{@name}"
|
42
42
|
@lib_dir = 'lib'
|
43
|
-
if @name and File.dirname(@name) != "."
|
44
|
-
@lib_dir += "/#{File.dirname(@name)}"
|
43
|
+
if @name and File.dirname(@name.to_s) != "."
|
44
|
+
@lib_dir += "/#{File.dirname(@name.to_s)}"
|
45
45
|
end
|
46
46
|
@config_options = []
|
47
47
|
@extra_options = ARGV.select { |i| i =~ /\A--?/ }
|
data/lib/rake/extensiontask.rb
CHANGED
@@ -109,9 +109,6 @@ module Rake
|
|
109
109
|
# lib_path
|
110
110
|
lib_path = lib_dir
|
111
111
|
|
112
|
-
lib_binary_path = "#{lib_path}/#{binary_path}"
|
113
|
-
lib_binary_dir_path = File.dirname(lib_binary_path)
|
114
|
-
|
115
112
|
# tmp_path
|
116
113
|
tmp_path = "#{@tmp_dir}/#{platf}/#{@name}/#{ruby_ver}"
|
117
114
|
stage_path = "#{@tmp_dir}/#{platf}/stage"
|
@@ -131,7 +128,7 @@ module Rake
|
|
131
128
|
# directories we need
|
132
129
|
directory tmp_path
|
133
130
|
directory tmp_binary_dir_path
|
134
|
-
directory
|
131
|
+
directory lib_path
|
135
132
|
directory stage_binary_dir_path
|
136
133
|
|
137
134
|
directory File.dirname(siteconf_path)
|
@@ -150,7 +147,7 @@ module Rake
|
|
150
147
|
|
151
148
|
# copy binary from temporary location to final lib
|
152
149
|
# tmp/extension_name/extension_name.{so,bundle} => lib/
|
153
|
-
task "copy:#{@name}:#{platf}:#{ruby_ver}" => [
|
150
|
+
task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_path, tmp_binary_path, "#{tmp_path}/Makefile"] do
|
154
151
|
# install in lib for native platform only
|
155
152
|
unless for_platform
|
156
153
|
sh "#{make} install target_prefix=", chdir: tmp_path
|
@@ -237,7 +234,7 @@ Java extension should be preferred.
|
|
237
234
|
# platform matches the indicated one.
|
238
235
|
if platf == RUBY_PLATFORM then
|
239
236
|
# ensure file is always copied
|
240
|
-
file "#{lib_path}/#{binary_path}" => ["copy:#{name}:#{platf}:#{ruby_ver}"]
|
237
|
+
file "#{lib_path}/#{File.basename(binary_path)}" => ["copy:#{name}:#{platf}:#{ruby_ver}"]
|
241
238
|
|
242
239
|
task "compile:#{@name}" => ["compile:#{@name}:#{platf}"]
|
243
240
|
task "compile" => ["compile:#{platf}"]
|
@@ -468,7 +465,7 @@ Java extension should be preferred.
|
|
468
465
|
end
|
469
466
|
|
470
467
|
# FIXME: targeting multiple platforms copies the file twice
|
471
|
-
file "#{lib_path}/#{binary(for_platform)}" => ["copy:#{@name}:#{for_platform}:#{ruby_ver}"]
|
468
|
+
file "#{lib_path}/#{File.basename(binary(for_platform))}" => ["copy:#{@name}:#{for_platform}:#{ruby_ver}"]
|
472
469
|
|
473
470
|
# if everything for native task is in place
|
474
471
|
if @gem_spec && @gem_spec.platform == 'ruby' then
|