autoproj 1.7.10 → 1.7.11.rc1

data/History.txt

@@ -1,3 +1,41 @@
+= Version 1.7.11
+ * loads of fixes related to ignore_packages
+   - fix ignored packages being built if a package depends on them
+   - allow whole package sets to be ignored
+   - make setup_package(package_name) { |pkg| ... } ignore the block if the
+     package is ignored
+ * really fix ignoring osdeps dependencies completely (thought to be working in
+   1.7.9). The following syntax is now accepted in osdeps files:
+
+    ruby: ignore
+
+ * add the 'nonexistent' keyword in osdeps files. In combination with the
+   default target, it makes it easier to add new osdeps packages. For instance,
+   the following snippet will cause anyone trying to get libnl2-dev to fail on
+   older ubuntu versions:
+
+    libnl2:
+       debian: libnl2-dev
+       ubuntu:
+         '10.04,10.10': nonexistent
+         default: libnl2-dev
+
+ * add more fine-grained control over the osdeps/source packages relationships.
+   Until now, we had a fallback mechanism in which nonexistent osdeps would be
+   replaced by source packages with the same name.
+
+   The replacement packages can now be specified (they don't have to have the
+   same name) with
+
+     Autoproj.add_osdeps_overrides 'opencv', :packages => ['external/opencv']
+
+   Moreover, if one wants to make sure that the source package is taken instead
+   of the osdeps one regardless of everything else, he can do
+
+     Autoproj.add_osdeps_overrides 'opencv', :packages => ['external/opencv'], :force => true
+
+ * small API addition and fixes
+
 = Version 1.7.10
  * really fix support of virtual packages on dpkg-based systems (debian, ubuntu)
    1.7.9 was only supporting packages that were providing only one package

data/bin/autoproj_bootstrap

@@ -432,13 +432,11 @@ fi
             dep_def = definitions[name]
             if !dep_def
                 return NO_PACKAGE
-            end
-
-            if dep_def == 'ignore'
+            elsif dep_def == 'ignore'
                 return IGNORE
-            end
-
-            if !os_names
+            elsif dep_def == 'nonexistent'
+                return WRONG_OS_VERSION
+            elsif !os_names
                 return UNKNOWN_OS
             end
 
@@ -478,6 +476,10 @@ fi
                 data = version_entry.last
             end
 
+            if data.respond_to?(:to_str) && data.to_str == 'nonexistent'
+                return WRONG_OS_VERSION
+            end
+
             if data.respond_to?(:to_ary)
 		# List of packages
                 return [PACKAGES, data]
@@ -602,6 +604,7 @@ fi
                 if pkg_def.respond_to?(:to_str)
                     case(pkg_def.to_str)
                     when "ignore" then
+                        osdeps << name
                     when "gem" then
                         gems << name
                     else

data/lib/autoproj/autobuild.rb

@@ -98,6 +98,8 @@ module Autobuild
         def depends_on(name)
             if Autoproj::CmdLine.ignore_dependencies?
                 return
+            elsif Autoproj.manifest.ignored?(name)
+                return
             end
 
             @os_packages ||= Set.new
@@ -111,8 +113,22 @@ module Autobuild
 	    osdeps_availability = Autoproj.osdeps.availability_of(name)
             available_as_source = Autobuild::Package[name]
 
+            osdeps_overrides = Autoproj.manifest.osdeps_overrides[name]
+            if osdeps_overrides
+                source_packages = osdeps_overrides[:packages]
+                if source_packages.empty?
+                    source_packages << name
+                end
+                force_source_usage = osdeps_overrides[:force]
+                available_as_source = true
+            end
+
 	    # Prefer OS packages to source packages
-            if !explicit_selection 
+            if force_source_usage && !source_packages.any? { |pkg_name| Autoproj.manifest.excluded?(pkg_name) }
+                source_packages.each do |pkg_name|
+                    __depends_on__(pkg_name)
+                end
+            elsif !explicit_selection 
                 if osdeps_availability == Autoproj::OSDependencies::AVAILABLE
                     @os_packages << name
                     return
@@ -149,10 +165,11 @@ module Autobuild
                     end
                     # Should never reach further than that
                 end
+                __depends_on__(name) # to get the error message
+            else
+                # Normal dependency
+                __depends_on__(name)
             end
-
-
-            __depends_on__(name) # to get the error message
         end
 
         def depends_on_os_package(name)
@@ -259,6 +276,10 @@ module Autoproj
         @file_stack.pop
     end
 
+    class << self
+        attr_reader :loaded_autobuild_files
+    end
+
     def self.import_autobuild_file(source, path)
         return if @loaded_autobuild_files.include?(path)
 
@@ -302,8 +323,11 @@ def setup_package(package_name, &block)
     package_definition = Autoproj.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)
+        # Nothing to do!
+    else
+        package_definition.add_setup_block(block)
     end
-    package_definition.add_setup_block(block)
 end
 
 # Common setup for packages
@@ -319,7 +343,7 @@ def package_common(package_type, spec, &block) # :nodoc:
     end
 
     # Check if this package is ignored
-    if Autoproj.manifest.ignored?(package_name)
+    if Autoproj.manifest.ignored?(package_name) || Autoproj.manifest.ignored?(Autoproj.current_file[0].name)
         return Autoproj.define(:dummy, spec)
     end
 

data/lib/autoproj/cmdline.rb

@@ -41,6 +41,10 @@ module Autoproj
                 Autobuild::Reporting << Autobuild::MailReporter.new(mail_config)
             end
 
+            # Remove from LOADED_FEATURES everything that is coming from our
+            # configuration directory
+            Autobuild::Package.clear
+            Autoproj.loaded_autobuild_files.clear
             Autoproj.load_config
 
             if Autoproj.has_config_key?('prefix')
@@ -302,6 +306,7 @@ module Autoproj
                 pkg.user_blocks.each do |blk|
                     blk[pkg.autobuild]
                 end
+                pkg.setup = true
             end
 
             # Load the package's override files. each_source must not load the
@@ -469,6 +474,7 @@ module Autoproj
                 while sel != '/'
                     if handler = Autoproj.package_handler_for(sel)
                         Autoproj.progress "  auto-adding #{sel} using the #{handler.gsub(/_package/, '')} package handler"
+                        sel = File.expand_path(sel)
                         relative_to_root = Pathname.new(sel).relative_path_from(Pathname.new(Autoproj.root_dir))
                         pkg = Autoproj.in_package_set(manifest.local_package_set, manifest.file) do
                             send(handler, relative_to_root)
@@ -550,7 +556,8 @@ module Autoproj
                 current_packages = current_packages.sort_by(&:name)
 
                 current_packages.
-                    delete_if { |pkg| all_enabled_packages.include?(pkg.name) }
+                    delete_if { |pkg| all_enabled_packages.include?(pkg.name) }.
+                    delete_if { |pkg| Autoproj.manifest.ignored?(pkg.name) }
                 all_enabled_packages |= current_packages.map(&:name).to_set
 
                 # Recursively check that no package in the selection depend on
@@ -1632,6 +1639,9 @@ export PATH=$GEM_HOME/bin:$PATH
 
             Autoproj::CmdLine.update_os_dependencies = false
             Autoproj::CmdLine.initialize
+            if Autobuild.do_update
+                Autoproj::CmdLine.update_configuration
+            end
             Autoproj::CmdLine.load_configuration
             Autoproj::CmdLine.setup_all_package_directories
             Autoproj::CmdLine.finalize_package_setup

data/lib/autoproj/gitorious.rb

@@ -55,14 +55,26 @@ module Autoproj
                 root_rx = /^(?:http:\/\/git\.|git:\/\/|git@)#{Regexp.quote(base_url)}:?/
                 if importer.kind_of?(Autobuild::Git) && importer.repository =~ root_rx && importer.repository !~ /^http/
                     Autoproj.warn "import from #{importer.repository} failed, falling back to using http for all packages on #{base_url}"
