autobuild 1.5.18 → 1.5.19

data/Changes.txt

@@ -1,3 +1,9 @@
+== Version 1.5.19
+* git: fix cases where the importer was assuming that a branch did not exist
+  while it was
+* orogen: import_types_from accepts arguments for loading files. Be compatible
+  with that.
+
 == Version 1.5.18
 * minor addition to the API for autoproj
 

data/Manifest.txt

@@ -28,6 +28,7 @@ lib/autobuild/pkgconfig.rb
 lib/autobuild/reporting.rb
 lib/autobuild/subcommand.rb
 lib/autobuild/timestamps.rb
+lib/autobuild/version.rb
 samples/openrobots.autobuild
 test/data/cvsroot.tar
 test/data/svnroot.tar

data/Rakefile

@@ -1,5 +1,4 @@
 require 'hoe'
-require 'lib/autobuild'
 
 Hoe.spec 'autobuild' do
     developer "Sylvain Joyeux", "sylvain.joyeux@m4x.org"
@@ -16,7 +15,9 @@ Hoe.spec 'autobuild' do
         ['utilrb', '>= 1.3.3']
 end
 
-Rake.clear_tasks(/publish_docs/)
+Rake.clear_tasks(/publish_docs/, /default/)
+task "default"
+
 task 'publish_docs' => 'docs' do
     if !system('./update_github')
         raise "cannot update the gh-pages branch for GitHub"

data/lib/autobuild.rb

@@ -1,7 +1,4 @@
-module Autobuild
-    VERSION = "1.5.18" unless defined? Autobuild::VERSION
-end
-
+require 'autobuild/version'
 require 'autobuild/config'
 require 'autobuild/configurable'
 require 'autobuild/environment'

data/lib/autobuild/import/git.rb

@@ -225,7 +225,7 @@ module Autobuild
                 if !on_target_branch?
                     # Check if the target branch already exists. If it is the
                     # case, check it out. Otherwise, create it.
-                    if File.file?(File.join(".git", "refs", "heads", branch))
+                    if system("git", "show-ref", "--verify", "--quiet", "refs/heads/#{branch}")
                         package.progress "switching branch of %s to %s" % [package.name, branch]
                         Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', branch)
                     else

data/lib/autobuild/packages/orogen.rb

@@ -94,7 +94,7 @@ module Autobuild
             @dependencies.concat(names)
             nil
         end
-        def import_types_from(name)
+        def import_types_from(name, *args)
             if !File.file?(File.join(base_dir, name)) && name.downcase !~ /\.(hh|hpp|h)/
                 using_toolkit name
             end

data/lib/autobuild/version.rb

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
+  hash: 37
   prerelease: false
   segments: 
   - 1
   - 5
-  - 18
-  version: 1.5.18
+  - 19
+  version: 1.5.19
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +02:00
+date: 2010-08-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 7
@@ -35,9 +38,11 @@ dependencies:
   name: rmail
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -48,9 +53,11 @@ dependencies:
   name: daemons
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 0
@@ -61,9 +68,11 @@ dependencies:
   name: utilrb
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 3
@@ -75,9 +84,11 @@ dependencies:
   name: rubyforge
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 0
@@ -89,9 +100,11 @@ dependencies:
   name: hoe
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 2
         - 6
@@ -158,6 +171,7 @@ files:
 - lib/autobuild/reporting.rb
 - lib/autobuild/subcommand.rb
 - lib/autobuild/timestamps.rb
+- lib/autobuild/version.rb
 - samples/openrobots.autobuild
 - test/data/cvsroot.tar
 - test/data/svnroot.tar
@@ -178,23 +192,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rake-based utility to build and install multiple packages with dependencies