autoproj 1.13.7 → 2.0.0.b1

data/lib/autoproj/configuration.rb

@@ -14,12 +14,15 @@ module Autoproj
         attr_reader :declared_options
         # The options that have already been shown to the user
         attr_reader :displayed_options
+        # The path to the underlying configuration file
+        attr_reader :path
 
-        def initialize
+        def initialize(path = nil)
             @config = Hash.new
             @overrides = Hash.new
             @declared_options = Hash.new
             @displayed_options = Hash.new
+            @path = path
         end
 
         # Deletes the current value for an option
@@ -58,14 +61,14 @@ module Autoproj
         end
 
         # Get the value for a given option
-        def get(key, default_value = nil)
+        def get(key, *default_value)
             if overrides.has_key?(key)
                 return overrides[key]
             end
 
             value, validated = config[key]
-            if value.nil? && !declared?(key) && !default_value.nil?
-                default_value
+            if value.nil? && !declared?(key) && !default_value.empty?
+                default_value.first
             elsif value.nil? || (declared?(key) && !validated)
                 value = configure(key)
             else
@@ -141,15 +144,27 @@ module Autoproj
             end
         end
 
-        def load(path, reconfigure = false)
-            if h = YAML.load(File.read(path))
+        def load(options = Hash.new)
+            options = validate_options options,
+                path: self.path,
+                reconfigure: false
+
+            if h = YAML.load(File.read(options[:path]))
                 h.each do |key, value|
-                    set(key, value, !reconfigure)
+                    set(key, value, !options[:reconfigure])
                 end
             end
         end
 
-        def save(path)
+        def reconfigure!
+            new_config = Hash.new
+            config.each do |key, (value, user_validated)|
+                new_config[key] = [value, false]
+            end
+            @config = new_config
+        end
+
+        def save(path = self.path)
             File.open(path, "w") do |io|
                 h = Hash.new
                 config.each do |key, value|
@@ -176,17 +191,13 @@ module Autoproj
         end
 
         def ruby_executable
-            @ruby_executable ||= OSDependencies.autodetect_ruby_program
-        end
-
-        # For Autoproj 2.0 forward compatibility
-        def shell_helpers?
-            Autoproj.shell_helpers?
-        end
-
-        # For Autoproj 2.0 forward compatibility
-        def shell_helpers=(flag)
-            Autoproj.shell_helpers = flag
+            if path = get('ruby_executable', nil)
+                path
+            else
+                path = OSDependencies.autodetect_ruby_program
+                set('ruby_executable', path, true)
+                path
+            end
         end
 
         def validate_ruby_executable
@@ -210,6 +221,14 @@ module Autoproj
             use_prerelease
         end
 
+        def shell_helpers?
+            get 'shell_helpers', true
+        end
+
+        def shell_helpers=(flag)
+            set 'shell_helpers', flag, true
+        end
+
         def apply_autobuild_configuration
             if has_value_for?('autobuild')
                 params = get('autobuild')
@@ -221,11 +240,46 @@ module Autoproj
             end
         end
 
-        def apply_autoproj_prefix
-            if has_value_for?('prefix')
-                Autoproj.prefix = get('prefix')
-            else Autoproj.prefix = 'install'
-            end
+        # The directory in which packages will be installed.
+        #
+        # If it is a relative path, it is relative to the root dir of the
+        # installation.
+        #
+        # The default is "install"
+        #
+        # @return [String]
+        def prefix_dir
+            get('prefix', 'install')
+        end
+
+        # Defines the temporary area in which packages should put their build
+        # files
+        #
+        # If absolute, it is handled as {#prefix_dir}: the package name will be
+        # appended to it. If relative, it is relative to the package's source
+        # directory
+        #
+        # The default is "build"
+        #
+        # @return [String]
+        def build_dir
+            get('build', 'build')
+        end
+
+        # Returns true if there should be one prefix per package
+        #
+        # The default is false (disabled)
+        #
+        # @return [Boolean]
+        def separate_prefixes?
+            get('separate_prefixes', false)
+        end
+
+        # Controls whether there should be one prefix per package
+        #
+        # @see separate_prefixes?
+        def separate_prefixes=(flag)
+            set('separate_prefixes', flag, true)
         end
 
         # Returns true if packages and prefixes should be auto-generated, based
@@ -292,17 +346,17 @@ module Autoproj
             set("#{utility_key(utility)}_default", true)
         end
 
-        # Enables a utility for a specific package
-        #
-        # Note that if the default for this utility is to be enabled, this is
-        # essentially a no-op.
+        # Enables a utility for a set of packages
         #
         # @param [String] utility the utility name (e.g. 'doc' or 'test')
-        # @param [String] package the package name
+        # @param [String] packages the package names
         # @return [void]
-        def utility_enable_for(utility, package)
+        def utility_enable(utility, *packages)
             utility_config = get(utility_key(utility), Hash.new)
-            set(utility_key(utility), utility_config.merge(package => true))
+            packages.each do |pkg_name|
+                utility_config[pkg_name] = true
+            end
+            set(utility_key(utility), utility_config)
         end
 
         # Disables a utility for all packages
@@ -324,11 +378,18 @@ module Autoproj
         # essentially a no-op.
         #
         # @param [String] utility the utility name (e.g. 'doc' or 'test')
-        # @param [String] package the package name
+        # @param [String] packages the package names
         # @return [void]
-        def utility_disable_for(utility, package)
+        def utility_disable(utility, *packages)
             utility_config = get(utility_key(utility), Hash.new)
-            set(utility_key(utility), utility_config.merge(package => false))
+            packages.each do |pkg_name|
+                utility_config[pkg_name] = false
+            end
+            set(utility_key(utility), utility_config)
+        end
+
+        def merge(conf)
+            config.merge!(conf.config)
         end
     end
 end

data/lib/autoproj/default.osdeps

@@ -2,6 +2,13 @@
 none: ignore
 
 ruby19:
+    debian:
+        - ruby1.9.1
+        - ruby1.9.1-dev
+        - rubygems1.9.1
+        - rake
+        - rubygems-integration
+
     ubuntu:
         '12.04':
             - ruby1.9.1
@@ -10,7 +17,17 @@ ruby19:
             - ri1.9.1
             - libopenssl-ruby1.9.1
             - rake
-        default: ignore
+        default:
+            - ruby1.9.1
+            - ruby1.9.1-dev
+            - rubygems1.9.1
+            - ri1.9.1
+            - libopenssl-ruby1.9.1
+            - rake
+            - rubygems-integration
+    gentoo:
+        - dev-lang/ruby:1.9
+        - rake
     fedora:
       "17":
       - ruby
@@ -47,13 +64,12 @@ ruby20:
 
 ruby21:
   debian:
-      jessie:
-          - ruby2.1
-          - ruby2.1-dev
-          - rake
-          - rubygems-integration
+      - ruby2.1
+      - ruby2.1-dev
+      - rake
+      - rubygems-integration
   ubuntu:
-      '14.10,15.04,15.10':
+      '14.10':
           - ruby2.1
           - ruby2.1-dev
           - rake
@@ -64,31 +80,6 @@ ruby21:
       - gem: rake
   default: ignore # we assume that if the user has a ruby 2.1 runtime, it is usable
 
-ruby22:
-  ubuntu:
-      '15.10':
-          - ruby2.2
-          - ruby2.2-dev
-          - rake
-          - rubygems-integration
-      default: ignore
-  default: ignore # we assume that if the user has a ruby 2.2 runtime, it is usable
-
-ruby23:
-  debian:
-      unstable:
-          - ruby2.3
-          - ruby2.3-dev
-          - rake
-          - rubygems-integration
-  ubuntu:
-      '16.04':
-          - ruby2.3-dev
-          - rake
-          - rubygems-integration
-      default: ignore
-  default: ignore # we assume that if the user has a ruby 2.3 runtime, it is usable
-
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore
@@ -99,10 +90,10 @@ build-essential:
   default: clang
 
 autobuild:
-  - gem: autobuild~>1.9.0
+  - gem: autobuild
   - osdep: readline
 autoproj:
-  - gem: autoproj~>1.13.0
+  - gem: autoproj
   - osdep: readline
 
 readline:
@@ -216,7 +207,6 @@ pip:
   freebsd: pip
 
 sudo:
-  macos-brew: ignore
   default: sudo
 
 # vim: expandtab

data/lib/autoproj/environment.rb

@@ -1,79 +1,101 @@
 module Autoproj
-    # Sets an environment variable
-    #
-    # This sets (or resets) the environment variable +name+ to the given value.
-    # If multiple values are given, they are joined with File::PATH_SEPARATOR
-    #
-    # The values can contain configuration parameters using the
-    # $CONF_VARIABLE_NAME syntax.
-    def self.env_set(name, *value)
-        Autobuild.env_clear(name)
-        env_add(name, *value)
+    ENV_FILENAME =
+        if Autobuild.windows? then "env.bat"
+        else "env.sh"
+        end
+
+    class Environment < Autobuild::Environment
+        attr_reader :root_dir
+
+        def prepare(root_dir)
+            @root_dir = root_dir
+            set 'AUTOPROJ_CURRENT_ROOT', root_dir
+        end
+
+        def expand(value)
+            Autoproj.expand_environment(value)
+        end
+
+        def export_env_sh(subdir = nil, options = Hash.new)
+            if subdir.kind_of?(Hash)
+                subdir, options = nil, subdir
+            end
+            options = validate_options options,
+                shell_helpers: true
+
+            filename = if subdir
+                   File.join(root_dir, subdir, ENV_FILENAME)
+               else
+                   File.join(root_dir, ENV_FILENAME)
+               end
+
+            shell_dir = File.expand_path(File.join("..", "..", "shell"), File.dirname(__FILE__))
+            if options[:shell_helpers]
+                Autoproj.message "sourcing autoproj shell helpers"
+                Autoproj.message "add \"Autoproj.config.shell_helpers = false\" in autoproj/init.rb to disable"
+                source_after(File.join(shell_dir, "autoproj_sh"))
+            end
+
+            File.open(filename, "w") do |io|
+                if inherit?
+                    io.write <<-EOF
+                    if test -n "$AUTOPROJ_CURRENT_ROOT" && test "$AUTOPROJ_CURRENT_ROOT" != "#{root_dir}"; then
+                        echo "the env.sh from $AUTOPROJ_CURRENT_ROOT is already loaded. Start a new shell before sourcing this one"
+                        return
+                    fi
+                    EOF
+                end
+                super(io)
+            end
+        end
     end
 
-    # Adds new values to a given environment variable
-    #
-    # Adds the given value(s) to the environment variable named +name+. The
-    # values are added using the File::PATH_SEPARATOR marker
-    #
-    # The values can contain configuration parameters using the
-    # $CONF_VARIABLE_NAME syntax.
+    # @deprecated call Autoproj.env.set instead
+    def self.env_set(name, *value)
+        env.set(name, *value)
+    end
+    # @deprecated call Autoproj.env.add instead
     def self.env_add(name, *value)
-        value = value.map { |v| expand_environment(v) }
-        Autobuild.env_add(name, *value)
+        env.add(name, *value)
     end
-
-    # Sets an environment variable which is a path search variable (such as
-    # PATH, RUBYLIB, PYTHONPATH)
-    #
-    # This sets (or resets) the environment variable +name+ to the given value.
-    # If multiple values are given, they are joined with File::PATH_SEPARATOR.
-    # Unlike env_set, duplicate values will be removed.
-    #
-    # The values can contain configuration parameters using the
-    # $CONF_VARIABLE_NAME syntax.
+    # @deprecated call Autoproj.env.set_path instead
     def self.env_set_path(name, *value)
-        Autobuild.env_clear(name)
-        env_add_path(name, *value)
+        env.set_path(name, *value)
     end
-
-    # Adds new values to a given environment variable, which is a path search
-    # variable (such as PATH, RUBYLIB, PYTHONPATH)
-    #
-    # Adds the given value(s) to the environment variable named +name+. The
-    # values are added using the File::PATH_SEPARATOR marker. Unlike env_set,
-    # duplicate values
-    # will be removed.
-    #
-    # The values can contain configuration parameters using the
-    # $CONF_VARIABLE_NAME syntax.
-    #
-    # This is usually used in package configuration blocks to add paths
-    # dependent on the place of install, such as
-    #
-    #   cmake_package 'test' do |pkg|
-    #     Autoproj.env_add_path 'RUBYLIB', File.join(pkg.srcdir, 'bindings', 'ruby')
-    #   end
+    # @deprecated call Autoproj.env.add_path instead
     def self.env_add_path(name, *value)
-        value = value.map { |v| expand_environment(v) }
-        Autobuild.env_add_path(name, *value)
+        env.add_path(name, *value)
     end
-
-    # Requests that autoproj source the given shell script in its own env.sh
-    # script
+    # @deprecated call Autoproj.env.source_after instead
     def self.env_source_file(file)
-        Autobuild.env_source_file(file)
+        env.source_after(file)
     end
-
-    # Requests that autoproj source the given shell script in its own env.sh
-    # script
+    # @deprecated call Autoproj.env.source_after instead
     def self.env_source_after(file)
-        Autobuild.env_source_after(file)
+        env.source_after(file)
     end
-
-    # Requests that autoproj source the given shell script in its own env.sh
-    # script
+    # @deprecated call Autoproj.env.source_before instead
     def self.env_source_before(file)
-        Autobuild.env_source_before(file)
+        env.source_before(file)
+    end
+    # @deprecated call Autoproj.env.inherit instead
+    def self.env_inherit(*names)
+        env.inherit(*names)
+    end
+    # @deprecated use Autoproj.env.isolate instead
+    def self.set_initial_env
+        isolate_environment
+    end
+    # @deprecated use Autoproj.env.isolate instead
+    def self.isolate_environment
+        env.isolate
+    end
+    # @deprecated call Autoproj.env.prepare directly
+    def self.prepare_environment(env = Autoproj.env, manifest = Autoproj.manifest)
+        env.prepare(manifest)
+    end
+    # @deprecated use Autoproj.env.export_env_sh instead
+    def self.export_env_sh(subdir = nil)
+        env.export_env_sh(subdir)
     end
 end