autobuild 1.7.3.rc3 → 1.7.3

data/Manifest.txt

@@ -9,11 +9,11 @@ lib/autobuild/config.rb
 lib/autobuild/configurable.rb
 lib/autobuild/environment.rb
 lib/autobuild/exceptions.rb
+lib/autobuild/import/archive.rb
 lib/autobuild/import/cvs.rb
 lib/autobuild/import/darcs.rb
 lib/autobuild/import/git.rb
 lib/autobuild/import/svn.rb
-lib/autobuild/import/archive.rb
 lib/autobuild/import/tar.rb
 lib/autobuild/importer.rb
 lib/autobuild/package.rb
@@ -38,5 +38,6 @@ test/data/tarimport.tar.gz
 test/test_import_cvs.rb
 test/test_import_svn.rb
 test/test_import_tar.rb
+test/test_reporting.rb
 test/test_subcommand.rb
 test/tools.rb

data/lib/autobuild/import/archive.rb

@@ -194,12 +194,18 @@ module Autobuild
             end
             @options[:cachedir] ||= "#{Autobuild.prefix}/cache"
 
+            relocate(url)
+        end
+
+        # Changes the URL from which we should pick the archive
+        def relocate(url, options = Hash.new)
             @url = URI.parse(url)
             if !VALID_URI_SCHEMES.include?(@url.scheme)
                 raise ConfigException, "invalid URL #{@url} (local files must be prefixed with file://)" 
             end
 
             filename = options[:filename] || File.basename(url).gsub(/\?.*/, '')
+
             @mode = options[:mode] || ArchiveImporter.filename_to_mode(filename)
             if @url.scheme == 'file'
                 @cachefile = @url.path

data/lib/autobuild/import/git.rb

@@ -427,6 +427,11 @@ module Autobuild
                 end
             end
         end
+
+        # Changes the repository this importer is pointing to
+        def relocate(repository)
+            @repository = repository
+        end
     end
 
     # Creates a git importer which gets the source for the given repository and branch

data/lib/autobuild/importer.rb

@@ -61,6 +61,9 @@ class Importer
         end
     end
 
+    # @return [Hash] the original option hash as given to #initialize
+    attr_reader :options
+
     # Creates a new Importer object. The options known to Importer are:
     # [:patches] a list of patch to apply after import
     #
@@ -203,7 +206,7 @@ class Importer
         importdir = package.importdir
         if File.directory?(importdir)
             package.isolate_errors(false) do
-                if Autobuild.do_update
+                if package.update?
                     perform_update(package)
                 else
                     if Autobuild.verbose
@@ -314,6 +317,8 @@ class Importer
 
         return true
     end
+
+    def supports_relocation?; false end
 end
 end
 

data/lib/autobuild/package.rb

@@ -106,6 +106,20 @@ module Autobuild
             File.join(logdir, "#{name}-#{STAMPFILE}")
         end
 
+        # Sets whether this package should update itself or not. If false, the
+        # only importer operation that will be performed is checkout
+        #
+        # If nil, the global setting Autobuild.do_update is used
+        attr_writer :update
+
+        # True if this package should update itself when #import is called
+        def update?
+            if @update.nil?
+                Autobuild.do_update
+            else @update
+            end
+        end
+
         attr_writer :updated
 
         # Returns true if this package has already been updated. It will not be

data/lib/autobuild/packages/autotools.rb

@@ -156,7 +156,23 @@ module Autobuild
 
 		# Add the --prefix option to the configureflags array
 		testflags = ["--prefix=#{prefix}"] + Array[*configureflags]
-		old_opt = options.find { |o| !testflags.include?(o) }
+		old_opt = options.find do |o|
+                    if testflags.include?(o)
+                        false
+                    elsif o =~ /^-/
+                        # Configuration option that is not specified, have to
+                        # reconfigure
+                        true
+                    else
+                        # This is an envvar entry. Ignore it if it is not
+                        # explicitely given in configureflags
+                        varname, value = o.split("=").first
+                        if current_flag = testflags.find { |fl| fl =~ /^#{varname}=/ }
+                            current_flag != value
+                        else false
+                        end
+                    end
+                end
 		new_opt = testflags.find { |o| !options.include?(o) }
 		if old_opt || new_opt
                     if Autobuild.verbose

data/lib/autobuild/timestamps.rb

@@ -69,6 +69,10 @@ module Autobuild
 	end
 	    
         def timestamp
+            if @newest_time
+                return @newest_time
+            end
+
             @newest_file, @newest_time =
                 Autobuild.tree_timestamp(name, %r#(?:^|/)(?:CVS|_darcs|\.svn)$#, *@exclude)
             @newest_time

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.7.3.rc3" unless defined? Autobuild::VERSION
+    VERSION = "1.7.3" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.7.3.rc3
-  prerelease: 6
+  version: 1.7.3
+  prerelease: 
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13610200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *13610200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &13609360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *13609360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &13608820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13608820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &13607660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *13607660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &13606280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: '3.6'
   type: :development
   prerelease: false
-  version_requirements: *13606280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.6'
 description: Collection of classes to handle build systems (CMake, autotools, ...)
   and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
   to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)
@@ -90,11 +115,11 @@ files:
 - lib/autobuild/configurable.rb
 - lib/autobuild/environment.rb
 - lib/autobuild/exceptions.rb
+- lib/autobuild/import/archive.rb
 - lib/autobuild/import/cvs.rb
 - lib/autobuild/import/darcs.rb
 - lib/autobuild/import/git.rb
 - lib/autobuild/import/svn.rb
-- lib/autobuild/import/archive.rb
 - lib/autobuild/import/tar.rb
 - lib/autobuild/importer.rb
 - lib/autobuild/package.rb
@@ -119,9 +144,9 @@ files:
 - test/test_import_cvs.rb
 - test/test_import_svn.rb
 - test/test_import_tar.rb
+- test/test_reporting.rb
 - test/test_subcommand.rb
 - test/tools.rb
-- test/test_reporting.rb
 - .gemtest
 homepage: http://rock-robotics.org/stable/documentation/autoproj
 licenses: []
@@ -140,18 +165,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: autobuild
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Library to handle build systems and import mechanisms
 test_files:
-- test/test_import_cvs.rb
-- test/test_reporting.rb
+- test/test_import_tar.rb
 - test/test_subcommand.rb
+- test/test_reporting.rb
 - test/test_import_svn.rb
-- test/test_import_tar.rb
+- test/test_import_cvs.rb