autoproj 1.7.1 → 1.7.2

data/History.txt

@@ -1,3 +1,8 @@
+= Version 1.7.2
+== Quickfix release
+ * fix layouts that use subdirectories
+ * load overrides.rb being loaded *before* the optiona dependencies are resolved
+
 = Version 1.7.1
 == Quickfix release
  * autoproj update was not installing osdeps even if the osdeps mode was not

data/lib/autoproj/cmdline.rb

@@ -279,9 +279,6 @@ module Autoproj
                 end
             end
 
-            # Resolve optional dependencies
-            manifest.resolve_optional_dependencies
-
             # Load the package's override files. each_source must not load the
             # source.yml file, as init.rb may define configuration options that are used
             # there
@@ -289,6 +286,9 @@ module Autoproj
                 Autoproj.load_if_present(source, source.local_dir, "overrides.rb")
             end
 
+            # Resolve optional dependencies
+            manifest.resolve_optional_dependencies
+
             # We now have processed the process setup blocks. All configuration
             # should be done and we can save the configuration data.
             Autoproj.save_config

data/lib/autoproj/manifest.rb

@@ -1376,7 +1376,7 @@ module Autoproj
             names.to_set
         end
 
-        def normalized_layout(result = Hash.new { '/' }, layout_level = '/', layout_data = (data['layout'] || Hash.new))
+        def normalized_layout(result = Hash.new, layout_level = '/', layout_data = (data['layout'] || Hash.new))
             layout_data.each do |value|
                 if value.kind_of?(Hash)
                     subname, subdef = value.find { true }
@@ -1393,7 +1393,7 @@ module Autoproj
             Autoproj.in_file(self.file) do
                 set_name = definition_source(package_name).name
                 actual_layout = normalized_layout
-                return actual_layout[package_name] || actual_layout[set_name]
+                return actual_layout[package_name] || actual_layout[set_name] || '/'
             end
         end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.1"
+    VERSION = "1.7.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 7
-  - 1
-  version: 1.7.1
+  - 2
+  version: 1.7.2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +01:00
+date: 2010-12-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,26 +98,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
-  type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: webgen
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,11 +113,11 @@ dependencies:
         - 9
         version: 0.5.9
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rdoc
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -145,23 +129,23 @@ dependencies:
         - 0
         version: 2.4.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 47
         segments: 
         - 2
-        - 7
+        - 8
         - 0
-        version: 2.7.0
+        version: 2.8.0
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 description: |-
   What is Autoproj
   ----------------