Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rake-compiler/rake-compiler
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.0
Choose a base ref
...
head repository: rake-compiler/rake-compiler
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.0.1
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 20, 2016

  1. Bump version

    kou committed Jun 20, 2016

    Verified

    This commit was signed with the committer’s verified signature.
    ljharb Jordan Harband
    Copy the full SHA
    4c231dc View commit details
  2. Add missing dependency

    kou committed Jun 20, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    5fa8111 View commit details
  3. Add 1.0.1 entry

    kou committed Jun 20, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    0cab1b3 View commit details
Showing with 12 additions and 6 deletions.
  1. +5 −0 History.txt
  2. +6 −5 lib/rake/extensiontask.rb
  3. +1 −1 tasks/gem.rake
5 changes: 5 additions & 0 deletions History.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
=== 1.0.1 / 2016-06-21

* Bugfixes:
* Add missing dependency.

=== 1.0.0 / 2016-06-21

* Enhancements:
11 changes: 6 additions & 5 deletions lib/rake/extensiontask.rb
Original file line number Diff line number Diff line change
@@ -135,25 +135,26 @@ def define_compile_tasks(for_platform = nil, ruby_ver = RUBY_VERSION)

# directories we need
directory tmp_path
directory tmp_binary_dir_path
directory lib_binary_dir_path
directory stage_binary_dir_path

# 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_path}/#{binary_path}"] do
install "#{tmp_path}/#{binary_path}", "#{lib_path}/#{binary_path}"
task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_binary_dir_path, tmp_binary_path] do
install tmp_binary_path, "#{lib_path}/#{binary_path}"
end
# copy binary from temporary location to staging directory
task "copy:#{@name}:#{platf}:#{ruby_ver}" => [stage_binary_dir_path, "#{tmp_path}/#{binary_path}"] do
cp "#{tmp_path}/#{binary_path}", stage_binary_path
task "copy:#{@name}:#{platf}:#{ruby_ver}" => [stage_binary_dir_path, tmp_binary_path] do
cp tmp_binary_path, stage_binary_path
end

# copy other gem files to staging directory
define_staging_file_tasks(@gem_spec.files, lib_path, stage_path, platf, ruby_ver) if @gem_spec

# binary in temporary folder depends on makefile and source files
# tmp/extension_name/extension_name.{so,bundle}
file "#{tmp_path}/#{binary_path}" => [tmp_binary_dir_path, "#{tmp_path}/Makefile"] + source_files do
file tmp_binary_path => [tmp_binary_dir_path, "#{tmp_path}/Makefile"] + source_files do
jruby_compile_msg = <<-EOF
Compiling a native C extension on JRuby. This is discouraged and a
Java extension should be preferred.
2 changes: 1 addition & 1 deletion tasks/gem.rake
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ require 'rubygems/package_task'
GEM_SPEC = Gem::Specification.new do |s|
# basic information
s.name = "rake-compiler"
s.version = "1.0.0"
s.version = "1.0.1"
s.platform = Gem::Platform::RUBY

# description and details