autobuild 1.1 → 1.2

data/Changes.txt

@@ -1,3 +1,9 @@
+== Version 1.2
+* Fix git update
+* Fix cmake dependency handling. Give a way to always run cmake before running
+  make (needed sometime)
+* Fix the genom package handling
+
 == Version 1.1
 * Make the CVS importer discard differences on method and username between the
   current root and the configured root

data/lib/autobuild.rb

@@ -3,6 +3,6 @@ require 'autobuild/reporting'
 require 'autobuild/package'
 
 module Autobuild
-    VERSION = "1.1" unless defined? Autobuild::VERSION
+    VERSION = "1.2" unless defined? Autobuild::VERSION
 end
 

data/lib/autobuild/environment.rb

@@ -2,6 +2,10 @@ module Autobuild
     ## Adds an element to a path-like variable
     def self.pathvar(path, varname)
         if File.directory?(path)
+            if block_given?
+                return unless yield(path)
+            end
+
             oldpath = ENV[varname]
             if oldpath.nil? || oldpath.empty?
                 ENV[varname] = path
@@ -17,6 +21,13 @@ module Autobuild
         pathvar("#{newprefix}/bin", 'PATH')
         pathvar("#{newprefix}/lib/pkgconfig", 'PKG_CONFIG_PATH')
         pathvar("#{newprefix}/lib/ruby/1.8", 'RUBYLIB')
+        pathvar("#{newprefix}/lib", 'RUBYLIB') do |path|
+            if File.directory?("#{path}/ruby")
+                false
+            else
+                !Dir["#{path}/**/*.rb"].empty?
+            end
+        end
 
         require 'rbconfig'
         ruby_arch = File.basename(Config::CONFIG['archdir'])

data/lib/autobuild/import/git.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'autobuild/subcommand'
 require 'autobuild/importer'
+require 'utilrb/module/attr_predicate'
 
 module Autobuild
     class Git < Importer
@@ -19,6 +20,7 @@ module Autobuild
 
         attr_accessor :repository
         attr_accessor :branch
+        attr_predicate :merge?
 
         def update(package)
             Dir.chdir(package.srcdir) do
@@ -26,8 +28,19 @@ module Autobuild
                     raise "#{package.srcdir} is not a git repository"
                 end
 
-                Subprocess.run(package.name, :import, Autobuild.tool('git'), 'fetch', repository, "#{branch}:master")
-                Subprocess.run(package.name, :import, Autobuild.tool('git'), 'checkout', 'master')
+                # Fetch and merge if the merge leads to a fast-forward
+                Subprocess.run(package.name, :import, Autobuild.tool('git'), 'fetch')
+                common_commit = `git merge-base HEAD FETCH_HEAD`.chomp
+                head_commit   = `git rev-parse HEAD`.chomp
+                fetch_commit  = `git rev-parse FETCH_HEAD`.chomp
+
+                if common_commit != fetch_commit
+                    if merge? || common_commit == head_commit
+                        Subprocess.run(package.name, :import, Autobuild.tool('git'), 'merge', 'FETCH_HEAD')
+                    else
+                        raise "importing the current version would lead to a non fast-forward"
+                    end
+                end
             end
         end
 

data/lib/autobuild/package.rb

@@ -124,6 +124,7 @@ module Autobuild
 	def provides(*packages)
 	    packages.each do |p|
 		p = p.to_s
+		next if p == name
 		@@provides[p] = self 
 		task p => name
 		task "#{p}-import" => "#{name}-import"

data/lib/autobuild/packages/cmake.rb

@@ -15,7 +15,10 @@ module Autobuild
             end
         end
 
+        # a key => value association of defines for CMake
         attr_reader :defines
+        # If true, always run cmake before make during the build
+        attr_accessor :always_reconfigure
 
         def configurestamp; File.join(builddir, "CMakeCache.txt") end
 
@@ -72,6 +75,9 @@ module Autobuild
         # Do the build in builddir
         def build
             Dir.chdir(builddir) do
+                if always_reconfigure
+                    Subprocess.run(name, 'build', Autobuild.tool(:cmake), '.')
+                end
                 Subprocess.run(name, 'build', Autobuild.tool(:make))
             end
             touch_stamp(buildstamp)

data/lib/autobuild/packages/genom.rb

@@ -113,7 +113,7 @@ module Autobuild
 			    contents.find { |l| l =~ /^GENFLAGS/ }.gsub('GENFLAGS=', ''))
 
 		if old_file != "#{name}.gen" || !(old_flags - genomflags).empty? || !(genomflags - old_flags).empty?
-		    File.rm_f genomstamp
+		    FileUtils.rm_f genomstamp
 		end
 	    end
 

data/lib/autobuild/timestamps.rb

@@ -49,7 +49,7 @@ module Autobuild
     end
     def source_tree(path, &block)
         task = SourceTreeTask.define_task(path)
-        block.call(task)
+        block.call(task) unless !block
         task
     end
             

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  version: "1.2"
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-26 00:00:00 +02:00
+date: 2008-07-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rmail
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,12 +44,13 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.3
+        version: 1.6.0
     version: 
 description: This work is licensed under the GPLv2 license. See License.txt for details  == What's autobuild ? Autobuild imports, configures, builds and installs various kinds of software packages. It can be used in software development to make sure that nothing is broken in the  build process of a set of packages, or can be used as an automated installation tool.  Autobuild config files are Ruby scripts which configure rake to * imports the package from a SCM or (optionnaly) updates it * configures it. This phase can handle code generation, configuration (for instance for autotools-based packages), ... * build * install  It takes the dependencies between packages into account in its build process, updates the needed environment variables (+PKG_CONFIG_PATH+, +PATH+, +LD_LIBRARY_PATH+, ...)
 email: sylvain.joyeux@m4x.org
@@ -118,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Rake-based utility to build and install multiple packages with dependencies