autoproj 1.3.2 → 1.3.3

data/History.txt

@@ -1,3 +1,9 @@
+= Version 1.3.3
+ * Fix: some configuration options were not properly saved
+ * Fix: env.sh was messed up by partial builds (builds where a directory and/or
+   package name is specified)
+ * Fix: accept subdirectories of packages as argument to builds
+
 = Version 1.3.2
  * Fix: GEM_HOME/bin was not added to env.sh
 

data/bin/autoproj

@@ -507,17 +507,18 @@ report(debug) do
         Autoproj.load_if_present(source, source.local_dir, "overrides.rb")
     end
 
-    # The user is asked for configuration values both during the manifest
-    # loading and the loading of autobuild files. Save it now.
-    Autoproj.save_config
-
     # Now, load the package's importer configurations (from the various
     # source.yml files)
     manifest.load_importers
+
+    # Configuration is finished, so all relevant configuration options should
+    # have been asked to the user. Save it.
+    Autoproj.save_config
+
     if Autoproj.verbose
         # List defined packages, and in which autobuild files they are defined
         STDERR.puts "Available packages:"
-        Autoproj.manifest.packages.each_value do |package, source, file|
+        manifest.packages.each_value do |package, source, file|
             STDERR.puts "  #{package.name}: #{file} from #{source.name}"
         end
     end
@@ -546,12 +547,12 @@ report(debug) do
 
                 lines = []
                 source.each_package.
-                    map { |pkg| [pkg.name, Autoproj.manifest.package_manifests[pkg.name]] }.
+                    map { |pkg| [pkg.name, manifest.package_manifests[pkg.name]] }.
                     sort_by { |name, _| name }.
-                    each do |name, manifest|
-                        vcs_def = Autoproj.manifest.importer_definition_for(name)
-                        if manifest
-                            lines << [name, manifest.short_documentation]
+                    each do |name, source_manifest|
+                        vcs_def = manifest.importer_definition_for(name)
+                        if source_manifest
+                            lines << [name, source_manifest.short_documentation]
                             lines << ["", vcs_def.to_s]
                         else
                             lines << [name, vcs_def.to_s]
@@ -578,10 +579,7 @@ report(debug) do
     # Create the build target from the manifest if the user did not provide an
     # explicit one
     if selected_packages.empty?
-        selected_packages = Autoproj.manifest.default_packages
-    end
-    if Autoproj.verbose
-        STDERR.puts "will install #{selected_packages.to_a.join(", ")}"
+        selected_packages = manifest.default_packages
     end
     if selected_packages.empty? # no packages, terminate
         STDERR.puts
@@ -596,15 +594,20 @@ report(debug) do
     #
     # First, we allow to user to specify packages based on disk paths, so
     # resolve those
-    selected_packages = Autoproj.manifest.expand_package_selection(selected_packages)
+    selected_packages = manifest.expand_package_selection(selected_packages)
+    if selected_packages.empty?
+        STDERR.puts color("autoproj: wrong packages selection on command line", :red)
+        exit 0
+    elsif Autoproj.verbose
+        STDERR.puts "will install #{selected_packages.to_a.join(", ")}"
+    end
     seen = Set.new
-    Autoproj.manifest.each_package_set do |name, packages, enabled_packages|
+    manifest.each_package_set do |name, packages, enabled_packages|
         packages -= seen
 
         srcdir  = File.join(Autoproj.root_dir, name)
         prefix  = File.join(Autoproj.build_dir, name)
         logdir  = File.join(prefix, "log")
-        Autobuild.logdir = logdir
         packages.each do |pkg_name|
             pkg = Autobuild::Package[pkg_name]
             pkg.srcdir = File.join(srcdir, pkg_name)
@@ -617,7 +620,7 @@ report(debug) do
     if only_do_status
         STDERR.puts
         all_packages = Set.new
-        Autoproj.manifest.handle_enabled_packages(selected_packages) do |name, _, layout_enabled|
+        manifest.handle_enabled_packages(selected_packages) do |name, _, layout_enabled|
             all_packages |= layout_enabled
         end
         do_status(all_packages)
@@ -642,7 +645,7 @@ report(debug) do
     #    Otherwise, it is considered as an error
     #
     seen = Set.new
-    Autoproj.manifest.each_package_set do |name, packages, enabled_packages|
+    manifest.each_package_set do |name, packages, enabled_packages|
         packages -= seen
 
         old_update_flag = Autobuild.do_update
@@ -664,7 +667,7 @@ report(debug) do
     all_packages         = Set.new
     all_enabled_packages = Set.new
     all_sublayouts       = Set.new
-    Autoproj.manifest.handle_enabled_packages(selected_packages) do |name, packages, enabled_packages, _|
+    manifest.handle_enabled_packages(selected_packages) do |name, packages, enabled_packages, _|
         packages         -= all_enabled_packages
         enabled_packages -= all_enabled_packages
         all_sublayouts << name
@@ -691,8 +694,8 @@ report(debug) do
                     packages_to_import << dep_name
                 end
             end
-            all_packages.merge(packages)
         end
+        all_packages.merge(packages)
     end
 
     old_update_flag = Autobuild.do_update
@@ -707,7 +710,11 @@ report(debug) do
         Autobuild.do_update = old_update_flag
     end
 
-    missing_packages = all_packages.find_all { |pkg_name| !File.directory?(Autobuild::Package[pkg_name].srcdir) }
+    missing_packages = all_packages.
+        find_all do |pkg_name|
+            !File.directory?(Autobuild::Package[pkg_name].srcdir)
+        end
+
     if missing_packages.empty?
         # Backward compatibility: check if name/env.sh exists, and if it is
         # the case, simply replace it with a link to the root one. And issue
@@ -740,6 +747,8 @@ report(debug) do
         end
 
         Autobuild.apply(all_enabled_packages, "autoproj-build")
+    elsif !no_os_deps
+        manifest.install_os_dependencies(all_enabled_packages)
     end
 
     prefixes = all_enabled_packages.inject(Set.new) do |set, pkg_name|

data/lib/autoproj/manifest.rb

@@ -955,17 +955,11 @@ module Autoproj
                     pkg.name
                 end
 
-            selected_packages = selected_packages.map do |sel|
-                if sel[0] == ?/ # anchored selection
-                    /^#{sel}/
-                else
-                    Regexp.new(sel)
-                end
-            end
-
             # First, remove packages that are directly referenced by name or by
             # package set names
             selected_packages.delete_if do |sel|
+                sel = Regexp.new(Regexp.quote(sel))
+
                 packages = package_names.find_all { |pkg_name| pkg_name =~ sel }
                 expanded_packages.concat(packages)
 
@@ -988,7 +982,7 @@ module Autoproj
                         expanded_packages.concat(packages.to_a)
                     else
                         packages = packages.find_all do |pkg_name|
-                            (layout_name + pkg_name) =~ sel
+                            sel =~ Regexp.new(Regexp.quote(layout_name + pkg_name))
                         end
                         expanded_packages.concat(packages)
                         !packages.empty?

data/lib/autoproj/osdeps.rb

@@ -13,12 +13,14 @@ module Autoproj
         end
         AUTOPROJ_OSDEPS = File.join(File.expand_path(File.dirname(__FILE__)), 'default.osdeps')
         def self.load_default
-            OSDependencies.load(AUTOPROJ_OSDEPS)
+            @default_osdeps ||= OSDependencies.load(AUTOPROJ_OSDEPS)
         end
 
         attr_reader :definitions
+        attr_reader :gem_fetcher
         def initialize(defs = Hash.new)
             @definitions = defs.to_hash
+            @gem_fetcher = Gem::SpecFetcher.fetcher
         end
 
         def merge(info)
@@ -203,21 +205,22 @@ module Autoproj
                 did_something ||= true
             end
 
-            # Don't install gems that are already there ...
-            gems.delete_if do |name|
-                version_requirements = Gem::Requirement.default
-                installed = Gem.source_index.find_name(name, version_requirements)
-                if !installed.empty? && Autobuild.do_update
-                    # Look if we can update the package ...
-                    dep = Gem::Dependency.new(name, version_requirements)
-                    remote   = Gem::SpecFetcher.fetcher
-                    available = remote.find_matching(dep)
-                    installed_version = installed.map(&:version).max
-                    available_version = available.map { |(name, v), source| v }.max
-                    needs_update = (available_version > installed_version)
-                    !needs_update
-                else
-                    !installed.empty?
+            if !gems.empty?
+                # Don't install gems that are already there ...
+                gems.delete_if do |name|
+                    version_requirements = Gem::Requirement.default
+                    installed = Gem.source_index.find_name(name, version_requirements)
+                    if !installed.empty? && Autobuild.do_update
+                        # Look if we can update the package ...
+                        dep = Gem::Dependency.new(name, version_requirements)
+                        available = @gem_fetcher.find_matching(dep)
+                        installed_version = installed.map(&:version).max
+                        available_version = available.map { |(name, v), source| v }.max
+                        needs_update = (available_version > installed_version)
+                        !needs_update
+                    else
+                        !installed.empty?
+                    end
                 end
             end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.3.2"
+    VERSION = "1.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 +01:00
+date: 2010-01-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency