[DRE-commits] [SCM] rake-compiler.git branch, master, updated. debian/0.8.1-1-4-g36cf845

Youhei SASAKI uwabami at gfd-dennou.org
Sat Jan 19 21:36:09 UTC 2013 

The following commit has been merged in the master branch:
commit 88e8b32e2d200d03ea6ff44e40b8967929f19d5f
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Jan 20 06:34:04 2013 +0900

    Imported Upstream version 0.8.2
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/History.txt b/History.txt
index 3f3b0b0..6ed8f21 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,8 @@
+=== 0.8.2 / 2013-01-11
+
+* Bugfixes:
+  * Unset CC, LDFLAGS and CPPFLAGS prior cross-compiling. Closes #55
+
 === 0.8.1 / 2012-04-15
 
 * Bugfixes:
diff --git a/README.rdoc b/README.rdoc
index 337dacf..dfd3dab 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -69,6 +69,12 @@ contribute back to your project.
 Now the fun part. It's time to introduce the code to your projects Rakefile
 to tell it to use rake-compiler to build your extension:
 
+    # File: extconf.rb
+
+    # this line should already exist
+    create_makefile('hello_world')
+
+
     # File: Rakefile
 
     require 'rake/extensiontask'
@@ -78,6 +84,12 @@ to tell it to use rake-compiler to build your extension:
 That's it? Yes, that's it! No other lines of code are needed for
 rake-compiler to work its magic.
 
+Though, you need to make sure the parameter to <tt>create_makefile</tt>
+and <tt>ExtensionTask.new</tt> are the same or rake-compiler will not mimic
+the RubyGems standard install process. You can override this standard
+behaviour if needed, see the instructions for "non-standard project structure"
+below for details.
+
 If you want to do the same for a JRuby extension written in Java, it's just
 as easy:
 
diff --git a/debian/changelog b/debian/changelog
index 57f8a16..a8098e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+rake-compiler (0.8.2-1) experimental; urgency=low
+
+  * Imported Upstream version 0.8.2
+  * Drop rubygems from Build-Depends
+  * Add require-rubygems.overrides, drop IGNORE-TESTS
+  * Format URI update: DEP5 -> Formant/1.0
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Sun, 20 Jan 2013 06:32:25 +0900
+
 rake-compiler (0.8.1-1) unstable; urgency=low
 
   * Initial release (Closes: #672499)
diff --git a/features/cross-compile.feature b/features/cross-compile.feature
index 4c98053..2f5d296 100644
--- a/features/cross-compile.feature
+++ b/features/cross-compile.feature
@@ -16,7 +16,7 @@ Feature: Cross-compile C extensions
     Given that all my source files are in place
     And I'm running a POSIX operating system
     And I've installed cross compile toolchain
-    When rake task 'cross compile RUBY_CC_VERSION=1.8.7:1.9.2' is invoked
-    Then rake task 'cross compile RUBY_CC_VERSION=1.8.7:1.9.2' succeeded
+    When rake task 'cross compile RUBY_CC_VERSION=1.8.7:1.9.3' is invoked
+    Then rake task 'cross compile RUBY_CC_VERSION=1.8.7:1.9.3' succeeded
     And binaries for platform 'i386-mingw32' version '1.8' get copied
     And binaries for platform 'i386-mingw32' version '1.9' get copied
diff --git a/features/step_definitions/cross_compilation.rb b/features/step_definitions/cross_compilation.rb
index 9851cce..46242aa 100644
--- a/features/step_definitions/cross_compilation.rb
+++ b/features/step_definitions/cross_compilation.rb
@@ -6,7 +6,9 @@ Given %r{^I'm running a POSIX operating system$} do
 end
 
 Given %r{^I've installed cross compile toolchain$} do
-  pending 'Cannot locate suitable compiler in the PATH.' unless search_path(%w(i586-mingw32msvc-gcc i386-mingw32-gcc))
+  unless search_path(%w(i586-mingw32msvc-gcc i386-mingw32-gcc i686-w64-mingw32-gcc))
+    pending 'Cannot locate suitable compiler in the PATH.'
+  end
 end
 
 Then /^binaries for platform '(.*)' get generated$/ do |platform|
diff --git a/features/step_definitions/gem.rb b/features/step_definitions/gem.rb
index e22dc68..8989078 100644
--- a/features/step_definitions/gem.rb
+++ b/features/step_definitions/gem.rb
@@ -25,7 +25,7 @@ Then /^a gem for '(.*)' version '(.*)' platform '(.*)' do exist in '(.*)'$/ do |
 end
 
 Then /^gem for platform '(.*)' get generated$/ do |platform|
-  Then "a gem for 'gem_abc' version '0.1.0' platform '#{platform}' do exist in 'pkg'"
+  step "a gem for 'gem_abc' version '0.1.0' platform '#{platform}' do exist in 'pkg'"
 end
 
 def gem_file(folder, name, version)
diff --git a/lib/rake/baseextensiontask.rb b/lib/rake/baseextensiontask.rb
index 20a6eeb..aabca51 100644
--- a/lib/rake/baseextensiontask.rb
+++ b/lib/rake/baseextensiontask.rb
@@ -73,7 +73,7 @@ module Rake
     end
 
     def source_files
-      @source_files ||= FileList["#{@ext_dir}/#{@source_pattern}"]
+      FileList["#{@ext_dir}/#{@source_pattern}"]
     end
 
     def warn_once(message)
diff --git a/lib/rake/extensiontask.rb b/lib/rake/extensiontask.rb
old mode 100644
new mode 100755
diff --git a/metadata.yml b/metadata.yml
index 0322cbe..f07f39a 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,61 +1,81 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rake-compiler
-version: !ruby/object:Gem::Version
-  version: 0.8.1
+version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 2
+  version: 0.8.2
 platform: ruby
-authors:
+authors: 
 - Luis Lavena
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &23703696 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *23703696
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &23703396 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
   type: :development
-  prerelease: false
-  version_requirements: *23703396
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &23703120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 1
+        - 4
         version: 1.1.4
   type: :development
-  prerelease: false
-  version_requirements: *23703120
-description: ! 'Provide a standard and simplified way to build and package
-
-  Ruby extensions (C, Java) using Rake as glue.'
+  version_requirements: *id003
+description: |-
+  Provide a standard and simplified way to build and package
+  Ruby extensions (C, Java) using Rake as glue.
 email: luislavena at gmail.com
-executables:
+executables: 
 - rake-compiler
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
 - LICENSE.txt
 - History.txt
-files:
+files: 
 - features/compile.feature
 - features/cross-compile.feature
 - features/cross-package-multi.feature
@@ -99,32 +119,44 @@ files:
 - LICENSE.txt
 - cucumber.yml
 homepage: http://github.com/luislavena/rake-compiler
-licenses:
+licenses: 
 - MIT
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
 - --title
 - rake-compiler -- Documentation
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 17
+      segments: 
+      - 1
+      - 3
+      - 5
       version: 1.3.5
 requirements: []
+
 rubyforge_project: rake-compiler
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rake-based Ruby Extension (C, Java) task generator.
 test_files: []
+
diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
index 87f76af..8a14fbc 100644
--- a/tasks/bin/cross-ruby.rake
+++ b/tasks/bin/cross-ruby.rake
@@ -53,6 +53,11 @@ MAJOR = RUBY_CC_VERSION.match(/.*-(\d.\d).\d/)[1]
 MINGW_HOST = ENV['HOST'] || Rake::ExtensionCompiler.mingw_host
 MINGW_TARGET = MINGW_HOST.gsub('msvc', '')
 
+# Unset any possible variable that might affect compilation
+["CC", "CXX", "CPPFLAGS", "LDFLAGS", "RUBYOPT"].each do |var|
+  ENV.delete(var)
+end
+
 # define a location where sources will be stored
 directory "#{USER_HOME}/sources/#{RUBY_CC_VERSION}"
 directory "#{USER_HOME}/builds/#{RUBY_CC_VERSION}"
diff --git a/tasks/gem.rake b/tasks/gem.rake
index 5090d24..296b834 100644
--- a/tasks/gem.rake
+++ b/tasks/gem.rake
@@ -3,7 +3,7 @@ require 'rubygems/package_task'
 GEM_SPEC = Gem::Specification.new do |s|
   # basic information
   s.name        = "rake-compiler"
-  s.version     = "0.8.1"
+  s.version     = "0.8.2"
   s.platform    = Gem::Platform::RUBY
 
   # description and details

-- 
rake-compiler.git

More information about the Pkg-ruby-extras-commits mailing list