autobuild 1.5.26 → 1.5.27

data/Changes.txt

@@ -1,3 +1,6 @@
+== Version 1.5.27
+* small fixes
+
 == Version 1.5.26
 * add statistics support
 

data/lib/autobuild/configurable.rb

@@ -98,7 +98,9 @@ module Autobuild
                 end
             end
             task "#{name}-build" => buildstamp
-
+            if has_doc?
+                task "#{name}-doc" => configurestamp
+            end
             file installstamp => buildstamp
         end
 

data/lib/autobuild/import/git.rb

@@ -69,7 +69,11 @@ module Autobuild
         # a push URL for people that have commit rights
         #
         # #repository is always used for read-only operations
-        attr_reader :push_to
+        attr_accessor :push_to
+
+        # If set, git will be configured so that a "git push" pushes by default
+        # to the specified branch, instead of using #branch
+        attr_accessor :push_to_branch
 
         # The branch this importer is tracking
         #
@@ -126,6 +130,15 @@ module Autobuild
                 end
                 Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
                                "--replace-all", "remote.autobuild.fetch",  "+refs/heads/*:refs/remotes/autobuild/*")
+
+                if push_to_branch
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
+                               "--replace-all", "remote.autobuild.push",  "refs/heads/#{local_branch || branch}:refs/heads/#{push_to_branch}")
+                else
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
+                               "--replace-all", "remote.autobuild.push",  "refs/heads/*:refs/heads/*")
+                end
+
                 if local_branch
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
                                    "--replace-all", "branch.#{local_branch}.remote",  "autobuild")

data/lib/autobuild/package.rb

@@ -324,7 +324,7 @@ module Autobuild
         # In general, specific package types define a meaningful #with_doc
         # method which calls this method internally.
         def doc_task
-            task "#{name}-doc" => "#{name}-build" do
+            task "#{name}-doc" do
                 @installed_doc = false
                 catch(:doc_disabled) do
                     begin

data/lib/autobuild/packages/orogen.rb

@@ -186,6 +186,17 @@ module Autobuild
             end
         end
 
+        def self.orogen_version
+            if !@orogen_version && root = orogen_root
+                version_file = File.join(root, 'orogen', 'version.rb')
+                version_line = File.readlines(version_file).grep(/VERSION\s*=\s*"/).first
+                if version_line =~ /.*=\s+"(.+)"$/
+                    @orogen_version = $1
+                end
+            end
+            @orogen_version
+        end
+
         attr_writer :orocos_target
         def orocos_target
             if @orocos_target.nil?
@@ -308,6 +319,10 @@ module Autobuild
             end
             cmdline << orogen_file
 
+            if (version = Orogen.orogen_version) && (version >= "1.0")
+                cmdline << "--parallel-build=#{parallel_build_level}"
+            end
+
             progress "generating oroGen project %s"
             Dir.chdir(srcdir) do
                 Subprocess.run self, 'orogen', *cmdline

data/lib/autobuild/subcommand.rb

@@ -245,7 +245,7 @@ module Autobuild::Subprocess
         duration = Time.now - start_time
         Autobuild.add_stat(target, phase, duration)
         File.open(File.join(Autobuild.logdir, "stats.log"), 'a') do |io|
-            io.puts "#{target} #{phase} #{duration}"
+            io.puts "#{target_name} #{phase} #{duration}"
         end
         if target.respond_to?(:add_stat)
             target.add_stat(phase, duration)

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.26" unless defined? Autobuild::VERSION
+    VERSION = "1.5.27" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 1
   - 5
-  - 26
-  version: 1.5.26
+  - 27
+  version: 1.5.27
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +01:00
+date: 2010-12-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency