mini_portile 0.1.0 → 0.2.0

data/History.txt

@@ -1,3 +1,15 @@
+=== 0.2.0 / 2011-04-05
+
+* Enhancements:
+  * Improve tar detection
+  * Improve and refactor configure_options
+  * Detect configure_options changes. Closes GH-1
+  * Add recipe examples
+
+* Bugfixes:
+  * MiniPortile#target can be changed now. Closes GH-2
+  * Always redirect tar output properly
+
 === 0.1.0 / 2011-03-08
 
 * Initial release. Welcome to this world!

data/README.rdoc

@@ -3,8 +3,8 @@
 * {Source Code}[https://github.com/luislavena/mini_portile]
 * {Bug Reports}[https://github.com/luislavena/mini_portile/issues]
 
-This project is a minimalistic, simplistic and stupid implementation of a port
-/recipe system <b>for developers</b>.
+This project is a minimalistic, simplistic and stupid implementation of a port/recipe
+system <b>for developers</b>.
 
 == Another port system, srsly?
 
@@ -103,15 +103,16 @@ task depends on MiniPortile compilation and most important, activation.
 Take the following as a simplification of how you can use MiniPortile with
 Rake:
 
-  file ".libiconv.1.13.1.installed" do |f|
+  task :libiconv do
     recipe = MiniPortile.new("libiconv", "1.13.1")
     recipe.files = ["http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz"]
-    recipe.cook
-    touch f.name
-  end
+    checkpoint = ".#{recipe.name}-#{recipe.version}.installed"
+
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
+    end
 
-  task :libiconv => [".libiconv.1.13.1.installed"] do
-    recipe = MiniPortile.new("libiconv", "1.13.1")
     recipe.activate
   end
 
@@ -128,6 +129,21 @@ This example will:
 For your homework, you can make libiconv version be taken from <tt>ENV</tt>
 variables.
 
+=== Native or cross-compilation
+
+Above examples cover the normal use case: compile support libraries natively.
+
+MiniPortile also covers another use case, which is the cross-compilation of the
+support libraries to be used as part of a binary gem compilation.
+
+It is the perfect complementary tool for rake-compiler and it's <tt>cross</tt>
+Rake task.
+
+Depending on your usage of rake-compiler, you will need to use <tt>host</tt> to
+match the installed cross-compiler toolchain.
+
+Please refer to the examples directory for simplified and practical usage.
+
 === Supported scenarios
 
 As mentioned before, MiniPortile requires a GCC compiler toolchain. This has

data/Rakefile

@@ -4,12 +4,12 @@ require "rubygems/package_task"
 GEM_SPEC = Gem::Specification.new do |s|
   # basic information
   s.name        = "mini_portile"
-  s.version     = "0.1.0"
+  s.version     = "0.2.0"
   s.platform    = Gem::Platform::RUBY
 
   # description and details
   s.summary     = "Simplistic port-like solution for developers"
-  s.description = "Provide a standard and simplified way to build and package\nRuby extensions (C, Java) using Rake as glue."
+  s.description = "Simplistic port-like solution for developers. It provides a standard and simplified way to compile against dependency libraries without messing up your system."
 
   # requirements
   s.required_ruby_version = ">= 1.8.6"
@@ -19,7 +19,7 @@ GEM_SPEC = Gem::Specification.new do |s|
   # development dependencies (add_development_dependency)
 
   # components, files and paths
-  s.files = FileList["lib/**/*.rb", "Rakefile", "*.{rdoc,txt}"]
+  s.files = FileList["examples/Rakefile", "lib/**/*.rb", "Rakefile", "*.{rdoc,txt}"]
 
   s.require_path = 'lib'
 

data/examples/Rakefile

@@ -0,0 +1,47 @@
+require File.expand_path("mini_portile", File.join(File.dirname(__FILE__), "../lib"))
+
+$recipes = {}
+
+ICONV_VERSION = "1.13.1"
+$recipes[:libiconv] = MiniPortile.new "libiconv", ICONV_VERSION
+$recipes[:libiconv].files << "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
+
+$recipes[:sqlite3] = MiniPortile.new "sqlite3", "3.7.5"
+$recipes[:sqlite3].files << "http://sqlite.org/sqlite-autoconf-3070500.tar.gz"
+
+namespace :ports do
+  directory "ports"
+
+  desc "Install port libiconv #{ICONV_VERSION}"
+  task :libiconv => ["ports"] do |t|
+    recipe = $recipes[:libiconv]
+    checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
+
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
+    end
+
+    recipe.activate
+  end
+
+  desc "Install port sqlite3 #{$recipes[:sqlite3].version}"
+  task :sqlite3 => ["ports"] do |t|
+    recipe = $recipes[:sqlite3]
+    checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
+
+    unless File.exist?(checkpoint)
+      recipe.cook
+      touch checkpoint
+    end
+
+    recipe.activate
+  end
+end
+
+desc "Adjust all recipes host for cross-compilation"
+task :cross do
+  $recipes.each do |_, recipe|
+    recipe.host = "i686-w64-mingw32"
+  end
+end

data/lib/mini_portile.rb

@@ -2,10 +2,12 @@ require 'rbconfig'
 require 'net/http'
 require 'fileutils'
 require 'tempfile'
+require 'digest/md5'
 
 class MiniPortile
-  attr_reader :name, :version, :target
-  attr_accessor :host, :files, :logger, :config_options
+  attr_reader :name, :version
+  attr_writer :configure_options
+  attr_accessor :host, :files, :target, :logger
 
   def initialize(name, version)
     @name = name
@@ -13,7 +15,6 @@ class MiniPortile
     @target = 'ports'
     @files = []
     @logger = STDOUT
-    @config_options = []
 
     @host = RbConfig::CONFIG['arch']
   end
@@ -32,18 +33,18 @@ class MiniPortile
     end
   end
 
+  def configure_options
+    @configure_options ||= configure_defaults
+  end
+
   def configure
     return if configured?
 
-    prefix  = File.expand_path(port_path)
-    options = [
-      "--disable-shared",   # disable generation of shared object
-      "--enable-static",    # build static library
-      "--host=#{@host}",    # build for specific target (host)
-      "--prefix=#{prefix}"  # installation target
-    ].concat(@config_options).join(' ')
+    md5_file = File.join(tmp_path, 'configure.md5')
+    digest   = Digest::MD5.hexdigest(computed_options)
+    File.open(md5_file, "w") { |f| f.write digest }
 
-    execute('configure', %Q(sh configure #{options}))
+    execute('configure', %Q(sh configure #{computed_options}))
   end
 
   def compile
@@ -67,8 +68,12 @@ class MiniPortile
   def configured?
     configure = File.join(work_path, 'configure')
     makefile  = File.join(work_path, 'Makefile')
+    md5_file  = File.join(tmp_path, 'configure.md5')
 
-    newer?(makefile, configure)
+    stored_md5  = File.exist?(md5_file) ? File.read(md5_file) : ""
+    current_md5 = Digest::MD5.hexdigest(computed_options)
+
+    (current_md5 == stored_md5) && newer?(makefile, configure)
   end
 
   def installed?
@@ -131,16 +136,44 @@ private
     end
   end
 
+  def configure_defaults
+    [
+      "--host=#{@host}",    # build for specific target (host)
+      "--enable-static",    # build static library
+      "--disable-shared"    # disable generation of shared object
+    ]
+  end
+
+  def configure_prefix
+    "--prefix=#{File.expand_path(port_path)}"
+  end
+
+  def computed_options
+    [
+      configure_options,     # customized or default options
+      configure_prefix,      # installation target
+    ].flatten.join(' ')
+  end
+
   def log_file(action)
     File.join(tmp_path, "#{action}.log")
   end
 
+  def tar_exe
+    @@tar_exe ||= begin
+      dev_null = RbConfig::CONFIG['host_os'] =~ /mingw|mswin/ ? 'NUL' : '/dev/null'
+      %w[tar bsdtar basic-bsdtar].find { |c|
+        system("#{c} --version >> #{dev_null} 2>&1")
+      }
+    end
+  end
+
   def extract_file(file, target)
     filename = File.basename(file)
     FileUtils.mkdir_p target
 
     message "Extracting #{filename} into #{target}... "
-    result = `tar xf #{file} -C #{target}`
+    result = `#{tar_exe} xf #{file} -C #{target} 2>&1`
     if $?.success?
       output "OK"
     else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mini_portile
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Luis Lavena
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -03:00
+date: 2011-04-05 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
-description: |-
-  Provide a standard and simplified way to build and package
-  Ruby extensions (C, Java) using Rake as glue.
+description: Simplistic port-like solution for developers. It provides a standard and simplified way to compile against dependency libraries without messing up your system.
 email: luislavena@gmail.com
 executables: []
 
@@ -32,6 +30,7 @@ extra_rdoc_files:
 - History.txt
 - LICENSE.txt
 files: 
+- examples/Rakefile
 - lib/mini_portile.rb
 - Rakefile
 - README.rdoc
@@ -74,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simplistic port-like solution for developers