autobuild 1.5.42 → 1.5.43

data/Changes.txt

@@ -1,3 +1,12 @@
+== Version 1.5.43
+* cvs: accept the common importer options, such as :patches
+  (Patch from Charles Lesire-Cabaniols)
+* autotools: regenerate the configure script on initial checkout
+  This is to workaround people that *do* have autogen scripts but
+  still include the configure scripts in their VCS. autotools is
+  pretty fragile, to it is much more robust to just regenerate
+  the whole thing in these cases.
+
 == Version 1.5.42
 * archive: fix support for using local files
 * git: make "switching branch" messages stand out a bit more

data/lib/autobuild/import/cvs.rb

@@ -13,19 +13,19 @@ module Autobuild
 	# to 'cvs' and can be configured by doing 
 	#   Autobuild.programs['cvs'] = 'my_cvs_tool'
         def initialize(root_name, options = {})
-            options = Kernel.validate_options options, :module => nil, :cvsup => '-dP', :cvsco => '-P'
+            cvsopts, common = Kernel.filter_options options, :module => nil, :cvsup => '-dP', :cvsco => '-P'
             @root   = root_name
-            @module = options[:module]
+            @module = cvsopts[:module]
             if !@module
                 raise ArgumentError, "no module given"
             end
 
             @program    = Autobuild.tool('cvs')
-            @options_up = options[:cvsup] || '-dP'
+            @options_up = cvsopts[:cvsup] || '-dP'
             @options_up = Array[*@options_up]
-            @options_co = options[:cvsco] || '-P'
+            @options_co = cvsopts[:cvsco] || '-P'
             @options_co = Array[*@options_co]
-            super(options)
+            super(common)
         end
 
 	# Array of options to give to 'cvs checkout'

data/lib/autobuild/packages/autotools.rb

@@ -95,7 +95,7 @@ module Autobuild
             super
 
             autodetect_needed_stages
-            if using[:autoconf]
+            if using[:autoconf] || using[:autogen]
                 FileUtils.rm_f File.join(srcdir, 'configure')
             end
 
@@ -110,10 +110,19 @@ module Autobuild
             FileUtils.rm_f configurestamp
         end
 
+        def import
+            @has_checked_out = !File.directory?(srcdir)
+            super
+        end
+
         def prepare
             super
             autodetect_needed_stages
 
+            if @has_checked_out
+                prepare_for_forced_build
+            end
+
 	    # Check if config.status has been generated with the
 	    # same options than the ones in configureflags
             #

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.42" unless defined? Autobuild::VERSION
+    VERSION = "1.5.43" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 85
   prerelease: 
   segments: 
   - 1
   - 5
-  - 42
-  version: 1.5.42
+  - 43
+  version: 1.5.43
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-14 00:00:00 Z
+date: 2011-08-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake