autoproj 1.7.3.b1 → 1.7.3

data/History.txt

@@ -1,3 +1,28 @@
+= Version 1.7.3
+== For basic usage
+ * amake is a command that is a shortcut to "autoproj build". I.e.
+    amake .
+   will build the package in the current directory and all its dependencies
+ * added tag support. The manifest and the autobuild files allow to add textual
+   tags to packages, that will be picked up by documentation later on. Moreover,
+   some tags can be used to tune the build. For instance, rock uses the 'stable'
+   tag to set the CMAKE_BUILD_TYPE variable on cmake packages to either Debug
+   (non-stable) or RelWithDebInfo (stable).
+
+== For advanced usage
+ * support ignoring/excluding OS packages
+ * define Package#post_import which allows to run a code block after the package
+   has been imported, but before the build. The global
+     Autoproj.post_import do |pkg|
+     end
+   allows to do it for all defined packages.
+ * define Package#remove_obsolete_installed_file(*path) which allows to remove
+   files from the installation directory. Useful for simple upgrade cases, when
+   files move from one package to another
+ * in source.yml, a package name is interpreted as a regular expression only if
+   it contains non-alphanumeric characters. This avoids some surprising effects
+   if the name of package BlaBla is a subset of the package BlaBlaBlo
+
 = Version 1.7.2
 == Quickfix release
  * fix layouts that use subdirectories

data/bin/autolocate

@@ -38,6 +38,12 @@ if candidates.empty?
         join("/")
     rx = Regexp.new(rx)
 
+    rx_strict = directories[0..-2].
+        map { |d| "#{Regexp.quote(d)}\\w*" }.
+        join("/")
+    rx_strict = Regexp.new("#{rx_strict}/#{Regexp.quote(directories.last)}$")
+
+    candidates_strict = []
     Autoproj.manifest.each_package do |pkg|
         name = pkg.name
         next if !Autoproj.manifest.package_enabled?(name)
@@ -46,8 +52,14 @@ if candidates.empty?
         if name =~ rx
             candidates << srcdir
         end
+        if name =~ rx_strict
+            candidates_strict << srcdir
+        end
     end
 
+    if candidates.size > 1 && candidates_strict.size == 1
+        candidates = candidates_strict
+    end
 end
 
 if candidates.empty?

data/lib/autoproj/autobuild.rb

@@ -30,6 +30,48 @@ module Autobuild
     class Package
         # The Autoproj::PackageManifest object that describes this package
         attr_accessor :description
+        # The set of tags for this package. This is an union of the tags
+        # contained in +description+ and the ones explicitely added with
+        # #add_tag
+        def tags
+            result = (@added_tags || Set.new)
+            if description
+                result |= description.tags.to_set
+            end
+            result
+        end
+        # Tags explicitely added with #add_tag
+        attr_reader :added_tags
+        # Add a tag to the package. Use this if you don't want the tag to be
+        # shared with everyone that uses the package (i.e. cannot go in
+        # manifest.xml)
+        def add_tag(tag)
+            @added_tags ||= Set.new
+            @added_tags << tag
+        end
+
+        # True if this package is tagged with the given tag string
+        def has_tag?(tag)
+            tags.include?(tag.to_s)
+        end
+
+        # Asks autoproj to remove the given file in the package's installation
+        # prefix
+        def remove_obsolete_installed_file(*path)
+            post_import do
+                path = File.join(prefix, *path)
+                if File.exists?(path)
+                    Autoproj.progress "  removing obsolete file #{path}", :bold
+                    FileUtils.rm_f path
+                end
+            end
+        end
+
+        # Ask autoproj to run the given block after this package has been
+        # imported
+        def post_import(&block)
+            Autoproj.post_import(self, &block)
+        end
 
         def autoproj_name # :nodoc:
             srcdir.gsub /^#{Regexp.quote(Autoproj.root_dir)}\//, ''

data/lib/autoproj/base.rb

@@ -23,6 +23,27 @@ module Autoproj
             raise e
         end
     end
-end
 
+    @post_import_blocks = Hash.new { |h, k| h[k] = Array.new }
+    class << self
+        attr_reader :post_import_blocks
+    end
+
+    def self.each_post_import_block(pkg, &block)
+        @post_import_blocks[nil].each(&block)
+        if @post_import_blocks.has_key?(pkg)
+            @post_import_blocks[pkg].each(&block)
+        end
+    end
+
+    def self.post_import(*packages, &block)
+        if packages.empty?
+            @post_import_blocks[nil] << block
+        else
+            packages.each do |pkg|
+                @post_import_blocks[pkg] << block
+            end
+        end
+    end
+end
 

data/lib/autoproj/cmdline.rb

@@ -373,9 +373,15 @@ module Autoproj
                     manifest.resolve_optional_dependencies
                 end
 
-                pkg_manifest = manifest.package_manifests[pkg.name];
+                pkg_manifest = pkg.description
                 vcs_def = manifest.importer_definition_for(pkg.name)
                 Autoproj.progress "#{pkg.name}#{": #{pkg_manifest.short_documentation}" if pkg_manifest && pkg_manifest.short_documentation}", :bold
+                tags = pkg.tags.to_a
+                if tags.empty?
+                    Autoproj.progress "   no tags"
+                else
+                    Autoproj.progress "   tags: #{pkg.tags.to_a.sort.join(", ")}"
+                end
                 Autoproj.progress "   defined in #{pkg_set}"
                 if File.directory?(pkg.srcdir)
                     Autoproj.progress "   checked out in #{pkg.srcdir}"
@@ -531,6 +537,10 @@ module Autoproj
 
                 current_packages.each do |pkg|
                     verify_package_availability(pkg.name)
+                    Autoproj.each_post_import_block(pkg) do |block|
+                        block.call(pkg)
+                    end
+
                     pkg.prepare
                     Rake::Task["#{pkg.name}-prepare"].instance_variable_set(:@already_invoked, true)
 
@@ -551,7 +561,12 @@ module Autoproj
 
                 packages.each do |_, pkg|
                     pkg.isolate_errors do
+                        manifest.load_package_manifest(pkg.name)
                         pkg.prepare
+
+                        Autoproj.each_post_import_block(pkg) do |block|
+                            block.call(pkg)
+                        end
                     end
                 end
 
@@ -559,7 +574,6 @@ module Autoproj
                 Autobuild.do_update = old_update_flag
             end
 
-
             if Autoproj.verbose
                 Autoproj.progress "autoproj: finished importing packages"
             end

data/lib/autoproj/manifest.rb

@@ -573,7 +573,11 @@ module Autoproj
                         end
                     end
 
-                    if Regexp.new("^" + name) =~ package_name
+                    name_match = name
+                    if name_match =~ /[^\w\/_-]/
+                        name_match = Regexp.new("^" + name_match)
+                    end
+                    if name_match === package_name
                         vcs_spec = vcs_spec.merge(spec)
                     end
                 end
@@ -690,9 +694,7 @@ module Autoproj
         #
         # It has to match the interface of Autobuild::Package that is relevant
         # for importers
-        class FakePackage
-            attr_reader :text_name
-            attr_reader :name
+        class FakePackage < Autobuild::Package
             attr_reader :srcdir
             attr_reader :importer
 
@@ -700,28 +702,17 @@ module Autoproj
             attr_accessor :updated
 
             def initialize(text_name, srcdir, importer = nil)
-                @text_name = text_name
-                @name = text_name.gsub /[^\w]/, '_'
+                super(text_name)
                 @srcdir = srcdir
                 @importer = importer
+                @@packages.delete(text_name)
             end
 
             def import
                 importer.import(self)
             end
 
-            def progress(msg)
-                Autobuild.progress(msg % [text_name])
-            end
-
-            # Display a progress message, and later on update it with a progress
-            # value. %s in the string is replaced by the package name
-            def progress_with_value(msg)
-                Autobuild.progress_with_value(msg % [text_name])
-            end
-
-            def progress_value(value)
-                Autobuild.progress_value(value)
+            def add_stat(*args)
             end
         end
 
@@ -1280,14 +1271,16 @@ module Autoproj
         # If recursive is false, yields only the packages at this level.
         # Otherwise, return all packages.
         def layout_packages(result, validate)
-            normalized_layout.each_key do |pkg_or_set|
-                begin
-                    resolve_package_set(pkg_or_set).each do |pkg_name|
-                        result << pkg_name
-                        Autobuild::Package[pkg_name].all_dependencies(result)
+            Autoproj.in_file(self.file) do
+                normalized_layout.each_key do |pkg_or_set|
+                    begin
+                        resolve_package_set(pkg_or_set).each do |pkg_name|
+                            result << pkg_name
+                            Autobuild::Package[pkg_name].all_dependencies(result)
+                        end
+                    rescue ConfigError
+                        raise if validate
                     end
-                rescue ConfigError
-                    raise if validate
                 end
             end
             result
@@ -1484,6 +1477,17 @@ module Autoproj
         # Installs the OS dependencies that are required by the given packages
         def install_os_dependencies(packages)
             required_os_packages, package_os_deps = list_os_dependencies(packages)
+            required_os_packages.delete_if do |pkg|
+                if excluded?(pkg)
+                    raise ConfigError.new, "the osdeps package #{pkg} is excluded from the build in #{file}. It is required by #{package_os_deps[pkg].join(", ")}"
+                end
+                if ignored?(pkg)
+                    if Autoproj.verbose
+                        Autoproj.progress "ignoring osdeps package #{pkg}"
+                    end
+                    true
+                end
+            end
             Autoproj.osdeps.install(required_os_packages, package_os_deps)
         end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.3.b1"
+    VERSION = "1.7.3"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 6629755
-  prerelease: true
+  hash: 13
+  prerelease: false
   segments: 
   - 1
   - 7
   - 3
-  - b1
-  version: 1.7.3.b1
+  version: 1.7.3
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 +01:00
+date: 2011-01-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -240,14 +239,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: autobuild