autoproj 1.8.2.b24 → 1.8.2.b25

data/lib/autoproj/autobuild.rb

@@ -289,7 +289,7 @@ module Autoproj
     # Tries to find a handler automatically for 'full_path'
     def self.package_handler_for(full_path)
         if !Dir.enum_for(:glob, File.join(full_path, "*.orogen")).to_a.empty?
-            "orogen_package"
+            return "orogen_package", full_path
         elsif File.file?(File.join(full_path, "CMakeLists.txt"))
             dir = find_topmost_directory_containing(full_path) do |dir|
                 cmakelists = File.join(dir, 'CMakeLists.txt')

data/lib/autoproj/cmdline.rb

@@ -603,9 +603,6 @@ module Autoproj
                     block.call(pkg)
                 end
 
-                pkg.prepare
-                Rake::Task["#{pkg.name}-prepare"].instance_variable_set(:@already_invoked, true)
-
                 # Verify that its dependencies are there, and add
                 # them to the selected_packages set so that they get
                 # imported as well
@@ -642,6 +639,10 @@ module Autoproj
 
 		pkg = Autobuild::Package[pkg_name]
 		pkg.resolve_optional_dependencies
+
+                pkg.prepare
+                Rake::Task["#{pkg.name}-prepare"].instance_variable_set(:@already_invoked, true)
+
 		package_queue.concat(pkg.dependencies)
             end
 
@@ -1072,6 +1073,9 @@ where 'mode' is one of:
                 @update_os_dependencies = true
             when "snapshot"
                 @snapshot_dir = remaining_args.shift
+                if !snapshot_dir
+                    raise ConfigError.new, "target directory missing\nusage: autoproj snapshot target_dir"
+                end
                 Autobuild.do_update = false
                 Autobuild.do_build  = false
                 @update_os_dependencies = false

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.b24"
+    VERSION = "1.8.2.b25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.2.b24
+  version: 1.8.2.b25
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &20268800 !ruby/object:Gem::Requirement
+  requirement: &7939040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *20268800
+  version_requirements: *7939040
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &20268240 !ruby/object:Gem::Requirement
+  requirement: &7937940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *20268240
+  version_requirements: *7937940
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &20267620 !ruby/object:Gem::Requirement
+  requirement: &7937260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *20267620
+  version_requirements: *7937260
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20266800 !ruby/object:Gem::Requirement
+  requirement: &7936480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *20266800
+  version_requirements: *7936480
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20265500 !ruby/object:Gem::Requirement
+  requirement: &7935100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *20265500
+  version_requirements: *7935100
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.