rake-compiler 0.7.0 → 0.7.1

data/History.txt

@@ -1,3 +1,15 @@
+=== 0.7.1 / 2010-08-07
+
+* Bugfixes:
+  * Update gem files to make "gem install -t" works. Closes GH-14
+  * Update mocks to work under 1.8.7. Closes GH-15 [luisparravicini]
+  * Do not allow cross-ruby be executed under Windows. Closes GH-22
+
+* Experimental:
+  * Allow JRuby to compile C extensions [timfel].
+    It is now possible compile C extensions using latest JRuby. Offered
+    in experimental mode since JRuby cext hasn't been officially released.
+
 === 0.7.0 / 2009-12-08
 
 * Enhancements
@@ -65,12 +77,12 @@
   * Allow simultaneous versions of Ruby to compile extensions.
     This change allow 1.8.x compiles co-exist with 1.9.x ones
     and don't override each other.
-    
+
     Please perform <tt>rake clobber</tt> prior compiling again.
   * Allow optional source file URL for cross-compile tasks.
     (Thanks to deepj for the patches)
 
-      rake-compiler cross-ruby VERSION=1.9.1-p0 SOURCE=http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-p0.tar.bz2 
+      rake-compiler cross-ruby VERSION=1.9.1-p0 SOURCE=http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-p0.tar.bz2
 
 * Bugfixes
   * Removed strict versioning for gems since it clash with fat binaries.
@@ -136,7 +148,7 @@
 === 0.3.0 / 2008-12-07
 
 * New features
-  * Let you specify the Ruby version used for cross compilation instead 
+  * Let you specify the Ruby version used for cross compilation instead
     of default one.
 
       rake cross compile RUBY_CC_VERSION=1.8

data/lib/rake/extensiontask.rb

@@ -32,8 +32,20 @@ module Rake
       @cross_compiling = block if block_given?
     end
 
+    def binary(platform = nil)
+      if platform == "java"
+	warn_once <<-EOF
+Compiling a native C extension on JRuby. This is discouraged and a 
+Java extension should be preferred.
+        EOF
+        "#{name}.#{RbConfig::MAKEFILE_CONFIG['DLEXT']}"
+      else
+        super
+      end
+    end
+
     def define
-      if RUBY_PLATFORM == 'java' || (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby')
+      if (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby')
         warn_once <<-EOF
 WARNING: You're attempting to (cross-)compile C extensions from a platform
 (#{RUBY_ENGINE}) that does not support native extensions or mkmf.rb.
@@ -337,12 +349,18 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
           if RUBY_PLATFORM =~ /mswin/ then
             'nmake'
           else
-            ENV['MAKE'] || %w[gmake make].find { |c| system(c, '-v') }
+            ENV['MAKE'] || %w[gmake make].find { |c|
+              system("#{c} -v >> #{dev_null} 2>&1")
+            }
           end
       end
       @make
     end
 
+    def dev_null
+      windows? ? 'NUL' : '/dev/null'
+    end
+
     def source_files
      @source_files ||= FileList["#{@ext_dir}/#{@source_pattern}"]
     end

data/spec/lib/rake/extensiontask_spec.rb

@@ -439,6 +439,7 @@ describe Rake::ExtensionTask do
   def mock_config_yml
     {
       'rbconfig-1.8.6' => '/some/path/version/1.8/to/rbconfig.rb',
+      'rbconfig-1.8.7' => '/some/path/version/1.8/to/rbconfig.rb',
       'rbconfig-1.9.1' => '/some/path/version/1.9.1/to/rbconfig.rb',
       'rbconfig-3.0.0' => '/some/fake/version/3.0.0/to/rbconfig.rb'
     }

data/spec/spec.opts

@@ -0,0 +1,3 @@
+--colour
+--format nested
+--loadby mtime

data/tasks/bin/cross-ruby.rake

@@ -26,6 +26,11 @@ require 'yaml'
 libdir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
+if RUBY_PLATFORM =~ /mingw|mswin/ then
+  puts "This command is meant to be executed under Linux or OSX, not Windows (is for cross-compilation)"
+  exit(1)
+end
+
 require 'rake/extensioncompiler'
 
 MAKE = ENV['MAKE'] || %w[gmake make].find { |c| system(c, '-v') }
@@ -161,7 +166,7 @@ task 'update-config' do
     config = {}
   end
 
-  files = Dir.glob("#{USER_HOME}/ruby/**/rbconfig.rb").sort
+  files = Dir.glob("#{USER_HOME}/ruby/*/**/rbconfig.rb").sort
 
   files.each do |rbconfig|
     version = rbconfig.match(/.*-(\d.\d.\d)/)[1]

data/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.7.0"
+  s.version     = "0.7.1"
   s.platform    = Gem::Platform::RUBY
 
   # description and details
@@ -24,8 +24,8 @@ GEM_SPEC = Gem::Specification.new do |s|
 
   # components, files and paths
   s.files = FileList["features/**/*.{feature,rb}", "bin/rake-compiler",
-                      "lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake",
-                      "Rakefile", "*.{rdoc,txt,yml}"]
+                      "lib/**/*.rb", "spec/spec.opts", "spec/**/*.rb",
+                      "tasks/**/*.rake", "Rakefile", "*.{rdoc,txt,yml}"]
 
   s.bindir      = 'bin'
   s.executables = ['rake-compiler']

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rake-compiler
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  hash: 1
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Luis Lavena
@@ -9,42 +15,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 -03:00
+date: 2010-08-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 8
+        - 3
         version: 0.8.3
     - - <
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 4
+        - 4
         version: 0.4.4
-    version: 
+  type: :development
+  version_requirements: *id003
 description: |-
   Provide a standard and simplified way to build and package
   Ruby extensions (C, Java) using Rake as glue.
@@ -81,6 +109,7 @@ files:
 - lib/rake/extensioncompiler.rb
 - lib/rake/extensiontask.rb
 - lib/rake/javaextensiontask.rb
+- spec/spec.opts
 - spec/lib/rake/extensiontask_spec.rb
 - spec/lib/rake/javaextensiontask_spec.rb
 - spec/spec_helper.rb
@@ -112,21 +141,31 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 17
+      segments: 
+      - 1
+      - 3
+      - 5
       version: 1.3.5
-  version: 
 requirements: []
 
 rubyforge_project: rake-compiler
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rake-based Ruby Extension (C, Java) task generator.