+
+                    base_replace_string = "http://git.#{base_url}"
                     Autobuild::Package.each do |pkg_name, pkg|
                         if pkg.importer.kind_of?(Autobuild::Git) && pkg.importer.repository =~ root_rx
-                            pkg.importer.repository.gsub!(root_rx, "http://git.#{base_url}")
+                            if pkg.importer.repository =~ /^git@/
+                                replace_string = "#{base_replace_string}/"
+                            else
+                                replace_string = base_replace_string
+                            end
+                            pkg.importer.repository.gsub!(root_rx, replace_string)
                         end
                     end
 
                     http_importer = importer.dup
-                    http_importer.repository = importer.repository.gsub(root_rx, "http://git.#{base_url}")
+                    if http_importer.repository =~ /^git@/
+                        replace_string = "#{base_replace_string}/"
+                    else
+                        replace_string = base_replace_string
+                    end
+                    http_importer.repository = importer.repository.gsub(root_rx, replace_string)
                     http_importer
                 end
             end

data/lib/autoproj/manifest.rb

@@ -696,6 +696,8 @@ module Autoproj
         attr_reader :user_blocks
         attr_reader :package_set
         attr_reader :file
+        def setup?; !!@setup end
+        attr_writer :setup
 
         def initialize(autobuild, package_set, file)
             @autobuild, @package_set, @file =
@@ -705,6 +707,9 @@ module Autoproj
 
         def add_setup_block(block)
             user_blocks << block
+            if setup?
+                block.call(autobuild)
+            end
         end
     end
 
@@ -813,6 +818,7 @@ module Autoproj
             @constants_definitions = Hash.new
             @disabled_imports = Set.new
             @moved_packages = Hash.new
+            @osdeps_overrides = Hash.new
 
             @constant_definitions = Hash.new
             if Autoproj.has_config_key?('manifest_source')
@@ -834,12 +840,35 @@ module Autoproj
         # This is useful if the packages are already installed on this system.
         def ignored?(package_name)
             if data['ignore_packages']
-                data['ignore_packages'].any? { |l| Regexp.new(l) =~ package_name }
+                data['ignore_packages'].any? do |l|
+                    if package_name == l
+                        true
+                    elsif source = definition_source(package_name)
+                        source.name == l
+                    else
+                        false
+                    end
+                end
             else
                 false
             end
         end
 
+        # Removes all registered exclusions
+        def clear_exclusions
+            automatic_exclusions.clear
+            if excl = data['exclude_packages']
+                excl.clear
+            end
+        end
+
+        # Removes all registered ignored packages
+        def clear_ignored
+            if ignored = data['ignore_packages']
+                ignored.clear
+            end
+        end
+
         # The set of package names that are listed in the excluded_packages
         # section of the manifest
         def manifest_exclusions
@@ -1061,10 +1090,14 @@ module Autoproj
         end
 
         def definition_source(package_name)
-            @packages[package_name].package_set
+            if pkg_def = @packages[package_name]
+                pkg_def.package_set
+            end
         end
         def definition_file(package_name)
-            @packages[package_name].file
+            if pkg_def = @packages[package_name]
+                pkg_def.file
+            end
         end
 
         def package(name)
@@ -1408,7 +1441,9 @@ module Autoproj
             layout_data.each do |value|
                 if value.kind_of?(Hash)
                     subname, subdef = value.find { true }
-                    normalized_layout(result, "#{layout_level}#{subname}/", subdef)
+                    if subdef
+                        normalized_layout(result, "#{layout_level}#{subname}/", subdef)
+                    end
                 else
                     result[value] = layout_level
                 end
@@ -1526,6 +1561,31 @@ module Autoproj
             Autoproj.osdeps.install(required_os_packages, package_os_deps)
         end
 
+        # The set of overrides added with #add_osdeps_overrides
+        attr_reader :osdeps_overrides
+
+        # Declares that autoproj should use normal package(s) to provide the
+        # +osdeps_name+ OS package in cases +osdeps_name+ does not exist.
+        #
+        # The full syntax is
+        #
+        #   Autoproj.add_osdeps_overrides 'opencv', :package => 'external/opencv'
+        #
+        # If more than one packages should be built, use the :packages option
+        # with an array:
+        #
+        #   Autoproj.add_osdeps_overrides 'opencv', :packages => ['external/opencv', 'external/test']
+        #
+        # The :force option allows to force the usage of the source package(s),
+        # regardless of the availability of the osdeps package.
+        def add_osdeps_overrides(osdeps_name, options)
+            options = Kernel.validate_options options, :package => nil, :packages => [], :force => false
+            if pkg = options.delete(:package)
+                options[:packages] << pkg
+            end
+            @osdeps_overrides[osdeps_name.to_s] = options
+        end
+
         # Package selection can be done in three ways:
         #  * as a subdirectory in the layout
         #  * as a on-disk directory
@@ -1585,7 +1645,29 @@ module Autoproj
             end
 
             # Remove packages that are explicitely excluded and/or ignored
-            expanded_packages.delete_if { |pkg_name| excluded?(pkg_name) || ignored?(pkg_name) }
+            #
+            # Raise an error if an explicit selection expands only to an
+            # excluded package, and display a warning for ignored packages
+            matches.each do |sel, expansion|
+                next if expansion.empty?
+                excluded, other = expansion.partition { |pkg_name| excluded?(pkg_name) }
+                ignored,  ok    = other.partition { |pkg_name| ignored?(pkg_name) }
+
+                if ok.empty? && ignored.empty?
+                    packages = excluded.map do |pkg_name|
+                        [pkg_name, Autoproj.manifest.exclusion_reason(pkg_name)]
+                    end
+                    raise ConfigError.new, "selection #{sel} expands to #{packages.map(&:first).join(", ")} which are excluded from the build:\n  #{packages.map { |name, reason| "#{name}: #{reason}" }.join("\n  ")}"
+                elsif !ignored.empty?
+                    ignored.each do |pkg_name|
+                        Autoproj.warn "#{pkg_name} was selected for #{sel}, but is explicitely ignored in the manifest"
+                    end
+                end
+            end
+
+            expanded_packages.delete_if do |pkg_name|
+                excluded?(pkg_name) || ignored?(pkg_name)
+            end
             return expanded_packages.to_set, (selection - matches.keys)
         end
 
@@ -1719,5 +1801,8 @@ module Autoproj
             end
         end
     end
+    def self.add_osdeps_overrides(*args, &block)
+        manifest.add_osdeps_overrides(*args, &block)
+    end
 end
 

data/lib/autoproj/osdeps.rb

@@ -333,13 +333,11 @@ fi
             dep_def = definitions[name]
             if !dep_def
                 return NO_PACKAGE
-            end
-
-            if dep_def == 'ignore'
+            elsif dep_def == 'ignore'
                 return IGNORE
-            end
-
-            if !os_names
+            elsif dep_def == 'nonexistent'
+                return WRONG_OS_VERSION
+            elsif !os_names
                 return UNKNOWN_OS
             end
 
@@ -379,6 +377,10 @@ fi
                 data = version_entry.last
             end
 
+            if data.respond_to?(:to_str) && data.to_str == 'nonexistent'
+                return WRONG_OS_VERSION
+            end
+
             if data.respond_to?(:to_ary)
 		# List of packages
                 return [PACKAGES, data]
@@ -503,6 +505,7 @@ fi
                 if pkg_def.respond_to?(:to_str)
                     case(pkg_def.to_str)
                     when "ignore" then
+                        osdeps << name
                     when "gem" then
                         gems << name
                     else

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.10"
+    VERSION = "1.7.11.rc1"
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  hash: 15424031
+  prerelease: 7
   segments: 
   - 1
   - 7
-  - 10
-  version: 1.7.10
+  - 11
+  - rc
+  - 1
+  version: 1.7.11.rc1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 Z
+date: 2011-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild
@@ -242,12 +244,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: autobuild