autoproj 1.9.3.rc1 → 1.9.3.rc2

data/bin/autoproj

@@ -130,12 +130,10 @@ EOTEXT
     #
     # First do the resolution to get auto-add, finalize the package
     # configuration, and then re-resolve
-    Autoproj.silent do
-        begin
-            Autoproj::CmdLine.resolve_user_selection(selected_packages)
-        rescue Autoproj::Manifest::ExcludedSelection => e
-            raise e, "#{e.selection}, which is selected on the command line, cannot be built: #{e.message}"
-        end
+    begin
+        Autoproj::CmdLine.resolve_user_selection(selected_packages)
+    rescue Autoproj::Manifest::ExcludedSelection => e
+        raise e, "#{e.selection}, which is selected on the command line, cannot be built: #{e.message}"
     end
     # Now load the rest of the configuration
     Autoproj::CmdLine.finalize_package_setup
@@ -144,7 +142,7 @@ EOTEXT
         begin
             Autoproj::CmdLine.resolve_user_selection(selected_packages)
         rescue Autoproj::Manifest::ExcludedSelection => e
-            raise e, "#{e.sel}, which is selected on the command line, cannot be built: #{e.message}"
+            raise e, "#{e.selection}, which is selected on the command line, cannot be built: #{e.message}"
         end
     Autoproj::CmdLine.validate_user_selection(selected_packages, resolved_selected_packages)
 

data/bin/autoproj_bootstrap

@@ -299,8 +299,8 @@ fi
         class PortManager < ShellScriptManager
             def initialize
                 super(['port'], true,
-                        "port '%s'",
-                        "port '%s'")
+                        "port install '%s'",
+                        "port install '%s'")
             end
         end
 
@@ -521,13 +521,7 @@ fi
                     if !installed.empty? && Autobuild.do_update
                         # Look if we can update the package ...
                         dep = Gem::Dependency.new(name, version_requirements)
-                        available =
-                            if gem_fetcher.respond_to?(:find_matching)
-                                gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease)
-                            else
-                                dep.prerelease = GemManager.with_prerelease
-                                gem_fetcher.search_for_dependency(dep).first
-                            end
+                        available = gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease)
                         installed_version = installed.map(&:version).max
                         available_version = available.map { |(name, v), source| v }.max
                         if !available_version
@@ -1706,6 +1700,14 @@ module Autoproj
         false
     end
 
+    # Forcefully sets the root directory
+    #
+    # This is mostly useful during bootstrapping (i.e. when the search would
+    # fail)
+    def self.root_dir=(dir)
+        @root_dir = dir
+    end
+
     # Returns the root directory of the current autoproj installation.
     #
     # If the current directory is not in an autoproj installation,

data/lib/autoproj/cmdline.rb

@@ -37,8 +37,8 @@ module Autoproj
     end
 
     # Displays a warning message
-    def self.warn(message)
-        Autobuild.warn(message)
+    def self.warn(message, *style)
+        Autobuild.warn(message, *style)
     end
 
     module CmdLine
@@ -153,6 +153,13 @@ module Autoproj
                 Autoproj.load_if_present(local_source, home_dir, ".autoprojrc")
             end
 
+            if Autoproj.has_config_key?('reused_autoproj_installations')
+                reused = Autoproj.user_config('reused_autoproj_installations')
+                reused.each do |path|
+                    Autoproj.manifest.reuse(path)
+                end
+            end
+
             # We load the local init.rb first so that the manifest loading
             # process can use options defined there for the autoproj version
             # control information (for instance)
@@ -782,6 +789,17 @@ module Autoproj
                 end
             end
 
+            selection.exclusions.each do |sel, pkg_names|
+                pkg_names.sort.each do |pkg_name|
+                    Autoproj.warn "#{pkg_name}, which was selected for #{sel}, cannot be built: #{Autoproj.manifest.exclusion_reason(pkg_name)}", :bold
+                end
+            end
+            selection.ignores.each do |sel, pkg_names|
+                pkg_names.sort.each do |pkg_name|
+                    Autoproj.warn "#{pkg_name}, which was selected for #{sel}, is ignored", :orange
+                end
+            end
+
             return all_enabled_packages
         end
 
@@ -1516,29 +1534,50 @@ where 'mode' is one of:
                 end
             end
 
+            Autoproj.root_dir = Dir.pwd
             Autobuild.logdir = File.join(Autoproj.prefix, 'log')
 
             # Check if GEM_HOME is set. If it is the case, assume that we are
-            # bootstrapping from another installation directory and start by
-            # copying the .gems directory
+            # bootstrapping from another autoproj directory. We start by
+            # forcefully installing autoproj/autobuild so that the installation
+            # is self-contained.
             #
             # We don't use Autoproj.gem_home there as we might not be in an
             # autoproj directory at all
             gem_home = ENV['AUTOPROJ_GEM_HOME'] || File.join(Dir.pwd, ".gems")
-            if ENV['GEM_HOME'] && Autoproj.in_autoproj_installation?(ENV['GEM_HOME']) &&
-                ENV['GEM_HOME'] != gem_home
-                if !File.exists?(gem_home)
-                    Autoproj.message "autoproj: reusing bootstrap from #{File.dirname(ENV['GEM_HOME'])}"
-                    FileUtils.cp_r ENV['GEM_HOME'], gem_home
+            if ENV['GEM_HOME'] && Autoproj.in_autoproj_installation?(ENV['GEM_HOME']) && ENV['GEM_HOME'] != gem_home
+                Autoproj::OSDependencies.define_osdeps_mode_option
+                osdeps = Autoproj::OSDependencies.load_default
+                if osdeps_forced_mode
+                    osdeps.osdeps_mode = osdeps_forced_mode
                 end
-                ENV['GEM_HOME'] = gem_home
+                osdeps.osdeps_mode
 
+                Autoproj.message "autoproj: bootstrapping using another installation's autoproj gem"
+                ENV['GEM_HOME'] = gem_home
+                ENV.delete('GEM_PATH')
+                Autoproj.message "installing autoproj in #{ENV['GEM_HOME']} and restarting"
+                osdeps.install ['autoproj']
                 Autoproj.message "restarting bootstrapping from #{Dir.pwd}"
 
                 require 'rbconfig'
                 ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
-                exec ruby, $0, *ARGV
+                ENV['AUTOPROJ_OSDEPS_MODE'] = osdeps.osdeps_mode
+                exec ruby, $0, 'bootstrap', *ARGV
+            end
+
+            reuse = []
+            parser = OptionParser.new do |opt|
+                opt.on '--reuse DIR', 'reuse the given autoproj installation (can be given multiple times)' do |path|
+                    path = File.expand_path(path)
+                    if !File.directory?(path) || !File.directory?(File.join(path, 'autoproj'))
+                        raise ConfigError.new, "#{path} does not look like an autoproj installation"
+                    end
+                    reuse << path
+                end
             end
+            args = parser.parse(args)
+            Autoproj.change_option 'reused_autoproj_installations', reuse, true
 
             # If we are not getting the installation setup from a VCS, copy the template
             # files
@@ -1547,6 +1586,16 @@ where 'mode' is one of:
                 FileUtils.cp_r File.join(sample_dir, "autoproj"), "autoproj"
             end
 
+            handle_ruby_version
+
+            Autobuild.env_set 'RUBYOPT', '-rubygems'
+            Autobuild.env_set 'GEM_HOME', Autoproj.gem_home
+            Autobuild.env_add_path 'PATH', File.join(Autoproj.gem_home, 'bin')
+            Autobuild.env_inherit 'PATH'
+            Autobuild.env_add_path 'GEM_PATH', Autoproj.gem_home
+            Autobuild.env_inherit 'GEM_PATH'
+            Autoproj.export_env_sh
+
             if args.size == 1 # the user asks us to download a manifest
                 manifest_url = args.first
                 Autoproj.message("autoproj: downloading manifest file #{manifest_url}", :bold)
@@ -1555,7 +1604,7 @@ where 'mode' is one of:
                     rescue
                         # Delete the autoproj directory
                         FileUtils.rm_rf 'autoproj'
-                        raise ConfigError.new, "cannot read #{manifest_url}, did you mean 'autoproj bootstrap VCSTYPE #{manifest_url}' ?"
+                        raise ConfigError.new, "cannot read file / URL #{manifest_url}, did you mean 'autoproj bootstrap VCSTYPE #{manifest_url}' ?"
                     end
 
                 File.open(File.join(Autoproj.config_dir, "manifest"), "w") do |io|
@@ -1567,17 +1616,7 @@ where 'mode' is one of:
                 url = VCSDefinition.to_absolute_url(url, Dir.pwd)
                 do_switch_config(false, type, url, *options)
             end
-
-            handle_ruby_version
             Autoproj.save_config
-
-            Autobuild.env_set 'RUBYOPT', '-rubygems'
-            Autobuild.env_set 'GEM_HOME', Autoproj.gem_home
-            Autobuild.env_add_path 'PATH', File.join(Autoproj.gem_home, 'bin')
-            Autobuild.env_inherit 'PATH'
-            Autobuild.env_add_path 'GEM_PATH', Autoproj.gem_home
-            Autobuild.env_inherit 'GEM_PATH'
-            Autoproj.export_env_sh
         end
 
         def self.missing_dependencies(pkg)
@@ -1904,7 +1943,7 @@ where 'mode' is one of:
             STDERR.puts
             STDERR.puts color(e.message, :red, :bold)
             if Autoproj.in_autoproj_installation?(Dir.pwd)
-                root_dir = /^#{Regexp.quote(Autoproj.root_dir)}(?!\/\.gems)/
+                root_dir = /#{Regexp.quote(Autoproj.root_dir)}(?!\/\.gems)/
                 e.backtrace.find_all { |path| path =~ root_dir }.
                     each do |path|
                         STDERR.puts color("  in #{path}", :red, :bold)

data/lib/autoproj/manifest.rb

@@ -944,10 +944,19 @@ module Autoproj
         attr_reader :name
         # The packages listed in this metapackage
         attr_reader :packages
+        # The normal dependency handling behaviour is to generate an error if a
+        # metapackage is selected for the build but some of its dependencies
+        # cannot be built. This modifies the behaviour to simply ignore the
+        # problematic packages.
+        attr_writer :weak_dependencies
+        def weak_dependencies?
+            !!@weak_dependencies
+        end
 
         def initialize(name)
             @name = name
             @packages = []
+            @weak_dependencies = false
         end
         # Adds a package to this metapackage
         def add(pkg)
@@ -1829,7 +1838,12 @@ module Autoproj
             Autoproj.in_file(self.file) do
                 normalized_layout.each_key do |pkg_or_set|
                     begin
-                        result.select(pkg_or_set, resolve_package_set(pkg_or_set))
+                        weak = if meta = metapackages[pkg_or_set]
+                                   meta.weak_dependencies?
+                               end
+
+
+                        result.select(pkg_or_set, resolve_package_set(pkg_or_set), weak)
                     rescue UnknownPackage => e
                         raise e, "#{e.name}, which is selected in the layout, is unknown: #{e.message}", e.backtrace
                     end
@@ -1840,7 +1854,7 @@ module Autoproj
                 result.filter_excluded_and_ignored_packages(self)
             rescue ExcludedSelection => e
                 if validate
-                    raise e, "#{e.sel}, which is selected in the layout, cannot be built: #{e.message}", e.backtrace
+                    raise
                 end
             end
             result
@@ -1987,8 +2001,12 @@ module Autoproj
 
             manifest =
                 if !manifest_path
-                    Autoproj.warn "#{package.name} from #{package_set.name} does not have a manifest"
-                    PackageManifest.new(package)
+                    if !pkg.autobuild.description
+                        Autoproj.warn "#{package.name} from #{package_set.name} does not have a manifest"
+                        PackageManifest.new(package)
+                    else
+                        pkg.autobuild.description
+                    end
                 else
                     PackageManifest.load(package, manifest_path)
                 end
@@ -2129,6 +2147,28 @@ module Autoproj
             # set of user-provided strings that caused that package to be
             # selected
             attr_reader :selection
+            # A flag that tells #filter_excluded_and_ignored_packages whether
+            # the a given package selection is weak or not.
+            #
+            # If true, a selection that have some excluded packages will not
+            # generate an error. Otherwise (the default), an error is generated
+            attr_reader :weak_dependencies
+            # After a call to #filter_excluded_and_ignored_packages, this
+            # contains the set of package exclusions that have been ignored
+            # because the corresponding metapackage has a weak dependency policy
+            attr_reader :exclusions
+            # After a call to #filter_excluded_and_ignored_packages, this
+            # contains the set of package ignores that have been ignored because
+            # the corresponding metapackage has a weak dependency policy
+            attr_reader :ignores
+
+            def initialize
+                @selection = Hash.new { |h, k| h[k] = Set.new }
+                @matches = Hash.new { |h, k| h[k] = Set.new }
+                @weak_dependencies = Hash.new
+                @ignores = Hash.new { |h, k| h[k] = Set.new }
+                @exclusions = Hash.new { |h, k| h[k] = Set.new }
+            end
 
             # The set of packages that have been selected
             def packages
@@ -2143,25 +2183,17 @@ module Autoproj
                 selection.empty?
             end
 
-            def initialize
-                @selection = Hash.new { |h, k| h[k] = Set.new }
-                @matches = Hash.new { |h, k| h[k] = Set.new }
-            end
-            
             def each(&block)
                 selection.each_key(&block)
             end
 
-            def select(sel, packages)
-                if !packages.respond_to?(:each)
-                    matches[sel] << packages
-                    selection[packages] << sel
-                else
-                    matches[sel] |= packages.to_set
-                    packages.each do |pkg_name|
-                        selection[pkg_name] << sel
-                    end
+            def select(sel, packages, weak = false)
+                packages = Array(packages)
+                matches[sel] |= packages.to_set.dup
+                packages.each do |pkg_name|
+                    selection[pkg_name] << sel
                 end
+                weak_dependencies[sel] = weak
             end
 
             def initialize_copy(old)
@@ -2186,7 +2218,7 @@ module Autoproj
                     excluded, other = expansion.partition { |pkg_name| manifest.excluded?(pkg_name) }
                     ignored,  ok    = other.partition { |pkg_name| manifest.ignored?(pkg_name) }
 
-                    if ok.empty? && ignored.empty?
+                    if !excluded.empty? && (!weak_dependencies[sel] || (ok.empty? && ignored.empty?))
                         exclusions = excluded.map do |pkg_name|
                             [pkg_name, manifest.exclusion_reason(pkg_name)]
                         end
@@ -2194,16 +2226,19 @@ module Autoproj
                             reason = exclusions[0][1]
                             if sel == exclusions[0][0]
                                 raise ExcludedSelection.new(sel), "it is excluded from the build: #{reason}"
-                            else
+                            elsif weak_dependencies[sel]
                                 raise ExcludedSelection.new(sel), "it expands to #{exclusions.map(&:first).join(", ")}, which is excluded from the build: #{reason}"
+                            else
+                                raise ExcludedSelection.new(sel), "it requires #{exclusions.map(&:first).join(", ")}, which is excluded from the build: #{reason}"
                             end
-                        else
+                        elsif weak_dependencies[sel]
                             raise ExcludedSelection.new(sel), "it expands to #{exclusions.map(&:first).join(", ")}, and all these packages are excluded from the build:\n  #{exclusions.map { |name, reason| "#{name}: #{reason}" }.join("\n  ")}"
+                        else
+                            raise ExcludedSelection.new(sel), "it requires #{exclusions.map(&:first).join(", ")}, and all these packages are excluded from the build:\n  #{exclusions.map { |name, reason| "#{name}: #{reason}" }.join("\n  ")}"
                         end
-                    elsif !ignored.empty?
-                        ignored.each do |pkg_name|
-                            Autoproj.warn "#{pkg_name} was selected for #{sel}, but is explicitely ignored in the manifest"
-                        end
+                    else
+                        self.exclusions[sel] |= excluded.to_set.dup
+                        self.ignores[sel] |= ignored.to_set.dup
                     end
 
                     excluded = excluded.to_set
@@ -2256,7 +2291,7 @@ module Autoproj
                     if pkg.name =~ match_pkg_name
                         packages = resolve_package_set(pkg.name).to_set
                         packages = (packages & all_layout_packages)
-                        result.select(sel, packages)
+                        result.select(sel, packages, pkg.weak_dependencies?)
                     end
                 end
             end
@@ -2339,10 +2374,13 @@ module Autoproj
             end
 
             manifest = InstallationManifest.new(dir)
-            manifest.load(File.join(dir,  ".autoproj-installation-manifest"))
+            manifest_file = File.join(dir,  ".autoproj-installation-manifest")
+            if !File.file?(manifest_file)
+                raise ConfigError.new, "while setting up reuse of #{dir}, the .autoproj-installation-manifest file does not exist. You should probably rerun autoproj envsh in that folder first"
+            end
+            manifest.load(manifest_file)
             @reused_installations << manifest
             manifest.each do |pkg|
-                puts pkg.name
                 ignore_package pkg.name
             end
         end

data/lib/autoproj/osdeps.rb

@@ -182,8 +182,8 @@ fi
         class PortManager < ShellScriptManager
             def initialize
                 super(['port'], true,
-                        "port '%s'",
-                        "port '%s'")
+                        "port install '%s'",
+                        "port install '%s'")
             end
         end
 
@@ -404,13 +404,7 @@ fi
                     if !installed.empty? && Autobuild.do_update
                         # Look if we can update the package ...
                         dep = Gem::Dependency.new(name, version_requirements)
-                        available =
-                            if gem_fetcher.respond_to?(:find_matching)
-                                gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease)
-                            else
-                                dep.prerelease = GemManager.with_prerelease
-                                gem_fetcher.search_for_dependency(dep).first
-                            end
+                        available = gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease)
                         installed_version = installed.map(&:version).max
                         available_version = available.map { |(name, v), source| v }.max
                         if !available_version

data/lib/autoproj/system.rb

@@ -19,6 +19,14 @@ module Autoproj
         false
     end
 
+    # Forcefully sets the root directory
+    #
+    # This is mostly useful during bootstrapping (i.e. when the search would
+    # fail)
+    def self.root_dir=(dir)
+        @root_dir = dir
+    end
+
     # Returns the root directory of the current autoproj installation.
     #
     # If the current directory is not in an autoproj installation,

data/lib/autoproj/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.3.rc1
+  version: 1.9.3.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild