autobuild 1.5.53.rc1 → 1.5.53

data/Changes.txt

@@ -2,6 +2,11 @@
 * remove RMail and Daemons from the dependency list of the gem. autobuild can
   work fine without them, and they are seldom used anyway.
   The RMail dependency is notified to the user if he uses --mail-to.
+* git: improve the behaviour on commit pinning. The importer avoids creating
+  detached HEAD as much as it can now.
+* archive: fix some issues regarding patching and checkout. The list of patches
+  was not reset when the package was re-checkout, which was leading to errors
+  later.
 
 == Version 1.5.52
 * fix local in the git importer

data/lib/autobuild/import/archive.rb

@@ -117,7 +117,7 @@ module Autobuild
         def initialize(url, options)
             @options = options.dup
             if !@options.has_key?(:update_cached_file)
-                @options[:update_cached_file] = true
+                @options[:update_cached_file] = false
             end
             @options[:cachedir] ||= "#{Autobuild.prefix}/cache"
 
@@ -136,7 +136,9 @@ module Autobuild
         end
 
         def update(package) # :nodoc:
-            checkout(package) if update_cache(package)
+            if update_cache(package)
+                checkout(package)
+            end
         rescue OpenURI::HTTPError
             raise Autobuild::Exception.new(package.name, :import)
         end
@@ -169,6 +171,11 @@ module Autobuild
                 Subprocess.run(package, :import, Autobuild.tool('tar'), *cmd)
             end
 
+            # This method can be used to re-checkout an existing package /
+            # directory. If we successfully did that, make sure we delete the
+            # patch list so that it gets re-patched
+            FileUtils.rm_f(patchlist(package))
+
         rescue OpenURI::HTTPError
             raise Autobuild::Exception.new(package.name, :import)
         rescue SubcommandFailed

data/lib/autobuild/import/git.rb

@@ -37,9 +37,6 @@ module Autobuild
             tag    = gitopts[:tag]
             commit = gitopts[:commit]
 
-            if (branch && commit) || (branch && tag) || (tag && commit)
-                raise ConfigException, "you can specify only a branch, tag or commit but not two or three at the same time"
-            end
             @branch = branch || 'master'
             @tag    = tag
             @commit = commit
@@ -142,8 +139,10 @@ module Autobuild
                 # Doing it now is better as it makes sure that we replace the
                 # configuration parameters only if the repository and branch are
                 # OK (i.e. we keep old working configuration instead)
-                if !commit 
+                if branch || tag
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'fetch', repository, branch || tag)
+                elsif commit
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'fetch', repository)
                 end
 
                 Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
@@ -170,10 +169,6 @@ module Autobuild
                                    "--replace-all", "branch.#{local_branch}.merge", "refs/heads/#{local_branch}")
                 end
 
-                if commit
-                    Subprocess.run(package, :import, Autobuild.tool('git'), 'fetch', 'autobuild')
-                end
-
                 # Now get the actual commit ID from the FETCH_HEAD file, and
                 # return it
                 commit_id = if File.readable?( File.join('.git', 'FETCH_HEAD') )
@@ -229,10 +224,20 @@ module Autobuild
             $?.exitstatus == 0
         end
 
+        def detached_head?
+            `git symbolic-ref HEAD -q`
+            return ($?.exitstatus != 0)
+        end
+
         # Checks if the current branch is the target branch. Expects that the
         # current directory is the package's directory
         def on_target_branch?
-            current_branch = `git symbolic-ref HEAD`.chomp
+            current_branch = `git symbolic-ref HEAD -q`.chomp
+            if $?.exitstatus != 0
+                # HEAD cannot be resolved as a symbol. Assume that we are on a
+                # detached HEAD
+                return false
+            end
             current_branch == "refs/heads/#{local_branch}"
         end
 
@@ -280,9 +285,15 @@ module Autobuild
             end
         end
 
-        def merge_status(fetch_commit)
-            common_commit = `git merge-base HEAD #{fetch_commit}`.chomp
-            head_commit   = `git rev-parse HEAD`.chomp
+        def merge_status(fetch_commit, reference_commit = "HEAD")
+            common_commit = `git merge-base #{reference_commit} #{fetch_commit}`.chomp
+            if $?.exitstatus != 0
+                raise PackageException, "failed to find the merge-base between #{reference_commit} and #{fetch_commit}. Are you sure these commits exist ?"
+            end
+            head_commit   = `git rev-parse #{reference_commit}`.chomp
+            if $?.exitstatus != 0
+                raise PackageException, "failed to resolve #{reference_commit}. Are you sure this commit, branch or tag exists ?"
+            end
 
             status = if common_commit != fetch_commit
                          if common_commit == head_commit
@@ -305,13 +316,45 @@ module Autobuild
             validate_srcdir(package)
             Dir.chdir(package.srcdir) do
                 fetch_commit = fetch_remote(package)
-                if !fetch_commit
-                    return
-                end
 
                 # If we are tracking a commit/tag, just check it out and return
                 if commit || tag
-                    Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', commit || tag)
+                    target_commit = (commit || tag)
+                    status_to_head = merge_status(target_commit, "HEAD")
+                    if status_to_head.status == Status::UP_TO_DATE
+                        # Check if by any chance we could switch back to a
+                        # proper branch instead of having a detached HEAD
+                        if detached_head?
+                            status_to_remote = merge_status(target_commit, fetch_commit)
+                            if status_to_remote.status != Status::UP_TO_DATE
+                                package.progress "  the package is on a detached HEAD because of commit pinning"
+                                return
+                            end
+                        else
+                            return
+                        end
+                    elsif status_to_head.status != Status::SIMPLE_UPDATE
+                        raise PackageException, "checking out the specified commit #{target_commit} would be a non-simple operation (i.e. the current state of the repository is not a linear relationship with the specified commit), do it manually"
+                    end
+
+                    status_to_remote = merge_status(target_commit, fetch_commit)
+                    if status_to_remote.status != Status::UP_TO_DATE
+                        # Try very hard to avoid creating a detached HEAD
+                        if local_branch
+                            status_to_branch = merge_status(target_commit, local_branch)
+                            if status_to_branch.status == Status::UP_TO_DATE # Checkout the branch
+                                package.progress "  checking out specific commit %s for %s. It will checkout branch %s." % [target_commit.to_s, package.name, local_branch]
+                                Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', local_branch)
+                                return
+                            end
+                        end
+                        package.progress "  checking out specific commit %s for %s. This will create a detached HEAD." % [target_commit.to_s, package.name]
+                        Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', target_commit)
+                        return
+                    end
+                end
+
+                if !fetch_commit
                     return
                 end
 
@@ -358,18 +401,20 @@ module Autobuild
 
                 # If we are tracking a commit/tag, just check it out
                 if commit || tag
-                    Subprocess.run(package, :import, Autobuild.tool('git'),
-                        'checkout', commit || tag)
-                    return
-                end
-
-                current_branch = `git symbolic-ref HEAD`.chomp
-                if current_branch == "refs/heads/#{local_branch}"
-                    Subprocess.run(package, :import, Autobuild.tool('git'),
-                        'reset', '--hard', "autobuild/#{branch}")
+                    status = merge_status(commit || tag)
+                    if status.status != Status::UP_TO_DATE
+                        package.progress "  checking out specific commit for %s. This will create a detached HEAD." % [package.name]
+                        Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', commit || tag)
+                    end
                 else
-                    Subprocess.run(package, :import, Autobuild.tool('git'),
-                        'checkout', '-b', local_branch, "autobuild/#{branch}")
+                    current_branch = `git symbolic-ref HEAD`.chomp
+                    if current_branch == "refs/heads/#{local_branch}"
+                        Subprocess.run(package, :import, Autobuild.tool('git'),
+                            'reset', '--hard', "autobuild/#{branch}")
+                    else
+                        Subprocess.run(package, :import, Autobuild.tool('git'),
+                            'checkout', '-b', local_branch, "autobuild/#{branch}")
+                    end
                 end
             end
         end

data/lib/autobuild/packages/cmake.rb

@@ -5,6 +5,7 @@ module Autobuild
         CMake.new(options, &block)
     end
 
+    # Handler class to build CMake-based packages
     class CMake < Configurable
         class << self
             def builddir; @builddir || Configurable.builddir end
@@ -19,6 +20,13 @@ module Autobuild
                 @full_reconfigures
             end
 
+            # Global default for the CMake generator to use. If nil (the
+            # default), the -G option will not be given at all. Will work only
+            # if the generator creates makefiles
+            #
+            # It can be overriden on a per-package basis with CMake.generator=
+            attr_accessor :generator
+
             attr_reader :module_path
         end
         @module_path = []
@@ -32,6 +40,17 @@ module Autobuild
         # 
         # See #full_reconfigures? for more details
         attr_writer :full_reconfigures
+        # Sets a generator explicitely for this component. See #generator and
+        # CMake.generator
+        attr_writer :generator
+        # The CMake generator to use. You must choose one that generates
+        # Makefiles. If not set for this package explicitely, it is using the
+        # global value CMake.generator.
+        def generator
+            if @generator then @generator
+            else CMake.generator
+            end
+        end
 
         # If true, we always remove the CMake cache before reconfiguring. This
         # is to workaround the aggressive caching behaviour of CMake, and is set
@@ -286,6 +305,9 @@ module Autobuild
                     defines.each do |name, value|
                         command << "-D#{name}=#{value}"
                     end
+                    if generator
+                        command << "-G#{generator}"
+                    end
                     command << srcdir
                     
                     progress "configuring CMake build system for %s"

data/lib/autobuild/version.rb

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

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 15424463
-  prerelease: 7
+  hash: 105
+  prerelease: 
   segments: 
   - 1
   - 5
   - 53
-  - rc
-  - 1
-  version: 1.5.53.rc1
+  version: 1.5.53
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2012-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -157,18 +155,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Rake-based utility to build and install multiple packages with dependencies