autoproj 1.7.4 → 1.7.5

data/History.txt

@@ -1,3 +1,15 @@
+= Version 1.7.5
+ * quickfix release
+ * fix osdeps_mode issue on bootstrapping
+ * ignore osdeps-related errors in modes
+   where the osdeps should not be managed
+   by autoproj at all.
+ * fix expansion of array elements in source.yml
+ * finally got a way to have amake work. The
+   RubyGem packaging had replaced the executable
+   by a RubyGem wrapper, assuming it was a ruby
+   file (but it was a shell script)
+
 = Version 1.7.4
  * add amake to the gem (forgot it in 1.7.3)
  * fix some corner-cases in osdeps handling

data/Manifest.txt

@@ -2,7 +2,6 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-bin/amake
 bin/autolocate
 bin/autoproj
 bin/autoproj_bootstrap

data/bin/autoproj_bootstrap

@@ -644,14 +644,18 @@ fi
             gems.delete_if do |name, version|
                 version_requirements = Gem::Requirement.new(version || '>= 0')
                 installed = Gem.source_index.find_name(name, version_requirements)
-                if (!installed.empty? && !version) && Autobuild.do_update
+                if !installed.empty? && Autobuild.do_update
                     # Look if we can update the package ...
                     dep = Gem::Dependency.new(name, version_requirements)
-                    available = gem_fetcher.find_matching(dep, false, true, OSDependencies.gem_with_prerelease)
+                    available = gem_fetcher.find_matching(dep, true, true, OSDependencies.gem_with_prerelease)
                     installed_version = installed.map(&:version).max
                     available_version = available.map { |(name, v), source| v }.max
                     if !available_version
-                        raise ConfigError.new, "cannot find any gem with the name '#{name}'"
+                        if version
+                            raise ConfigError.new, "cannot find any gem with the name '#{name}' and version #{version}"
+                        else
+                            raise ConfigError.new, "cannot find any gem with the name '#{name}'"
+                        end
                     end
                     needs_update = (available_version > installed_version)
                     !needs_update
@@ -833,6 +837,14 @@ with the corresponding option (--all, --ruby, --os or --none).
             nil
         end
 
+        def installs_os_packages?
+            osdeps_mode == HANDLE_ALL || osdeps_mode == HANDLE_OS
+        end
+
+        def installs_ruby_packages?
+            osdeps_mode == HANDLE_ALL || osdeps_mode == HANDLE_RUBY
+        end
+
         def osdeps_interaction(osdeps, os_packages, shell_script, silent)
             if !OSDependencies.supported_operating_system?
                 if silent

data/lib/autoproj/autobuild.rb

@@ -100,6 +100,13 @@ module Autobuild
                 return
             end
 
+            @os_packages ||= Set.new
+            @ignored_os_dependencies ||= Set.new
+
+            if @os_packages.include?(name) || @ignored_os_dependencies.include?(name)
+                return
+            end
+
             explicit_selection  = Autoproj.manifest.explicitly_selected_package?(name)
 	    osdeps_availability = Autoproj.osdeps.availability_of(name)
             available_as_source = Autobuild::Package[name]
@@ -107,7 +114,6 @@ module Autobuild
 	    # Prefer OS packages to source packages
             if !explicit_selection 
                 if osdeps_availability == Autoproj::OSDependencies::AVAILABLE
-                    @os_packages ||= Set.new
                     @os_packages << name
                     return
                 end
@@ -118,16 +124,27 @@ module Autobuild
                     # an external package. However, if it is also available as a
                     # source package, prompt the user
                     if !available_as_source || explicit_osdeps_selection(name)
-                        @os_packages ||= Set.new
                         @os_packages << name
                         return
                     end
                 end
 
+
                 if !available_as_source
-                    # Call osdeps to get a proper error message
-                    osdeps, gems = Autoproj.osdeps.partition_packages([name].to_set, name => [self.name])
-                    Autoproj.osdeps.resolve_os_dependencies(osdeps)
+                    begin
+                        # Call osdeps to get a proper error message
+                        osdeps, gems = Autoproj.osdeps.partition_packages([name].to_set, name => [self.name])
+                        Autoproj.osdeps.resolve_os_dependencies(osdeps)
+                    rescue ConfigError => e
+                        if osdeps_availability != Autoproj::OSDependencies::NO_PACKAGE && !Autoproj.osdeps.installs_os_packages?
+                            Autoproj.warn "in #{File.join(srcdir, 'manifest.xml')}: #{e.message}"
+                            Autoproj.warn "this osdeps dependency is simply ignored as you asked autoproj to not install osdeps packages"
+                            @ignored_os_dependencies << name
+                            # We are not asked to install OS packages, just ignore
+                            return
+                        end
+                        raise
+                    end
                     # Should never reach further than that
                 end
             end
@@ -210,7 +227,7 @@ module Autoproj
 
     def self.define(package_type, spec, &block)
         package = Autobuild.send(package_type, spec)
-        Autoproj.manifest.register_package package, block, *current_file
+        Autoproj.manifest.register_package(package, block, *current_file)
         package
     end
 
@@ -274,6 +291,19 @@ def ignore(*paths)
     end
 end
 
+# Adds a new setup block to an existing package
+def setup_package(package_name, &block)
+    if !block
+        raise ConfigError.new, "you must give a block to #setup_package"
+    end
+
+    package_definition = Autoproj.manifest.package(package_name)
+    if !package_definition
+        raise ConfigError.new, "#{package_name} is not a known package"
+    end
+    package_definition.add_setup_block(block)
+end
+
 # Common setup for packages
 def package_common(package_type, spec, &block) # :nodoc:
     package_name = Autoproj.package_name_from_options(spec)
@@ -282,6 +312,7 @@ def package_common(package_type, spec, &block) # :nodoc:
         current_file = Autoproj.current_file[1]
         old_file     = Autoproj.manifest.definition_file(package_name)
         Autoproj.warn "#{package_name} from #{current_file} is overriden by the definition in #{old_file}"
+
         return
     end
 
@@ -391,7 +422,7 @@ module Autoproj::RubyPackage
     end
 
     # The Rake task that is used to set up the package. Defaults to "default".
-    # Set to nil to disable documentation generation
+    # Set to nil to disable setup altogether
     attr_accessor :rake_setup_task
     # The Rake task that is used to generate documentation. Defaults to "doc".
     # Set to nil to disable documentation generation

data/lib/autoproj/cmdline.rb

@@ -109,13 +109,20 @@ module Autoproj
             if osdeps_forced_mode
                 Autoproj.osdeps.osdeps_mode = osdeps_forced_mode
             end
+
+            # Define the option NOW, as update_os_dependencies? needs to know in
+            # what mode we are.
+            #
+            # It might lead to having multiple operating system detections, but
+            # that's the best I can do for now.
+	    Autoproj::OSDependencies.define_osdeps_mode_option
+            Autoproj.osdeps.osdeps_mode
+
             # Do that AFTER we have properly setup Autoproj.osdeps as to avoid
             # unnecessarily redetecting the operating system
             if update_os_dependencies? || osdeps?
                 Autoproj.reset_option('operating_system')
             end
-	    Autoproj::OSDependencies.define_osdeps_mode_option
-            Autoproj.osdeps.osdeps_mode
         end
 
         def self.update_myself
@@ -287,8 +294,8 @@ module Autoproj
             # Now call the blocks that the user defined in the autobuild files. We do it
             # now so that the various package directories are properly setup
             manifest.packages.each_value do |pkg|
-                if pkg.user_block
-                    pkg.user_block[pkg.autobuild]
+                pkg.user_blocks.each do |blk|
+                    blk[pkg.autobuild]
                 end
             end
 

data/lib/autoproj/manifest.rb

@@ -208,6 +208,8 @@ module Autoproj
                 value[name] = expand(definition, definitions)
             end
             value
+        elsif value.respond_to?(:to_ary)
+            value.map { |val| expand(val, definitions) }
         else
             value = single_expansion(value, definitions)
             if contains_expansion?(value)
@@ -688,7 +690,23 @@ module Autoproj
     # DEPRECATED. For backward-compatibility only.
     LocalSource = LocalPackageSet
 
-    PackageDefinition = Struct.new :autobuild, :user_block, :package_set, :file
+    # Class used to store information about a package definition
+    class PackageDefinition
+        attr_reader :autobuild
+        attr_reader :user_blocks
+        attr_reader :package_set
+        attr_reader :file
+
+        def initialize(autobuild, package_set, file)
+            @autobuild, @package_set, @file =
+                autobuild, package_set, file
+            @user_blocks = []
+        end
+
+        def add_setup_block(block)
+            user_blocks << block
+        end
+    end
 
     # The Manifest class represents the information included in the main
     # manifest file, and allows to manipulate it
@@ -1027,7 +1045,11 @@ module Autoproj
 
         # Register a new package
         def register_package(package, block, source, file)
-            @packages[package.name] = PackageDefinition.new(package, block, source, file)
+            pkg = PackageDefinition.new(package, source, file)
+            if block
+                pkg.add_setup_block(block)
+            end
+            @packages[package.name] = pkg
         end
 
         def definition_source(package_name)

data/lib/autoproj/osdeps.rb

@@ -545,14 +545,18 @@ fi
             gems.delete_if do |name, version|
                 version_requirements = Gem::Requirement.new(version || '>= 0')
                 installed = Gem.source_index.find_name(name, version_requirements)
-                if (!installed.empty? && !version) && Autobuild.do_update
+                if !installed.empty? && Autobuild.do_update
                     # Look if we can update the package ...
                     dep = Gem::Dependency.new(name, version_requirements)
-                    available = gem_fetcher.find_matching(dep, false, true, OSDependencies.gem_with_prerelease)
+                    available = gem_fetcher.find_matching(dep, true, true, OSDependencies.gem_with_prerelease)
                     installed_version = installed.map(&:version).max
                     available_version = available.map { |(name, v), source| v }.max
                     if !available_version
-                        raise ConfigError.new, "cannot find any gem with the name '#{name}'"
+                        if version
+                            raise ConfigError.new, "cannot find any gem with the name '#{name}' and version #{version}"
+                        else
+                            raise ConfigError.new, "cannot find any gem with the name '#{name}'"
+                        end
                     end
                     needs_update = (available_version > installed_version)
                     !needs_update
@@ -734,6 +738,14 @@ with the corresponding option (--all, --ruby, --os or --none).
             nil
         end
 
+        def installs_os_packages?
+            osdeps_mode == HANDLE_ALL || osdeps_mode == HANDLE_OS
+        end
+
+        def installs_ruby_packages?
+            osdeps_mode == HANDLE_ALL || osdeps_mode == HANDLE_RUBY
+        end
+
         def osdeps_interaction(osdeps, os_packages, shell_script, silent)
             if !OSDependencies.supported_operating_system?
                 if silent

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.4"
+    VERSION = "1.7.5"
 end

data/shell/autoproj_bash

@@ -10,3 +10,10 @@ function acd {
     fi
 }
 
+function amake {
+    if test -z "$@"; then
+        autoproj fast-build .
+    else
+        autoproj fast-build "$@"
+    fi
+}

data/shell/autoproj_zsh

@@ -10,3 +10,11 @@ function acd {
     fi
 }
 
+function amake {
+    if test -z "$@"; then
+        autoproj fast-build .
+    else
+        autoproj fast-build "$@"
+    fi
+}
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 7
-  - 4
-  version: 1.7.4
+  - 5
+  version: 1.7.5
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +01:00
+date: 2011-02-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,7 +174,6 @@ description: |-
 email: 
 - sylvain.joyeux@dfki.de
 executables: 
-- amake
 - autolocate
 - autoproj
 - autoproj_bootstrap
@@ -191,7 +190,6 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- bin/amake
 - bin/autolocate
 - bin/autoproj
 - bin/autoproj_bootstrap

data/bin/amake

@@ -1,9 +0,0 @@
-#! /bin/sh
-
-if test -z "$@"; then
-    autoproj fast-build .
-else
-    autoproj fast-build "$@"
-fi
-
-