rake-compiler 0.7.7 → 0.7.8

data/History.txt

@@ -1,3 +1,20 @@
+=== 0.7.8 / 2011-04-26
+
+* Enhancements:
+  * Bump default cross-ruby version to 1.8.7-p334.
+  * ExtensionTask now support config_includes to load additional directories.
+    [jfinkhaeuser]
+
+    Rake::ExtensionTask.new("myext", GEM_SPEC) do |ext|
+      ext.config_includes << File.expand_path("my", "custom", "dir")
+    end
+
+* Bugfixes:
+  * Warn if compiled files exists in extension's source directory. Closes GH-35
+  * Workaround issue with WINE using proper build option. Closes GH-37
+  * Use FileUtils#install instead of cp. Closes GH-33 [Eric Wong]
+  * Update README instructions for OSX. Closes GH-29 [tmm1]
+
 === 0.7.7 / 2011-04-04
 
 * Bugfixes:

data/README.rdoc

@@ -223,8 +223,26 @@ host machines, a simple <tt>apt-get install mingw32</tt> will be enough.
 
 On Arch, <tt>mingw32</tt> is installed by running <tt>pacman -S mingw32-gcc</tt>
 
-On OSX, <tt>mingw32</tt> is available via MacPorts via <tt>port install i386-mingw32-gcc</tt>
-(ensure your ports tree is updated as <tt>mingw32</tt> has been broken in the past).
+On OSX, we no longer recommend the usage of MacPorts <tt>mingw32</tt> package because
+it stagnated in GCC version 3.4.5.
+
+Instead we recommend you download mingw-w64 automated build packages available at
+SourceForge:
+
+http://sourceforge.net/downloads/mingw-w64/
+
+Browse into <em>Toolchains targetting Win32</em> and then <em>Automated Builds</em>.
+
+Files will be ordered by recency, find the latest one with version 1.0 in it,
+like this one:
+
+  mingw-w32-1.0-bin_i686-darwin_20110422.tar.bz2
+
+Download and extract. After that, make sure the bin directory is added to the PATH, eg:
+
+  export PATH=~/mingw-w64/w32/bin:$PATH
+
+You can add this to your <tt>.profile</tt> to avoid the repitition.
 
 === I've got my tool-chain installed, now what?
 

data/lib/rake/extensiontask.rb

@@ -13,15 +13,18 @@ module Rake
     attr_accessor :cross_platform
     attr_accessor :cross_config_options
     attr_accessor :no_native
+    attr_accessor :config_includes
 
     def init(name = nil, gem_spec = nil)
       super
       @config_script = 'extconf.rb'
       @source_pattern = "*.c"
+      @compiled_pattern = "*.{o,obj,so,bundle,dSYM}"
       @cross_compile = false
       @cross_config_options = []
       @cross_compiling = nil
       @no_native = false
+      @config_includes = []
     end
 
     def cross_platform
@@ -56,6 +59,10 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
 
       super
 
+      unless compiled_files.empty?
+        warn "WARNING: rake-compiler found compiled files in '#{@ext_dir}' directory. Please remove them."
+      end
+
       # only gems with 'ruby' platforms are allowed to define native tasks
       define_native_tasks if !@no_native && (@gem_spec && @gem_spec.platform == 'ruby')
 
@@ -92,7 +99,7 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
       # copy binary from temporary location to final lib
       # tmp/extension_name/extension_name.{so,bundle} => lib/
       task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_path, "#{tmp_path}/#{binary(platf)}"] do
-        cp "#{tmp_path}/#{binary(platf)}", "#{lib_path}/#{binary(platf)}"
+        install "#{tmp_path}/#{binary(platf)}", "#{lib_path}/#{binary(platf)}"
       end
 
       # binary in temporary folder depends on makefile and source files
@@ -109,7 +116,8 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
         options = @config_options.dup
 
         # include current directory
-        cmd = [Gem.ruby, '-I.']
+        include_dirs = ['.'].concat(@config_includes).uniq.join(File::PATH_SEPARATOR)
+        cmd = [Gem.ruby, "-I#{include_dirs}"]
 
         # if fake.rb is present, add to the command line
         if t.prerequisites.include?("#{tmp_path}/fake.rb") then
@@ -361,8 +369,8 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
       windows? ? 'NUL' : '/dev/null'
     end
 
-    def source_files
-     @source_files ||= FileList["#{@ext_dir}/#{@source_pattern}"]
+    def compiled_files
+      FileList["#{@ext_dir}/#{@compiled_pattern}"]
     end
 
     def compiles_cross_platform

data/lib/rake/javaextensiontask.rb

@@ -64,7 +64,7 @@ module Rake
       # copy binary from temporary location to final lib
       # tmp/extension_name/extension_name.{so,bundle} => lib/
       task "copy:#{@name}:#{platf}" => [lib_path, "#{tmp_path}/#{binary(platf)}"] do
-        cp "#{tmp_path}/#{binary(platf)}", "#{lib_path}/#{binary(platf)}"
+        install "#{tmp_path}/#{binary(platf)}", "#{lib_path}/#{binary(platf)}"
       end
 
       not_jruby_compile_msg = <<-EOF

data/spec/lib/rake/extensiontask_spec.rb

@@ -80,6 +80,10 @@ describe Rake::ExtensionTask do
       @ext.config_options.should be_empty
     end
 
+    it "should have no includes preset to delegate" do
+      @ext.config_includes.should be_empty
+    end
+
     it 'should default to current platform' do
       @ext.platform.should == RUBY_PLATFORM
     end
@@ -106,7 +110,7 @@ describe Rake::ExtensionTask do
 
     context '(one extension)' do
       before :each do
-        Rake::FileList.stub!(:[]).and_return(["ext/extension_one/source.c"])
+        Rake::FileList.stub!(:[]).and_return(["ext/extension_one/source.c"], [])
         @ext = Rake::ExtensionTask.new('extension_one')
         @ext_bin = ext_bin('extension_one')
         @platform = RUBY_PLATFORM
@@ -190,11 +194,22 @@ describe Rake::ExtensionTask do
           CLOBBER.should include('tmp')
         end
       end
+
+      it "should warn when pre-compiled files exist in extension directory" do
+        Rake::FileList.stub!(:[]).
+          and_return(["ext/extension_one/source.c"],
+                      ["ext/extension_one/source.o"])
+
+        _, err = capture_output do
+          Rake::ExtensionTask.new('extension_one')
+        end
+        err.should match(/rake-compiler found compiled files in 'ext\/extension_one' directory. Please remove them./)
+      end
     end
 
     context '(extension in custom location)' do
       before :each do
-        Rake::FileList.stub!(:[]).and_return(["ext/extension_one/source.c"])
+        Rake::FileList.stub!(:[]).and_return(["ext/extension_one/source.c"], [])
         @ext = Rake::ExtensionTask.new('extension_one') do |ext|
           ext.ext_dir = 'custom/ext/foo'
         end
@@ -212,7 +227,7 @@ describe Rake::ExtensionTask do
 
     context '(native tasks)' do
       before :each do
-        Rake::FileList.stub!(:[]).and_return(["ext/extension_one/source.c"])
+        Rake::FileList.stub!(:[]).and_return(["ext/extension_one/source.c"], [])
         @spec = mock_gem_spec
         @ext_bin = ext_bin('extension_one')
         @platform = RUBY_PLATFORM
@@ -259,7 +274,7 @@ describe Rake::ExtensionTask do
       before :each do
         File.stub!(:exist?).and_return(true)
         YAML.stub!(:load_file).and_return(mock_config_yml)
-        Rake::FileList.stub!(:[]).and_return(["ext/extension_one/source.c"])
+        Rake::FileList.stub!(:[]).and_return(["ext/extension_one/source.c"], [])
         @spec = mock_gem_spec
         @config_file = File.expand_path("~/.rake-compiler/config.yml")
         @ruby_ver = RUBY_VERSION

data/tasks/bin/cross-ruby.rake

@@ -26,6 +26,7 @@ rescue LoadError
 end
 
 require 'yaml'
+require "rbconfig"
 
 # load compiler helpers
 # add lib directory to the search path
@@ -41,8 +42,9 @@ require 'rake/extensioncompiler'
 
 MAKE = ENV['MAKE'] || %w[gmake make].find { |c| system("#{c} -v > /dev/null 2>&1") }
 USER_HOME = File.expand_path("~/.rake-compiler")
-RUBY_CC_VERSION = "ruby-#{ENV['VERSION'] || '1.8.6-p398'}"
+RUBY_CC_VERSION = "ruby-" << ENV.fetch("VERSION", "1.8.7-p334")
 RUBY_SOURCE = ENV['SOURCE']
+RUBY_BUILD = RbConfig::CONFIG["host"]
 
 # grab the major "1.8" or "1.9" part of the version number
 MAJOR = RUBY_CC_VERSION.match(/.*-(\d.\d).\d/)[1]
@@ -125,6 +127,7 @@ file "#{USER_HOME}/builds/#{RUBY_CC_VERSION}/Makefile" => ["#{USER_HOME}/builds/
   options = [
     "--host=#{MINGW_HOST}",
     "--target=#{MINGW_TARGET}",
+    "--build=#{RUBY_BUILD}",
     '--enable-shared',
     '--disable-install-doc',
     '--without-tk',

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.7"
+  s.version     = "0.7.8"
   s.platform    = Gem::Platform::RUBY
 
   # description and details
@@ -34,7 +34,6 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   # documentation
-  s.has_rdoc = true
   s.rdoc_options << '--main'  << 'README.rdoc' << '--title' << 'rake-compiler -- Documentation'
 
   s.extra_rdoc_files = %w(README.rdoc LICENSE.txt History.txt)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rake-compiler
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 7
-  - 7
-  version: 0.7.7
+  - 8
+  version: 0.7.8
 platform: ruby
 authors: 
 - Luis Lavena
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -03:00
-default_executable: 
+date: 2011-04-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -119,7 +118,6 @@ files:
 - History.txt
 - LICENSE.txt
 - cucumber.yml
-has_rdoc: true
 homepage: http://github.com/luislavena/rake-compiler
 licenses: 
 - MIT
@@ -156,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rake-compiler
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Rake-based Ruby Extension (C, Java) task generator.