autoproj 1.13.7 → 2.0.0.b1

data/bin/autoproj_bootstrap.in

@@ -74,7 +74,14 @@ module Autobuild
 
     module Subprocess
         def self.run(name, phase, *cmd)
-            output = `'#{cmd.join("' '")}'`
+            if cmd.last.kind_of?(Hash)
+                options = cmd.pop
+                (options[:env] || Hash.new).each do |k, v|
+                    ENV[k] = v
+                end
+            end
+
+            output = `#{cmd.join(" ")}`
             if $?.exitstatus != 0
                 STDERR.puts "ERROR: failed to run #{cmd.join(" ")}"
                 STDERR.puts "ERROR: command output is: #{output}"
@@ -94,7 +101,6 @@ end
 
 OSDEPS_CODE
 TOOLS_CODE
-OPTIONS_CODE
 SYSTEM_CODE
 
 DEFS = <<EODEFS
@@ -148,6 +154,24 @@ if !curdir_entries.empty? && ENV['AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR'] != '1
     end
 end
 
+# While in here, we don't have utilrb
+module Kernel
+    def filter_options(options, defaults)
+        options = options.dup
+        filtered = Hash.new
+        defaults.each do |k, v|
+            filtered[k] =
+                if options.has_key?(k) then options.delete(k)
+                else v
+                end
+        end
+        return filtered, options
+    end
+    def validate_options(options, defaults)
+        defaults.merge(options)
+    end
+end
+
 # Environment is clean, so just mark it as so unconditionally
 ENV['AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR'] = '1'
 
@@ -159,7 +183,6 @@ ENV['GEM_HOME'] = gem_home
 ENV['GEM_PATH'] = gem_path
 ENV['PATH']     = "#{ENV['GEM_HOME']}/bin:#{ENV['PATH']}"
 
-
 Autoproj::OSDependencies.define_osdeps_mode_option
 osdeps_mode = Autoproj::OSDependencies.osdeps_mode.join(",")
 ENV['AUTOPROJ_OSDEPS_MODE'] = osdeps_mode
@@ -178,6 +201,7 @@ osdeps_management =
         Autoproj::OSDependencies.new(YAML.load(DEFS))
     end
 osdeps_management.silent = false
+Autoproj::PackageManagers::GemManager.gem_home = gem_home
 Autoproj::PackageManagers::GemManager.use_cache_dir
 
 begin

data/lib/autoproj.rb

@@ -1,7 +1,10 @@
 require "enumerator"
+require 'utilrb/module/attr_predicate'
 require 'autobuild'
 require 'autoproj/base'
+require 'autoproj/exceptions'
 require 'autoproj/version'
+require 'autoproj/reporter'
 require 'autoproj/environment'
 require 'autoproj/variable_expansion'
 require 'autoproj/vcs_definition'
@@ -17,15 +20,18 @@ require 'autoproj/system'
 require 'autoproj/build_option'
 require 'autoproj/configuration'
 require 'autoproj/options'
+# Required by Workspace
+require 'autoproj/ops/import'
 # Required for auto-saving in import_packages
 require 'autoproj/ops/snapshot'
-require 'autoproj/cmdline'
 require 'autoproj/query'
 
 require 'autoproj/ops/tools'
 require 'autoproj/ops/loader'
 require 'autoproj/ops/configuration'
 
+require 'autoproj/workspace'
+
 require 'logger'
 require 'utilrb/logger'
 
@@ -37,5 +43,21 @@ module Autoproj
     logger.level = Logger::WARN
     logger.formatter = lambda { |severity, time, progname, msg| "#{severity}: #{msg}\n" }
     extend Logger::Forward
+
+    def self.warn_deprecated_level
+        @warn_deprecated_level
+    end
+
+    def self.warn_deprecated_level=(level)
+        @warn_deprecated_level = level
+    end
+    @warn_deprecated_level = 0
+
+    def self.warn_deprecated(method, msg, level = 0)
+        if level >= @warn_deprecated_level
+            Autoproj.warn "#{method} is deprecated, #{msg}"
+            caller.each { |l| Autoproj.warn "  #{l}" }
+        end
+    end
 end
 

data/lib/autoproj/autobuild.rb

@@ -3,9 +3,17 @@ require 'fileutils'
 require 'autobuild'
 require 'set'
 
-def explicit_osdeps_selection(name)
-    if !Autoproj.declared_option?("osdeps_#{name}")
-	if Autoproj.has_config_key?("osdeps_#{name}")
+module Autoproj
+    module CmdLine
+        def self.ruby_executable
+            Autoproj.workspace.config.ruby_executable
+        end
+    end
+end
+
+def explicit_osdeps_selection(name, config = Autoproj.config)
+    if !config.declared?("osdeps_#{name}")
+	if config.has_value_for?("osdeps_#{name}")
 	    doc_string = "install #{name} from source ?"
 	else
 	    # Declare the option
@@ -18,12 +26,12 @@ Do you want me to build #{name} from source ? If you say 'no', you will have to
 	    EOT
 	end
 
-	Autoproj.configuration_option(
+	config.declare(
 	    "osdeps_#{name}", "boolean",
 	    :default => "yes",
 	    :doc => doc_string)
     end
-    !Autoproj.user_config("osdeps_#{name}")
+    !config.get("osdeps_#{name}")
 end
 
 module Autobuild
@@ -100,18 +108,12 @@ module Autobuild
                 name = name.name
             end
 
-            if Autoproj::CmdLine.ignore_dependencies?
-                return
-            end
-
             @os_packages ||= Set.new
             pkg_autobuild, pkg_os = partition_package(name)
             pkg_autobuild.each do |pkg|
                 __depends_on__(pkg)
             end
             @os_packages |= pkg_os.to_set
-        rescue Autoproj::OSDependencies::MissingOSDep
-            Autoproj.manifest.add_exclusion(self.name, "it depends on #{name}, which is neither the name of a source package, nor an osdep that is available on this operating system")
         end
 
         def depends_on_os_package(name)
@@ -125,16 +127,12 @@ module Autobuild
         end
 
         def optional_dependency(name)
-            if Autoproj::CmdLine.ignore_dependencies?
-                return
-            end
-
             optional_dependencies << name
         end
 
         def partition_package(pkg_name)
             pkg_autobuild, pkg_osdeps = [], []
-            Autoproj.manifest.resolve_package_name(pkg_name).each do |type, dep_name|
+            Autoproj.workspace.manifest.resolve_package_name(pkg_name).each do |type, dep_name|
                 if type == :osdeps
                     pkg_osdeps << dep_name
                 elsif type == :package
@@ -146,34 +144,23 @@ module Autobuild
         end
 
         def partition_optional_dependencies
-            packages, osdeps, disabled = [], [], []
+            packages, osdeps = [], []
             optional_dependencies.each do |name|
-                if !Autoproj.manifest.package_enabled?(name, false)
-                    disabled << name
-                    next
-                end
-
-                pkg_autobuild, pkg_osdeps = partition_package(name)
-                valid = pkg_autobuild.all? { |pkg| Autoproj.manifest.package_enabled?(pkg) } &&
-                    pkg_osdeps.all? { |pkg| Autoproj.manifest.package_enabled?(pkg) }
-
-                if valid
+                begin
+                    pkg_autobuild, pkg_osdeps = partition_package(name)
                     packages.concat(pkg_autobuild)
                     osdeps.concat(pkg_osdeps)
-                else
-                    disabled << name
+                rescue Autoproj::PackageNotFound
+                    # Simply ignore non-existent optional dependencies
                 end
             end
-            return packages, osdeps, disabled
+            return packages, osdeps
         end
 
         def resolve_optional_dependencies
-            if !Autoproj::CmdLine.ignore_dependencies?
-                packages, osdeps, disabled = partition_optional_dependencies
-                packages.each { |pkg| depends_on(pkg) }
-                @os_packages ||= Set.new
-                @os_packages |= osdeps.to_set
-            end
+            packages, osdeps = partition_optional_dependencies
+            packages.each { |pkg| __depends_on__(pkg) }
+            os_packages.merge(osdeps.to_set)
         end
 
         def optional_dependencies
@@ -223,25 +210,6 @@ module Autobuild
 end
 
 module Autoproj
-    # Subclass of Autobuild::Reporter, used to display a message when the build
-    # finishes/fails.
-    class Reporter < Autobuild::Reporter
-        def error(error)
-            error_lines = error.to_s.split("\n")
-            Autoproj.message("Command failed", :bold, :red, STDERR)
-            Autoproj.message("#{error_lines.shift}", :bold, :red, STDERR)
-            error_lines.each do |line|
-                Autoproj.message line, STDERR
-            end
-        end
-        def success
-            Autoproj.message("Command finished successfully at #{Time.now}", :bold, :green)
-            if Autobuild.post_success_message
-                Autoproj.message Autobuild.post_success_message
-            end
-        end
-    end
-
     @file_stack       = Array.new
 
     def self.package_name_from_options(spec)
@@ -252,40 +220,34 @@ module Autoproj
         end
     end
 
-    # @deprecated use Ops.loader.in_package_set or add a proper Loader object to your
+    # @deprecated use Autoproj.workspace.in_package_set or add a proper Loader object to your
     #   class
     def self.in_package_set(package_set, path, &block)
-        Ops.loader.in_package_set(package_set, path, &block)
+        Autoproj.workspace.in_package_set(package_set, path, &block)
     end
-
-    # @deprecated use Ops.loader.current_file or add a proper Loader object to your
+    # @deprecated use Autoproj.workspace.current_file or add a proper Loader object to your
     #   class
     def self.current_file
-        Ops.loader.current_file
+        Autoproj.workspace.current_file
     end
-
-    # @deprecated use Ops.loader.current_package_set or add a proper Loader object to your
+    # @deprecated use Autoproj.workspace.current_package_set or add a proper Loader object to your
     #   class
     def self.current_package_set
-        Ops.loader.current_package_set
+        Autoproj.workspace.current_package_set
     end
 
     def self.define(package_type, spec, &block)
         package = Autobuild.send(package_type, spec)
-        Autoproj.manifest.register_package(package, block, *current_file)
+        Autoproj.workspace.manifest.register_package(package, block, *current_file)
         package
     end
 
-    @loaded_autobuild_files = Set.new
-
-    class << self
-        attr_reader :loaded_autobuild_files
+    def self.loaded_autobuild_files
+        Autoproj.workspace.loaded_autobuild_files
     end
 
     def self.import_autobuild_file(package_set, path)
-        return if @loaded_autobuild_files.include?(path)
-        Autoproj.load(package_set, path)
-        @loaded_autobuild_files << path
+        Autoproj.workspace.import_autobuild_file(package_set, path)
     end
 
     def self.find_topmost_directory_containing(dir, glob_pattern = nil)
@@ -344,7 +306,7 @@ def setup_package(package_name, &block)
         raise ConfigError.new, "you must give a block to #setup_package"
     end
 
-    package_definition = Autoproj.manifest.package(package_name)
+    package_definition = Autoproj.workspace.manifest.package(package_name)
     if !package_definition
         raise ConfigError.new, "#{package_name} is not a known package"
     elsif package_definition.autobuild.kind_of?(Autobuild::DummyPackage)
@@ -360,7 +322,7 @@ def package_common(package_type, spec, &block)
 
     if Autobuild::Package[package_name]
         current_file = Autoproj.current_file[1]
-        old_file     = Autoproj.manifest.definition_file(package_name)
+        old_file     = Autoproj.workspace.manifest.definition_file(package_name)
         Autoproj.warn "#{package_name} from #{current_file} is overridden by the definition in #{old_file}"
 
         return Autobuild::Package[package_name]
@@ -434,10 +396,10 @@ def autotools_package(options, &block)
 end
 
 def env_set(name, value)
-    Autoproj.env_set(name, value)
+    Autoproj.env.set(name, value)
 end
 def env_add(name, value)
-    Autoproj.env_add(name, value)
+    Autoproj.env.add(name, value)
 end
 
 
@@ -548,7 +510,7 @@ def not_on(*architectures)
         current_packages
 
     new_packages.each do |pkg_name|
-        Autoproj.manifest.add_exclusion(pkg_name, "#{pkg_name} is disabled on this operating system")
+        Autoproj.workspace.manifest.add_exclusion(pkg_name, "#{pkg_name} is disabled on this operating system")
     end
 end
 
@@ -563,16 +525,16 @@ end
 
 # Define a configuration option
 #
-# See Autoproj.configuration_option
+# @see Autoproj::Configuration#declare
 def configuration_option(*opts, &block)
-    Autoproj.configuration_option(*opts, &block)
+    Autoproj.config.declare(*opts, &block)
 end
 
 # Retrieves the configuration value for the given option
 #
 # See Autoproj.user_config
 def user_config(key)
-    Autoproj.user_config(key)
+    Autoproj.config.get(key)
 end
 
 class Autobuild::Git
@@ -625,42 +587,42 @@ class Autobuild::ArchiveImporter
 end
 
 def package(name)
-    Autobuild::Package[name]
+    Autoproj.workspace.manifest.find_autobuild_package(name)
 end
 
 # Returns true if +name+ is a valid package and is neither excluded nor ignored
 # from the build
 def package_selected?(name)
-    Autoproj.manifest.package_selected?(name, false)
+    Autoproj.workspace.manifest.package_selected?(name, false)
 end
 
 # Returns true if +name+ is a valid package and is included in the build
 def package_enabled?(name)
-    Autoproj.manifest.package_enabled?(name, false)
+    Autoproj.workspace.manifest.package_enabled?(name, false)
 end
 
 # If used in init.rb, allows to disable automatic imports from specific package
 # sets
 def disable_imports_from(name)
-    Autoproj.manifest.disable_imports_from(name)
+    Autoproj.workspace.manifest.disable_imports_from(name)
 end
 
 # Moves the given package to a new subdirectory
 def move_package(name, new_dir)
-    Autoproj.manifest.move_package(name, new_dir)
+    Autoproj.workspace.manifest.move_package(name, new_dir)
 end
 
 # Removes all the packages currently added from the given metapackage
 #
 # Calling this function will make sure that the given metapackage is now empty.
 def clear_metapackage(name)
-    meta = Autoproj.manifest.metapackage(name)
+    meta = Autoproj.workspace.manifest.metapackage(name)
     meta.packages.clear
 end
 
 # Declares a new metapackage, or adds packages to an existing one
 def metapackage(name, *packages)
-    Autoproj.manifest.metapackage(name, *packages)
+    Autoproj.workspace.manifest.metapackage(name, *packages)
 end
 
 # This can be used only during the load of a package set
@@ -682,15 +644,15 @@ end
 # their dependencies) are.
 def remove_from_default(*names)
     pkg_set = Autoproj.current_package_set
-    Autoproj.manifest.metapackage(pkg_set.name).packages.delete_if do |pkg|
+    Autoproj.workspace.manifest.metapackage(pkg_set.name).packages.delete_if do |pkg|
         names.include?(pkg.name)
     end
 end
 
 def renamed_package(current_name, old_name, options)
-    if options[:obsolete] && !Autoproj.manifest.explicitely_selected_in_layout?(old_name)
+    if options[:obsolete] && !Autoproj.workspace.manifest.explicitely_selected_in_layout?(old_name)
         import_package old_name
-        Autoproj.manifest.add_exclusion old_name, "#{old_name} has been renamed to #{current_name}, you still have the option of using the old name by adding '- #{old_name}' explicitely in the layout in autoproj/manifest, but be warned that the name will stop being usable at all in the near future"
+        Autoproj.workspace.manifest.add_exclusion old_name, "#{old_name} has been renamed to #{current_name}, you still have the option of using the old name by adding '- #{old_name}' explicitely in the layout in autoproj/manifest, but be warned that the name will stop being usable at all in the near future"
     else
         metapackage old_name, current_name
     end

data/lib/autoproj/base.rb

@@ -7,15 +7,6 @@ module Autoproj
             ArgumentError
         end
             
-    class ConfigError < RuntimeError
-        attr_accessor :file
-        def initialize(file = nil)
-            super
-            @file = file
-        end
-    end
-    class InternalError < RuntimeError; end
-
     # Yields, and if the given block raises a ConfigError with no file assigned,
     # add that file to both the object and the exception message
     def self.in_file(file, exception_t = ConfigError)

data/lib/autoproj/build_option.rb

@@ -1,8 +1,6 @@
 module Autoproj
-    class InputError < RuntimeError; end
-
     # Definition of an autoproj option as defined by
-    # {Configuration#configuration_option}
+    # {Configuration#declare}
     class BuildOption
         attr_reader :name
         attr_reader :type