autoproj 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc0bab97ebc2eb14c4ba5078aa523e32e22d3d77
-  data.tar.gz: 4a155a154561df00943e580bad166e7abc386725
+  metadata.gz: f873ef54ef817b4d8c0a029092ed0be7d645ee12
+  data.tar.gz: 38cfd4ae602a9c92b2a611eade91692060e6ef18
 SHA512:
-  metadata.gz: a1afb803d057542495d2ae560dedf1b064e5e9d0d0124b1cc321b454499b40d32293b70c6fe5337bc38c7b2ea7106550087598f9f6064166451dd5540adf8042
-  data.tar.gz: 2c6b43eac291f2a2e15fd11ec430e7baf744e222f0db25ed9461c6e29bb9a9507e5b2c8147d657cbafe3c9fddbc6af224fda13780eacdfe5d3bf61f8755af40a
+  metadata.gz: dce1888ec2edf6cd54a9c1e0fa158431be3b52d30c777a58781fb684cdb9f0580ddcf12488b323f425a5cfe3fd22f1a1661f30e5b402d060cd9703fbb8660d7f
+  data.tar.gz: 0b1702cd8ba4c0950f6e4023df314a804c05f00ef0f10295981aac6d1c495bce3b00af1e90e137d75ec3766ed338107bcf9cb3faed9ff400dea248505c80a143

data/lib/autoproj/cli/watch.rb

@@ -79,11 +79,12 @@ def create_dir_watcher(dir, included_paths: [], excluded_paths: [], inotify_flag
             def create_src_pkg_watchers
                 @source_packages_dirs.each do |pkg_srcdir|
                     next unless File.exist? pkg_srcdir
-                    create_dir_watcher(pkg_srcdir, included_paths: ["manifest.xml"])
+                    create_dir_watcher(pkg_srcdir, included_paths: ["manifest.xml", "package.xml"])
 
                     manifest_file = File.join(pkg_srcdir, 'manifest.xml')
-                    next unless File.exist? manifest_file
-                    create_file_watcher(manifest_file)
+                    create_file_watcher(manifest_file) if File.exist? manifest_file
+                    ros_manifest_file = File.join(pkg_srcdir, 'package.xml')
+                    create_file_watcher(ros_manifest_file) if File.exist? ros_manifest_file
                 end
             end
 

data/lib/autoproj/configuration.rb

@@ -381,6 +381,18 @@ def build_dir
             get('build', 'build')
         end
 
+        # Defines a folder to which source packages will be layed out relative to
+        #
+        # If nil, packages will be layed out relative to root_dir
+        # Only relative paths are allowed
+        #
+        # The default is nil
+        #
+        # @return [String,nil]
+        def source_dir
+            get('source', nil)
+        end
+
         # Returns true if there should be one prefix per package
         #
         # The default is false (disabled)

data/lib/autoproj/manifest.rb

@@ -3,7 +3,7 @@
 require 'utilrb/kernel/options'
 require 'set'
 
-require 'win32/dir' if RbConfig::CONFIG["host_os"] =~%r!(msdos|mswin|djgpp|mingw|[Ww]indows)! 
+require 'win32/dir' if RbConfig::CONFIG["host_os"] =~%r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
 
 module Autoproj
     # The Manifest class represents the information included in the main
@@ -132,7 +132,7 @@ def add_constant_definition(key, value)
         # The manifest data as a Hash
         attr_reader :data
 
-        # The set of packages defined so far as a mapping from package name to 
+        # The set of packages defined so far as a mapping from package name to
         # [Autobuild::Package, package_set, file] tuple
         attr_reader :packages
 
@@ -273,7 +273,7 @@ def cache_ignored_package_names
 
             @ignored_package_names = each_package_definition.find_all do |pkg|
                 ignored_packages.any? do |l|
-                    (pkg.name == l) || 
+                    (pkg.name == l) ||
                         ((pkg_set = metapackages[l]) && pkg_set.include?(pkg))
                 end
             end.map(&:name).to_set
@@ -573,7 +573,7 @@ def importer_definition_for(package, _package_set = nil, mainline: nil, require_
         end
 
         # Sets up the package importers based on the information listed in
-        # the source's source.yml 
+        # the source's source.yml
         #
         # The priority logic is that we take the package sets one by one in the
         # order listed in the autoproj main manifest, and first come first used.
@@ -841,7 +841,7 @@ def layout_packages(validate = true)
                     end
                 end
             end
-            
+
             begin
                 result.filter_excluded_and_ignored_packages(self)
             rescue ExcludedSelection => e
@@ -866,10 +866,10 @@ def all_package_names
         # Returns true if +name+ is a valid package and is included in the build
         #
         # If +validate+ is true, the method will raise ArgumentError if the
-        # package does not exists. 
+        # package does not exists.
         #
         # If it is false, the method will simply return false on non-defined
-        # packages 
+        # packages
         def package_enabled?(name, validate = true)
             Autoproj.warn_deprecated "#package_enabled? and #package_selected? were broken in autoproj v1, and there are usually other ways to get the same effect (as e.g. splitting package sets). Feel free to contact the autoproj developers if you have a use case that demands this functionality. For now, this method returns true for backward compatibility reasons."
             true
@@ -879,10 +879,10 @@ def package_enabled?(name, validate = true)
         # the build, nor ignored from the build
         #
         # If +validate+ is true, the method will raise ArgumentError if the
-        # package does not exists. 
+        # package does not exists.
         #
         # If it is false, the method will simply return false on non-defined
-        # packages 
+        # packages
         def package_selected?(name, validate = true)
             Autoproj.warn_deprecated "#package_enabled? and #package_selected? were broken in autoproj v1, and there are usually other ways to get the same effect (as e.g. splitting package sets). Feel free to contact the autoproj developers if you have a use case that demands this functionality. For now, this method returns true for backward compatibility reasons."
             true
@@ -1002,8 +1002,14 @@ def load_package_manifest(pkg)
                 File.file?(path)
             end
 
+            # Alternatively, use a ROS manifest file
+            ros_manifest_path = File.join(package.srcdir, 'package.xml')
+            ros_manifest_path = nil unless File.file?(ros_manifest_path)
+
             if manifest_path
                 pkg.autobuild.description = PackageManifest.load(package, manifest_path)
+            elsif ros_manifest_path
+                pkg.autobuild.description = PackageManifest.load(package, ros_manifest_path, ros_manifest: true)
             elsif pkg.autobuild.description.null?
                 Autoproj.warn "#{package.name} from #{package_set.name} does not have a manifest"
             end
@@ -1174,7 +1180,7 @@ def move_package(package_name, new_dir)
         # Compute the reverse dependencies of all the packages
         #
         # The return value is a hash of the form
-        # 
+        #
         #   package_name => [list_of_packages_that_depend_on_package_name]
         #
         # Where the list is given as a list of package names as well

data/lib/autoproj/ops/configuration.rb

@@ -510,7 +510,7 @@ def auto_add_packages_from_layout
             explicit.each do |pkg_or_set, layout_level|
                 next if manifest.find_autobuild_package(pkg_or_set)
                 next if manifest.has_package_set?(pkg_or_set)
-                full_path = File.expand_path(File.join(ws.root_dir, layout_level, pkg_or_set))
+                full_path = File.expand_path(File.join(ws.source_dir, layout_level, pkg_or_set))
                 next if !File.directory?(full_path)
 
                 if handler = auto_add_package(pkg_or_set, full_path)

data/lib/autoproj/package_manifest.rb

@@ -13,10 +13,12 @@ def self.null(package)
         #
         # @param [PackageDescription] the package we're loading it for
         # @param [String] file the path to the manifest.xml file
+        # @param [Boolean] ros_manifest whether the file follows the ROS format
         # @return [PackageManifest]
         # @see parse
-        def self.load(package, file)
-            parse(package, File.read(file), path: file)
+        def self.load(package, file, ros_manifest: false)
+            loader_class = ros_manifest ? RosLoader : Loader
+            parse(package, File.read(file), path: file, loader_class: loader_class)
         end
 
         # Create a PackageManifest object from the XML content provided as a
@@ -25,11 +27,12 @@ def self.load(package, file)
         # @param [PackageDescription] the package we're loading it for
         # @param [String] contents the manifest.xml contents as a string
         # @param [String] path the file path, used for error reporting
+        # @param [Boolean] ros_manifest whether the file follows the ROS format
         # @return [PackageManifest]
         # @see load
-        def self.parse(package, contents, path: '<loaded from string>')
+        def self.parse(package, contents, path: '<loaded from string>', loader_class: Loader)
             manifest = PackageManifest.new(package)
-            loader = Loader.new(path, manifest)
+            loader = loader_class.new(path, manifest)
             begin
                 REXML::Document.parse_stream(contents, loader)
             rescue REXML::ParseException => e
@@ -216,5 +219,45 @@ def tag_end(name)
                 @tag_text = nil
             end
         end
+
+        # @api private
+        #
+        # REXML stream parser object used to load the XML contents into a
+        # {PackageManifest} object
+        class RosLoader < Loader
+            DEPEND_TAGS = Set['depend', 'build_depend', 'build_export_depend',
+                              'buildtool_depend', 'buildtool_export_depend',
+                              'exec_depend', 'test_depend', 'run_depend']
+
+            def tag_start(name, attributes)
+                if DEPEND_TAGS.include?(name)
+                    @tag_text = ''
+                elsif TEXT_FIELDS.include?(name)
+                    @tag_text = ''
+                elsif AUTHOR_FIELDS.include?(name)
+                    @author_email = attributes['email']
+                    @tag_text = ''
+                else
+                    @tag_text = nil
+                end
+            end
+
+            def tag_end(name)
+                if DEPEND_TAGS.include?(name)
+                    raise InvalidPackageManifest, "found '#{name}' tag in #{path} without content" if @tag_text.strip.empty?
+                    manifest.add_dependency(@tag_text)
+                elsif AUTHOR_FIELDS.include?(name)
+                    author_name = @tag_text.strip
+                    email = @author_email ? @author_email.strip : nil
+                    email = nil if email && email.empty?
+                    contact = ContactInfo.new(author_name, email)
+                    manifest.send("#{name}s").concat([contact])
+                elsif TEXT_FIELDS.include?(name)
+                    field = @tag_text.strip
+                    manifest.send("#{name}=", field) unless field.empty?
+                end
+                @tag_text = nil
+            end
+        end
     end
 end

data/lib/autoproj/package_set.rb

@@ -252,16 +252,25 @@ def self.raw_local_dir_of(ws, vcs)
             end
         end
 
+        def self.default_expansions(ws)
+            ws.config.to_hash.
+                merge(ws.manifest.constant_definitions).
+                merge("AUTOPROJ_ROOT" => ws.root_dir,
+                      "AUTOPROJ_CONFIG" => ws.config_dir)
+        end
+
         # Resolve the VCS information for a package set
         #
         # This parses the information stored in the package_sets section of
-        # autoproj/manifest, or the imports section of the source.yml files and
+        # autoproj/manifest, r the imports section of the source.yml files and
         # returns the corresponding VCSDefinition object
-        def self.resolve_definition(ws, raw_spec, from: nil, raw: Array.new)
+        def self.resolve_definition(ws, raw_spec, from: nil, raw: Array.new,
+            vars: default_expansions(ws))
+
             spec = VCSDefinition.normalize_vcs_hash(raw_spec, base_dir: ws.config_dir)
             options, vcs_spec = Kernel.filter_options spec, auto_imports: true
 
-            vcs_spec = Autoproj.expand(vcs_spec, ws.config.to_hash.merge(ws.manifest.constant_definitions))
+            vcs_spec = Autoproj.expand(vcs_spec, vars)
             return VCSDefinition.from_raw(vcs_spec, from: from, raw: raw), options
         end
 
@@ -464,36 +473,46 @@ def load_overrides(source_definition)
 
         def parse_source_definition(source_definition)
             @name = source_definition['name'] || self.name
-            @required_autoproj_version = source_definition.fetch('required_autoproj_version', self.required_autoproj_version)
+            @required_autoproj_version = source_definition.fetch(
+                'required_autoproj_version', self.required_autoproj_version)
+
+            # Compute the definition of constants
+            if new_constants = source_definition['constants']
+                Autoproj.in_file(source_file) do
+                    variables = inject_constants_and_config_for_expansion(Hash.new)
+                    @constants_definitions = Autoproj.resolve_constant_definitions(
+                        new_constants, variables)
+                end
+            end
+
             if new_imports = source_definition['imports']
+                variables = inject_constants_and_config_for_expansion(Hash.new)
                 @imports_vcs  = Array(new_imports).map do |set_def|
                     if !set_def.kind_of?(Hash) && !set_def.respond_to?(:to_str)
-                        raise ConfigError.new(source_file),
-                            "in #{source_file}: wrong format for 'imports' section. Expected an array of maps or strings (e.g. - github: my/url)."
+                        raise ConfigError.new(source_file), "in #{source_file}: "\
+                            "wrong format for 'imports' section. Expected an array of "\
+                            "maps or strings (e.g. - github: my/url)."
                     end
 
                     Autoproj.in_file(source_file) do
-                        PackageSet.resolve_definition(ws, set_def, from: self, raw: [VCSDefinition::RawEntry.new(self, source_file, set_def)])
+                        PackageSet.resolve_definition(ws, set_def, from: self,
+                            vars: variables,
+                            raw: [VCSDefinition::RawEntry.new(self, source_file, set_def)])
                     end
                 end
             end
 
-            # Compute the definition of constants
-            if new_constants = source_definition['constants']
-                Autoproj.in_file(source_file) do
-                    variables = inject_constants_and_config_for_expansion(Hash.new)
-                    @constants_definitions = Autoproj.resolve_constant_definitions(new_constants, variables)
-                end
-            end
-
             if new_version_control = source_definition['version_control']
                 invalidate_importer_definitions_cache
-                @version_control = normalize_vcs_list('version_control', source_file, new_version_control)
+                @version_control = normalize_vcs_list('version_control', source_file,
+                    new_version_control)
 
                 Autoproj.in_file(source_file) do
-                    default_vcs_spec, raw = version_control_field('default', version_control, file: source_file)
+                    default_vcs_spec, raw = version_control_field(
+                        'default', version_control, file: source_file)
                     if default_vcs_spec
-                        @default_importer = VCSDefinition.from_raw(default_vcs_spec, raw: raw, from: self)
+                        @default_importer = VCSDefinition.from_raw(default_vcs_spec,
+                            raw: raw, from: self)
                     end
                 end
             end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.5.1"
+    VERSION = "2.6.0"
 end

data/lib/autoproj/workspace.rb

@@ -191,6 +191,20 @@ def build_dir=(path)
             config.set 'build', path, true
         end
 
+        # (see Configuration#source_dir)
+        def source_dir
+            if config.source_dir
+                File.expand_path(config.source_dir, root_dir)
+            else
+                root_dir
+            end
+        end
+
+        # Change {#source_dir}
+        def source_dir=(path)
+            config.set 'source', path, true
+        end
+
         def log_dir
             File.join(prefix_dir, 'log')
         end
@@ -214,6 +228,11 @@ def load_config(reconfigure = false)
                     manifest.vcs = VCSDefinition.from_raw(
                         type: 'local', url: config_dir)
                 end
+
+                if config.source_dir && Pathname.new(config.source_dir).absolute?
+                    raise ConfigError, 'source dir path configuration must be relative'
+                end
+
                 os_package_resolver.prefer_indep_over_os_packages = config.prefer_indep_over_os_packages?
                 os_package_resolver.operating_system ||= config.get('operating_system', nil)
             end
@@ -287,7 +306,7 @@ def setup
                 io.puts "workspace: \"#{root_dir}\""
             end
 
-            Autobuild.srcdir = root_dir
+            Autobuild.srcdir = source_dir
             Autobuild.logdir = log_dir
             if cache_dir = config.importer_cache_dir
                 Autobuild::Importer.default_cache_dirs = cache_dir
@@ -533,7 +552,7 @@ def setup_package_directories(pkg)
                 end
 
             pkg = manifest.find_autobuild_package(pkg_name)
-            pkg.srcdir = File.join(root_dir, srcdir)
+            pkg.srcdir = File.join(source_dir, srcdir)
             if pkg.respond_to?(:builddir)
                 pkg.builddir = compute_builddir(pkg)
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler