autobuild 1.2.2 → 1.2.3

data/Changes.txt

@@ -1,3 +1,9 @@
+== Version 1.2.3
+* Fix git update again. FETCH_HEAD may resolve as an ID which is not the one
+  to be selected for merge
+* Make the dependency on RMail optional
+* added the orogen package type
+
 == Version 1.2
 * Fix git update
 * Fix cmake dependency handling. Give a way to always run cmake before running

data/Manifest.txt

@@ -20,6 +20,7 @@ lib/autobuild/packages/autotools.rb
 lib/autobuild/packages/cmake.rb
 lib/autobuild/packages/genom.rb
 lib/autobuild/packages/import.rb
+lib/autobuild/packages/orogen.rb
 lib/autobuild/packages/pkgconfig.rb
 lib/autobuild/pkgconfig.rb
 lib/autobuild/reporting.rb

data/bin/autobuild

@@ -29,10 +29,14 @@ begin
         load conffile
 
 	if Autobuild.mail[:to]
-	    Reporting << MailReporter.new(Autobuild.mail)
+            if !Autobuild::HAS_RMAIL
+                STDERR.puts "RMail is not available. Mail notification is disabled"
+            else
+                Reporting << MailReporter.new(Autobuild.mail)
+            end
 	end
 
-	targets = ['import']
+	targets  = ['import']
 	targets += ['prepare', 'build'] if Autobuild.do_build
         targets.each do |phase|
 	    packages = Autobuild.packages

data/lib/autobuild.rb

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

data/lib/autobuild/import/git.rb

@@ -31,18 +31,26 @@ module Autobuild
         def update(package)
             Dir.chdir(package.srcdir) do
                 if !File.directory?('.git')
-                    raise "#{package.srcdir} is not a git repository"
+                    raise ConfigException, "#{package.srcdir} is not a git repository"
                 end
 
                 # 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
+                if !File.readable?( File.join('.git', 'FETCH_HEAD') )
+                    return
+                end
+
+                fetch_commit = File.readlines( File.join('.git', 'FETCH_HEAD') ).
+                    delete_if { |l| l =~ /not-for-merge/ }
+                return if fetch_commit.empty?
+                fetch_commit = fetch_commit.first.split(/\s+/).first
+
+                common_commit = `git merge-base HEAD #{fetch_commit}`.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')
+                        Subprocess.run(package.name, :import, Autobuild.tool('git'), 'merge', fetch_commit)
                     else
                         raise "importing the current version would lead to a non fast-forward"
                     end

data/lib/autobuild/packages/orogen.rb

@@ -0,0 +1,48 @@
+module Autobuild
+    def self.orogen(opts, &proc)
+        Orogen.new(opts, &proc)
+    end
+
+    class Orogen < CMake
+        class << self
+            attr_accessor :corba
+        end
+
+        attr_accessor :corba
+
+        attr_accessor :orogen_file
+        def initialize(*args, &config)
+            @corba       = Orogen.corba
+            super
+
+            @orogen_file ||= "#{File.basename(name)}.orogen"
+
+            task "#{name}-prepare" => genstamp
+            file genstamp => File.join(srcdir, orogen_file) do
+                regen
+            end
+        end
+
+        def depends_on(*packages)
+            super
+
+            packages.each do |p|
+                file genstamp => Package[p].installstamp
+            end
+        end
+
+        def genstamp; File.join(srcdir, '.orogen', 'orogen-stamp') end
+
+        def regen
+            cmdline = [Autobuild.tool('orogen')]
+            cmdline << '--corba' if corba
+            cmdline << orogen_file
+
+            Dir.chdir(srcdir) do
+                Subprocess.run name, 'orogen', *cmdline
+                touch_stamp genstamp
+            end
+        end
+    end
+end
+

data/lib/autobuild/reporting.rb

@@ -1,5 +1,11 @@
-require 'rmail'
-require 'rmail/serialize'
+begin
+    require 'rmail'
+    require 'rmail/serialize'
+    Autobuild::HAS_RMAIL = true
+rescue LoadError
+    Autobuild::HAS_RMAIL = false
+end
+
 require 'net/smtp'
 require 'socket'
 require 'etc'
@@ -70,8 +76,11 @@ module Autobuild
             end
         end
     end
+end
 
-    ## Report by mail
+## Report by mail
+if Autobuild::HAS_RMAIL
+module Autobuild
     class MailReporter < Reporter
         def default_mail
             Etc::endpwent
@@ -154,5 +163,6 @@ module RMail
         end
     end
 end
+end # if Autobuild::HAS_RMAIL
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-17 00:00:00 +02:00
+date: 2008-10-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,13 +44,13 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.0
+        version: 1.7.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
@@ -85,6 +85,7 @@ files:
 - lib/autobuild/packages/cmake.rb
 - lib/autobuild/packages/genom.rb
 - lib/autobuild/packages/import.rb
+- lib/autobuild/packages/orogen.rb
 - lib/autobuild/packages/pkgconfig.rb
 - lib/autobuild/pkgconfig.rb
 - lib/autobuild/reporting.rb