autobuild 1.5.6 → 1.5.7

data/Changes.txt

@@ -1,3 +1,9 @@
+== Version 1.5.7
+* the "importer" package will now rebuild if the main prefix is deleted. It was
+  previously not, which was leading to partial builds if the actual installation
+  was done by a post_install block
+* fix the documentation mode
+
 == Version 1.5.6
 * fix the directory in error message when a git importer detects a non-git
   repository

data/lib/autobuild.rb

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

data/lib/autobuild/config.rb

@@ -241,7 +241,9 @@ module Autobuild
             targets = if packages.empty?
                           phase
                       else
-                          packages.map { |pkg| "#{pkg}-#{phase}" }
+                          packages.
+                            find_all { |pkg| Rake.application.lookup("#{pkg}-#{phase}") }.
+                            map { |pkg| "#{pkg}-#{phase}" }
                       end
 
             task "#{buildname}-#{phase}" => targets

data/lib/autobuild/package.rb

@@ -206,12 +206,28 @@ module Autobuild
         # is package-specific. The default implementation interpret them
         # as relative to the source directory, but packages like CMake will
         # interpret them as relative to their build directories.
-        attr_accessor :doc_dir
+        attr_writer :doc_dir
+
+        # Absolute path to where documentation is generated. Returns nil if the
+        # doc_dir attribute is not set.
+        def doc_dir
+            if @doc_dir
+                File.expand_path(@doc_dir, srcdir)
+            end
+        end
 
         # Directory in which the documentation target should install the
         # documentation. If it is relative, it is interpreted as relative to
-        # the prefix directory.
-        attr_accessor :doc_target_dir
+        # the documentation prefix directory (Autobuild.doc_prefix)
+        attr_writer :doc_target_dir
+
+        # Absolute path to where documentation has to be installed. Returns nil
+        # if the doc_target_dir attribute is not set.
+        def doc_target_dir
+            if @doc_target_dir
+                File.expand_path(@doc_target_dir, File.expand_path(Autobuild.doc_prefix || '.',  prefix))
+            end
+        end
 
         # Defines a documentation generation task. The documentation is first
         # generated by the given block, and then installed. The local attribute
@@ -252,10 +268,9 @@ module Autobuild
             task :doc => "#{name}-doc"
         end
 
-        def install_doc(relative_to = srcdir)
-            full_doc_prefix = File.expand_path(Autobuild.doc_prefix, Autobuild.prefix)
-            doc_target_dir  = File.expand_path(self.doc_target_dir, full_doc_prefix)
-            doc_dir         = File.expand_path(self.doc_dir, relative_to)
+        def install_doc
+            doc_target_dir  = self.doc_target_dir
+            doc_dir         = self.doc_dir
             FileUtils.rm_rf   doc_target_dir
             FileUtils.mkdir_p File.dirname(doc_target_dir)
             FileUtils.cp_r    doc_dir, doc_target_dir

data/lib/autobuild/packages/cmake.rb

@@ -56,8 +56,10 @@ module Autobuild
             @defines[name] = value
         end
 
-        def install_doc
-            super(builddir)
+        def doc_dir
+            if @doc_dir
+                File.expand_path(@doc_dir, builddir)
+            end
         end
 
         # Declare that the given target can be used to generate documentation

data/lib/autobuild/packages/import.rb

@@ -7,10 +7,6 @@ module Autobuild
     end
     
     class ImporterPackage < Package
-        def installstamp
-            "#{srcdir}/#{STAMPFILE}"
-        end
-	
 	attr_reader :exclude
 
         def initialize(*args)

data/lib/autobuild/packages/orogen.rb

@@ -172,6 +172,13 @@ module Autobuild
             end
         end
 
+        def self.map_dependencies_with(&block)
+            @dependency_mapper = block
+        end
+        def self.dependency_mapper
+            @dependency_mapper
+        end
+
         attr_writer :orocos_target
         def orocos_target
             if @orocos_target.nil?
@@ -228,6 +235,8 @@ module Autobuild
                 target = "pkgconfig/#{pkg_name}"
                 if Autobuild::Package[target]
                     depends_on target
+                elsif self.class.dependency_mapper && target = self.class.dependency_mapper[pkg_name]
+                    depends_on target
                 end
             end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +01:00
+date: 2010-03-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency