autobuild 1.5.3 → 1.5.4

data/Changes.txt

@@ -1,3 +1,7 @@
+== Version 1.5.4
+* support orogen's --extended-states
+* small API fix when subclassing CMake package handler
+
 == Version 1.5.3
 * quickfix for RUBYLIB on OSes that install libraries in usr/lib32 or usr/lib64
   instead of usr/lib

data/lib/autobuild.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.3" unless defined? Autobuild::VERSION
+    VERSION = "1.5.4" unless defined? Autobuild::VERSION
 end
 
 require 'autobuild/config'

data/lib/autobuild/packages/autotools.rb

@@ -85,6 +85,23 @@ module Autobuild
             nil
         end
 
+        def prepare_for_forced_build
+            autodetect_needed_stages
+            if using[:autoconf]
+                FileUtils.rm_f File.join(srcdir, 'configure')
+            end
+
+            if using[:automake]
+                Find.find(srcdir) do |path|
+                    if File.basename(path) == "Makefile.in"
+                        FileUtils.rm_f path
+                    end
+                end
+            end
+
+            FileUtils.rm_f configurestamp
+        end
+
         def prepare
             super
 
@@ -113,6 +130,26 @@ module Autobuild
         end
 
     private
+        def autodetect_needed_stages
+            # Autodetect autoconf/aclocal/automake
+            #
+            # Let the user disable the use of autoconf explicitely by using 'false'.
+            # 'nil' means autodetection
+            if using[:autoconf].nil?
+                if File.file?(File.join(srcdir, 'configure.in')) || File.file?(File.join(srcdir, 'configure.ac'))
+                    using[:autoconf] = true 
+                end
+            end
+            using[:aclocal] = using[:autoconf] if using[:aclocal].nil?
+            if using[:automake].nil?
+                using[:automake] = File.exists?(File.join(srcdir, 'Makefile.am'))
+            end
+
+            if using[:libtool].nil?
+                using[:libtool] = File.exists?(File.join(srcdir, 'ltmain.sh'))
+            end
+        end
+
         # Adds a target to rebuild the autotools environment
         def create_regen_target(confsource = nil)
 	    conffile = "#{srcdir}/configure"
@@ -130,31 +167,15 @@ module Autobuild
                         using[:autogen] = %w{autogen autogen.sh}.find { |f| File.exists?(f) }
                     end
 
+                    autodetect_needed_stages
+
                     progress "generating build system for %s"
+                    if using[:libtool]
+                        Subprocess.run(self, 'configure', Autobuild.tool('libtoolize'), '--copy')
+                    end
                     if using[:autogen]
                         Subprocess.run(self, 'configure', File.expand_path(using[:autogen]))
                     else
-                        # Autodetect autoconf/aclocal/automake
-                        #
-                        # Let the user disable the use of autoconf explicitely by using 'false'.
-                        # 'nil' means autodetection
-                        if using[:autoconf].nil?
-                            if File.file?(File.join(srcdir, 'configure.in')) || File.file?(File.join(srcdir, 'configure.ac'))
-                                using[:autoconf] = true 
-                            end
-                        end
-                        using[:aclocal] = using[:autoconf] if using[:aclocal].nil?
-                        if using[:automake].nil?
-                            using[:automake] = File.exists?(File.join(srcdir, 'Makefile.am'))
-                        end
-
-                        if using[:libtool].nil?
-                            using[:libtool] = File.exists?(File.join(srcdir, 'ltmain.sh'))
-                        end
-                        if using[:libtool]
-                            Subprocess.run(self, 'configure', Autobuild.tool('libtoolize'), '--copy')
-                        end
-
                         [ :aclocal, :autoconf, :autoheader, :automake ].each do |tool|
                             if tool_flag = using[tool]
 				tool_program = if tool_flag.respond_to?(:to_str)

data/lib/autobuild/packages/cmake.rb

@@ -44,7 +44,8 @@ module Autobuild
             end
         end
 
-        def configurestamp; File.join(builddir, "CMakeCache.txt") end
+        def cmake_cache; File.join(builddir, "CMakeCache.txt") end
+        def configurestamp; cmake_cache end
 
         def initialize(options)
 	    @defines = Hash.new
@@ -105,13 +106,13 @@ module Autobuild
             #
             # Delete the CMakeCache to force reconfiguration
             if !File.exists?( File.join(builddir, 'Makefile') )
-                FileUtils.rm_f configurestamp
+                FileUtils.rm_f cmake_cache
             end
 
-            if File.exists?(configurestamp)
+            if File.exists?(cmake_cache)
                 all_defines = defines.dup
                 all_defines['CMAKE_INSTALL_PREFIX'] = prefix
-                cache = File.read(configurestamp)
+                cache = File.read(cmake_cache)
                 did_change = all_defines.any? do |name, value|
                     cache_line = cache.each_line.find do |line|
                         line =~ /^#{name}:/
@@ -131,7 +132,7 @@ module Autobuild
                     if Autobuild.debug
                         puts "CMake configuration changed, forcing a reconfigure"
                     end
-                    FileUtils.rm_f configurestamp
+                    FileUtils.rm_f cmake_cache
                 end
             end
 
@@ -150,7 +151,7 @@ module Autobuild
                     
                     progress "generating and configuring build system for %s"
                     if full_reconfigures?
-                        FileUtils.rm_f configurestamp
+                        FileUtils.rm_f cmake_cache
                     end
                     Subprocess.run(self, 'configure', *command)
                 end

data/lib/autobuild/packages/orogen.rb

@@ -136,6 +136,7 @@ module Autobuild
     class Orogen < CMake
         class << self
             attr_accessor :corba
+            attr_accessor :extended_states
         end
 
         @orocos_target = nil
@@ -187,9 +188,13 @@ module Autobuild
             @corba || (@corba.nil? && Orogen.corba)
         end
 
+        attr_writer :extended_states
+        def extended_states
+            @extended_states || (@extended_states.nil? && Orogen.extended_states)
+        end
+
         attr_accessor :orogen_file
         def initialize(*args, &config)
-            @corba       = Orogen.corba
             super
 
             @orocos_target = nil
@@ -266,6 +271,7 @@ module Autobuild
         def regen
             cmdline = [guess_ruby_name, self.class.orogen_bin]
             cmdline << '--corba' if corba
+            cmdline << '--extended-states' if extended_states
             cmdline << orogen_file
 
             progress "generating oroGen project %s"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 +01:00
+date: 2010-03-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe