autoproj 1.11.0.rc1 → 1.11.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2355dd362e769ce1badfc7e1fee1fedfe9cdd0a8
-  data.tar.gz: 4240e201c16d859dae7c5694546407c150c2bbdb
+  metadata.gz: 41de6372aa6ee2fca24f7c8f3b7c4ca3c1ca8d4d
+  data.tar.gz: 3235881ff0bf56f54243d6869c8b76d5aebc0a6b
 SHA512:
-  metadata.gz: 5ea9258e525c023bedb01672cb6b23384a5d55d77d6939153435e976a8009597db453cacabda6f7170fa140bb788c9dac15ea10528d9e4e595a8f360748dfe6e
-  data.tar.gz: 3cd7404f69a2d0d706ab170e8733123810867b58ef2256d1d351571b91df5671133e0f270169ec586a73b27117a100257cc7e99369219fbb2d9e6e8e9f94aa2b
+  metadata.gz: 63b62854e75a48479009286c796ac2a86566faa7cdc070019e860e7025d04c8b7500f4d288d39be3c412a9a2991bb3aebb98a71e253c531e693397c5b55e6d1d
+  data.tar.gz: b8b7bce7c13c6c68b4d18a0be3acd760aa49dff4aad0c5b974d6a82d273fa43518f32c4828b50e3836151a62a6e1330387f3381c79cd13e7651f6c13cd2473a0

data/lib/autoproj/ops/configuration.rb

@@ -173,8 +173,6 @@ module Autoproj
             if imported_from
                 pkg_set.imported_from << imported_from
                 imported_from.imports << pkg_set
-            else
-                pkg_set.explicit = true
             end
             pkg_set
         end
@@ -238,6 +236,7 @@ module Autoproj
                 # Finally, queue the imports
                 queue_auto_imports_if_needed(queue, pkg_set)
             end
+
             cleanup_remotes_dir(package_sets)
             cleanup_remotes_user_dir(package_sets)
             package_sets
@@ -266,9 +265,15 @@ module Autoproj
             end
         end
 
-        def sort_package_sets_by_import_order(package_sets)
+        def sort_package_sets_by_import_order(package_sets, root_pkg_set)
+            # We do not consider the 'standalone' package sets while sorting.
+            # They are taken care of later, as we need to maintain the order the
+            # user defined in the package_sets section of the manifest
+            queue = package_sets.find_all do |pkg_set|
+                (!pkg_set.imports.empty? || !pkg_set.explicit?) && !(pkg_set == root_pkg_set)
+            end
+
             sorted = Array.new
-            queue = package_sets.dup
             while !queue.empty?
                 pkg_set = queue.shift
                 if pkg_set.imports.any? { |imported_set| !sorted.include?(imported_set) }
@@ -277,6 +282,25 @@ module Autoproj
                     sorted << pkg_set
                 end
             end
+
+            # We now need to re-add the standalone package sets. Their order is
+            # determined by the order in the package_set section of the manifest
+            #
+            # Concretely, we add them in order, just after the entry above them
+            previous = nil
+            root_pkg_set.imports.each do |explicit_pkg_set|
+                if !sorted.include?(explicit_pkg_set)
+                    if !previous
+                        sorted.unshift explicit_pkg_set
+                    else
+                        i = sorted.index(previous)
+                        sorted.insert(i + 1, explicit_pkg_set)
+                    end
+                end
+                previous = pkg_set
+            end
+
+            sorted << root_pkg_set
             sorted
         end
 
@@ -294,7 +318,10 @@ module Autoproj
             root_pkg_set.load_description_file
             root_pkg_set.explicit = true
             package_sets = load_and_update_package_sets(root_pkg_set, only_local)
-            package_sets = sort_package_sets_by_import_order(package_sets)
+            root_pkg_set.imports.each do |pkg_set|
+                pkg_set.explicit = true
+            end
+            package_sets = sort_package_sets_by_import_order(package_sets, root_pkg_set)
             package_sets.each do |pkg_set|
                 manifest.register_package_set(pkg_set)
             end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.11.0.rc1"
+    VERSION = "1.11.0.rc2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.11.0.rc1
+  version: 1.11.0.rc2
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 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.