autoproj 1.1.0 → 1.1.1

data/History.txt

@@ -1,4 +1,14 @@
-= Version 1.1
+= Version 1.1.1
+ * better general error reporting
+ * small fixes w.r.t. bootstrapping
+ * small improvements in the handling of layouts
+ * make it easier to write osdeps scripts: the OS names and version accept lists
+   as for instance:
+     debian,ubuntu:
+       lenny,9.04: package_to_install
+ * detect Ubuntu
+
+= Version 1.1.0
  * added some sanity checks, especially w.r.t. an already existing GEM
    installation
  * improved the bootstrap

data/Rakefile

@@ -28,8 +28,10 @@ begin
         desc "generate the bootstrap script"
         task 'bootstrap' do
             osdeps_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'osdeps.rb'))
+            osdeps_defaults = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'default.osdeps'))
             bootstrap_code = File.read(File.join(Dir.pwd, 'bin', 'autoproj_bootstrap.in')).
-                gsub('OSDEPS_CODE', osdeps_code)
+                gsub('OSDEPS_CODE', osdeps_code).
+                gsub('OSDEPS_DEFAULTS', osdeps_defaults)
             File.open(File.join(Dir.pwd, 'doc', 'guide', 'src', 'autoproj_bootstrap'), 'w') do |io|
                 io.write bootstrap_code
             end

data/bin/autoproj

@@ -96,6 +96,7 @@ parser.parse!(args)
 mode     = args.shift
 selected_packages = args.dup
 all_env_sh = Array.new
+Autobuild::Reporting << Autoproj::Reporter.new
 
 def color(*args)
     Autoproj.console.color(*args)
@@ -212,8 +213,15 @@ def do_bootstrap(*args)
             name, value = args.shift.split("=")
             vcs_def[name] = value
         end
+
         vcs = Autoproj.normalize_vcs_definition(vcs_def)
-        Autoproj::Manifest.import_whole_installation(vcs, File.join(Dir.pwd, "autoproj"))
+
+        # Install the OS dependencies required for this VCS
+        Autobuild::Reporting.report do
+            osdeps = Autoproj::OSDependencies.load_default
+            osdeps.install([vcs.type])
+            Autoproj::Manifest.import_whole_installation(vcs, File.join(Dir.pwd, "autoproj"))
+        end
 
         # Now write it in the config file
         File.open(File.join(Autoproj.config_dir, "config.yml"), "a") do |io|
@@ -274,7 +282,7 @@ begin
     # If we are under rubygems, check that the GEM_HOME is right ...
     if $LOADED_FEATURES.any? { |l| l =~ /rubygems/ }
         if ENV['GEM_HOME'] != Autoproj.gem_home
-            raise ConfigError, "RubyGems is already loaded with a different GEM_HOME"
+            raise ConfigError, "RubyGems is already loaded with a different GEM_HOME, make sure you are loading the right env.sh script !"
         end
     end
     # Set the initial environment
@@ -282,9 +290,9 @@ begin
     # Set up some important autobuild parameters
     Autobuild.prefix  = Autoproj.build_dir
     Autobuild.srcdir  = root_dir
+    Autobuild.logdir = File.join(Autobuild.prefix, 'log')
     Autobuild.doc_errors = false
     Autobuild.do_doc = false
-    Autobuild::Reporting << Autoproj::Reporter.new
     if mail_config[:to]
         Autobuild::Reporting << MailReporter.new(mail_config)
     end
@@ -310,8 +318,10 @@ begin
     # If we need to install some packages to import our remote sources, do it
     if !no_os_deps && !source_os_dependencies.empty?
         STDERR.puts color("autoproj: installing prepackaged dependencies to access the source definitions", :bold)
-        osdeps = manifest.known_os_packages
-        osdeps.install(source_os_dependencies)
+        Autobuild::Reporting.report do
+            osdeps = manifest.known_os_packages
+            osdeps.install(source_os_dependencies)
+        end
     end
 
     # Update the remote sources if there are any
@@ -414,14 +424,32 @@ begin
     if !no_os_deps
         STDERR.puts
         STDERR.puts color("autoproj: installing prepackaged dependencies for build system & version control", :bold)
-        osdeps = manifest.known_os_packages
-        osdeps.install(Autoproj.build_system_dependencies - source_os_dependencies)
+        Autobuild::Reporting.report do
+            osdeps = manifest.known_os_packages
+            osdeps.install(Autoproj.build_system_dependencies - source_os_dependencies)
+        end
     end
 
     # Now starts a different stage of the whole build. Until now, we were
     # working on the whole package set. Starting from now, we need to build the
     # package sets based on the layout file
+
+    # This keeps a hash of package_name => layout_name for all packages that
+    # have already been handled
+    handled_packages = Hash.new
+
     Autoproj.manifest.each_package_set(selected_packages) do |name, packages, enabled_packages|
+        packages         -= handled_packages.keys.to_set
+        enabled_packages -= handled_packages.keys.to_set
+
+        # Here, 'packages' are the packages listed in the layout configuration,
+        # and 'enabled_packages' the ones that 
+        #
+        # They do not (yet) take into account dependency information -- this is
+        # not doable as the manifests have not been loaded yet (the packages
+        # aren't imported). We add this information later on
+
+        # Setup directories
         srcdir  = File.join(Autoproj.root_dir, name)
         prefix  = File.join(Autoproj.build_dir, name)
         logdir  = File.join(prefix, "log")
@@ -433,55 +461,78 @@ begin
             pkg.logdir = logdir
         end
 
-        # We are doing a status, now is the right time
+        # We are doing a status, now is the right time. Otherwise, build ! But
+        # only if there is some packages to build (and avoid display of progress
+        # messages if there is nothing to build)
+        all_enabled_packages  = Set.new
         STDERR.puts
         if only_do_status
-            do_status(packages)
-            next
-        end
-
-
-        # ... but build only the selected packages (and avoid display of
-        # progress messages if there is nothing to build)
-        if !enabled_packages.empty?
-            STDERR.puts
-            STDERR.puts color("autoproj: now building #{name}", :bold)
-
-            STDERR.puts color("  updating packages", :bold)
+            do_status(enabled_packages)
+        elsif !enabled_packages.empty?
             Autobuild::Reporting.report do
-                import_targets = enabled_packages.map { |pkg| "#{pkg}-import" }
-                task "autoproj-#{name}-import" => import_targets
-                Rake::Task["autoproj-#{name}-import"].invoke
-            end
+                STDERR.puts
+                STDERR.puts color("autoproj: now building #{name}", :bold)
+
+                STDERR.puts color("  updating packages", :bold)
+                # We actually have a problem there: the packages in
+                # enabled_packages are *not* taking into account dependencies as
+                # we can't load the manifests yet ...
+                #
+                # So we have to make our own dependency analysis. Fortunately
+                # (for us), there is no need to import packages in order, so we
+                # can do a simple BFS
+                #
+                # Additional benefit: it computes the set of packages 
+                packages_to_import = enabled_packages.dup
+                while !packages_to_import.empty?
+                    import_now, packages_to_import = packages_to_import, Set.new
+                    import_now.each do |pkg_name|
+                        # Already handled at another place in the layout
+                        next if handled_packages.has_key?(pkg_name)
+                        # Already handled in this part of the layout
+                        next if all_enabled_packages.include?(pkg_name)
+                        # Not handled already. Import, load the manifest, add to
+                        # all_enabled_packages and add the dependencies
+                        Rake::Task["#{pkg_name}-import"].invoke
+                        manifest.load_package_manifest(pkg_name)
+                        all_enabled_packages << pkg_name
+                        Autobuild::Package[pkg_name].dependencies.each do |dep_name|
+                            if !handled_packages.has_key?(dep_name) &&
+                                !packages.include?(dep_name)
+                                raise ConfigError, "#{pkg_name}, at #{name} in the layout, depends on #{dep_name} but this package appears in the layout neither at #{name} nor before"
+                            end
+                            packages_to_import << dep_name
+                        end
+                    end
+                end
 
-            # Load package manifests, apply dependencies to the autobuild definitions
-            # and install OS packages
-            manifest.load_package_manifests(packages)
-            if !no_os_deps
-                STDERR.puts color("  installing prepackaged dependencies", :bold)
-                manifest.install_os_dependencies
-            end
+                if !no_os_deps
+                    STDERR.puts color("  installing prepackaged dependencies", :bold)
+                    manifest.install_os_dependencies(all_enabled_packages)
+                end
 
-            # Call the prepare target now, after we did the import *and* loaded
-            # the manifests
-            Autobuild::Reporting.report do
-                prepare_targets = enabled_packages.map { |pkg| "#{pkg}-prepare" }
+                # Call the prepare target now, after we did the import *and* loaded
+                # the manifests
+                prepare_targets = all_enabled_packages.map { |pkg| "#{pkg}-prepare" }
                 task "autoproj-#{name}-prepare" => prepare_targets
                 Rake::Task["autoproj-#{name}-prepare"].invoke
-            end
 
-            # And now build
-            if Autobuild.only_doc
-                STDERR.puts color("  building and installing documentation", :bold)
-            else
-                STDERR.puts color("  building and installing packages", :bold)
-            end
+                # And now build
+                if Autobuild.only_doc
+                    STDERR.puts color("  building and installing documentation", :bold)
+                else
+                    STDERR.puts color("  building and installing packages", :bold)
+                end
 
-            Autobuild::Reporting.report do
                 Autobuild.apply(enabled_packages, "autoproj-#{name}")
                 Autobuild::Reporting.success
             end
         end
+        
+        # Now mark them as handled
+        packages.each do |pkg_name|
+            handled_packages[pkg_name] = name
+        end
 
         # Now call the prepare target for all packages as it may be useful for
         # the rest of the builds and for the generation of the env.sh file
@@ -504,7 +555,8 @@ begin
         Autoproj.export_env_sh(name)
     end
 
-STDERR.puts <<EOTEXT
+    if mode == "build"
+        STDERR.puts <<-EOTEXT
 
 
 add the following lines at the bottom of your .bashrc:
@@ -514,7 +566,8 @@ WARNING: autoproj will not work until your restart all
 your consoles, or run the following in them:
   #{all_env_sh.map { |name| "$ source #{Dir.pwd}#{name}env.sh" }.join("\n  ")}
 
-EOTEXT
+        EOTEXT
+    end
 
 rescue ConfigError => e
     STDERR.puts

data/doc/guide/src/autoproj_bootstrap

@@ -4,7 +4,7 @@ ENV['GEM_HOME'] = "#{Dir.pwd}/.gems"
 ENV['PATH']     = "#{ENV['GEM_HOME']}/bin:#{ENV['PATH']}"
 if $LOADED_FEATURES.find { |str| str =~ /bygems/ }
     ENV['RUBYOPT']  = ""
-    exec "ruby", __FILE__
+    exec "ruby", __FILE__, *ARGV
 end
 
 ENV['RUBYOPT']  = "-rubygems"
@@ -14,6 +14,7 @@ require 'set'
 require 'rubygems'
 
 module Autoproj
+    class ConfigError < RuntimeError; end
     class << self
         attr_reader :verbose
     end
@@ -35,7 +36,18 @@ require 'tempfile'
 module Autoproj
     class OSDependencies
         def self.load(file)
-            OSDependencies.new(YAML.load(File.read(file)))
+            data =
+                begin
+                    YAML.load(File.read(file))
+                rescue ArgumentError => e
+                    raise ConfigError, "error in #{file}: #{e.message}"
+                end
+
+            OSDependencies.new(data)
+        end
+        AUTOPROJ_OSDEPS = File.join(File.expand_path(File.dirname(__FILE__)), 'default.osdeps')
+        def self.load_default
+            OSDependencies.load(AUTOPROJ_OSDEPS)
         end
 
         attr_reader :definitions
@@ -48,14 +60,38 @@ module Autoproj
         end
 
         def operating_system
-            if File.exists?('/etc/debian_version')
-                codename = File.read('/etc/debian_version').chomp
-                ['debian', codename]
+            if @operating_system
+                return @operating_system
+            elsif data = os_from_lsb
+                @operating_system = data
             else
-                raise ConfigError, "Unknown operating system"
+                # Need to do some heuristics unfortunately
+                @operating_system =
+                    if File.exists?('/etc/debian_version')
+                        codename = File.read('/etc/debian_version').chomp
+                        ['debian', [codename]]
+                    else
+                        raise ConfigError, "Unknown operating system"
+                    end
             end
+
+            # Normalize the names to lowercase
+            @operating_system =
+                [@operating_system[0].downcase,
+                 @operating_system[1].map(&:downcase)]
+        end
+
+        def os_from_lsb
+            distributor = `lsb_release -i -s`
+            return unless $?.success?
+            distributor = distributor.chomp
+            codename    = `lsb_release -c -s`.chomp
+            version     = `lsb_release -r -s`.chomp
+
+            return [distributor, [codename, version]]
         end
 
+
         GAIN_ROOT_ACCESS = <<-EOSCRIPT
         if test `id -u` != "0"; then
             exec sudo /bin/bash $0 "$@"
@@ -64,27 +100,47 @@ module Autoproj
         EOSCRIPT
 
         OS_PACKAGE_INSTALL = {
-            'debian' => 'apt-get install -y %s'
+            'debian' => 'apt-get install -y %s',
+            'ubuntu' => 'apt-get install -y %s'
         }
 
         def generate_os_script(dependencies)
             os_name, os_version = operating_system
+            if !OS_PACKAGE_INSTALL.has_key?(os_name)
+                raise ConfigError, "I don't know how to install packages on #{os_name}"
+            end
+
             shell_snippets = ""
             os_packages    = []
             dependencies.each do |name|
                 dep_def = definitions[name]
                 if !dep_def
                     raise ConfigError, "I don't know how to install '#{name}'"
-                elsif !dep_def[os_name]
+                end
+
+                # Find a matching entry for the OS name
+                os_entry = dep_def.find do |name_list, data|
+                    name_list.split(',').
+                        map(&:downcase).
+                        any? { |n| n == os_name }
+                end
+
+                if !os_entry
                     raise ConfigError, "I don't know how to install '#{name}' on #{os_name}"
                 end
 
-                data = dep_def[os_name]
+                data = os_entry.last
                 if data.kind_of?(Hash)
-                    data = data[os_version]
-                    if !data
-                        raise ConfigError, "I don't know how to install '#{name}' on this specific version of #{os_name} (#{os_version})"
+                    version_entry = data.find do |version_list, data|
+                        version_list.to_s.split(',').
+                            map(&:downcase).
+                            any? { |v| os_version.include?(v) }
                     end
+
+                    if !version_entry
+                        raise ConfigError, "I don't know how to install '#{name}' on this specific version of #{os_name} (#{os_version.join(", ")})"
+                    end
+                    data = version_entry.last
                 end
 
                 if data.respond_to?(:to_ary)
@@ -134,19 +190,21 @@ module Autoproj
             #
             # So, for now, reimplement rosdep by ourselves. Given how things
             # are done, this is actually not so hard.
-            shell_script = generate_os_script(osdeps)
-            if Autoproj.verbose
-                STDERR.puts "Installing non-ruby OS dependencies with"
-                STDERR.puts shell_script
-            end
+            if !osdeps.empty?
+                shell_script = generate_os_script(osdeps)
+                if Autoproj.verbose
+                    STDERR.puts "Installing non-ruby OS dependencies with"
+                    STDERR.puts shell_script
+                end
 
-            File.open('osdeps.sh', 'w') do |file|
-                file.write shell_script
-            end
-            begin
-                Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', './osdeps.sh'
-            ensure
-                FileUtils.rm_f 'osdeps.sh'
+                File.open('osdeps.sh', 'w') do |file|
+                    file.write shell_script
+                end
+                begin
+                    Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', './osdeps.sh'
+                ensure
+                    FileUtils.rm_f 'osdeps.sh'
+                end
             end
 
             # Don't install gems that are already there ...
@@ -171,22 +229,45 @@ end
 
 
 DEFS = <<EODEFS
+# The following definitions are needed to bootstrap autoproj
 ruby:
-    debian: 
-        - ruby1.8-dev
-        - ruby1.8
-        - libopenssl-ruby1.8
+    debian,ubuntu:
+        9.04,lenny:
+            - ruby1.8-dev
+            - ruby1.8
+            - libopenssl-ruby1.8
 
 build-essential:
-    debian: build-essential
+    debian,ubuntu:
+        9.04,lenny: build-essential
 
 libxml2:
-    debian:
-        - libxml2-dev
+    debian,ubuntu:
+        9.04,lenny: libxml2-dev
 libxslt:
-    debian:
-        - libxslt1-dev
+    debian,ubuntu:
+        9.04,lenny: libxslt1-dev
+
 autoproj: gem
+
+# The following definitions are for the VCS and build systems
+git:
+    debian,ubuntu:
+        9.04,lenny: git-core
+
+svn:
+    debian,ubuntu:
+        9.04,lenny: svn
+
+cmake:
+    debian,ubuntu:
+        9.04,lenny: cmake
+
+autotools:
+    debian,ubuntu:
+        9.04,lenny: [automake1.9, autoconf]
+
+
 EODEFS
 
 PACKAGES      = %w{ruby libxml2 libxslt build-essential}
@@ -197,12 +278,17 @@ if ARGV.first != "dev"
     packages += USER_PACKAGES
 end
 
-osdeps_management = Autoproj::OSDependencies.new(YAML.load(DEFS))
-STDERR.puts "autoproj: installing autoproj and its dependencies (this can take a long time)"
-osdeps_management.install(packages)
+begin
+    osdeps_management = Autoproj::OSDependencies.new(YAML.load(DEFS))
+    STDERR.puts "autoproj: installing autoproj and its dependencies (this can take a long time)"
+    osdeps_management.install(packages)
+rescue Autoproj::ConfigError => e
+    STDERR.puts "failed: #{e.message}"
+    exit(1)
+end
 
 if ARGV.first != "dev"
-    Autobuild::Subprocess.run('bootstrap', 'post', 'autoproj', 'bootstrap')
+    Autobuild::Subprocess.run('bootstrap', 'post', 'autoproj', 'bootstrap', *ARGV)
 end
 
 File.open('env.sh', 'w') do |io|

data/lib/autoproj/default.osdeps

@@ -1,12 +1,38 @@
+# The following definitions are needed to bootstrap autoproj
+ruby:
+    debian,ubuntu:
+        9.04,lenny:
+            - ruby1.8-dev
+            - ruby1.8
+            - libopenssl-ruby1.8
+
+build-essential:
+    debian,ubuntu:
+        9.04,lenny: build-essential
+
+libxml2:
+    debian,ubuntu:
+        9.04,lenny: libxml2-dev
+libxslt:
+    debian,ubuntu:
+        9.04,lenny: libxslt1-dev
+
+autoproj: gem
+
+# The following definitions are for the VCS and build systems
 git:
-    debian: git-core
+    debian,ubuntu:
+        9.04,lenny: git-core
 
 svn:
-    debian: svn
+    debian,ubuntu:
+        9.04,lenny: svn
 
 cmake:
-    debian: cmake
+    debian,ubuntu:
+        9.04,lenny: cmake
 
 autotools:
-    debian: [automake1.9, autoconf]
+    debian,ubuntu:
+        9.04,lenny: [automake1.9, autoconf]
 

data/lib/autoproj/manifest.rb

@@ -52,7 +52,7 @@ module Autoproj
 
     # Set a new environment variable
     def self.env_set(name, *value)
-        Autobuild.environment.delete(name)
+        Autobuild.environment[name] = nil
         env_add(name, *value)
     end
     def self.env_add(name, *value)
@@ -60,7 +60,7 @@ module Autoproj
         Autobuild.env_add(name, *value)
     end
     def self.env_set_path(name, *value)
-        Autobuild.environment.delete(name)
+        Autobuild.environment[name] = nil
         env_add_path(name, *value)
     end
     def self.env_add_path(name, *value)
@@ -632,42 +632,50 @@ module Autoproj
             names.to_set
         end
 
-        # Loads the package's manifest.xml files, and extracts dependency
-        # information from them. The dependency information is then used applied
-        # to the autobuild packages.
+        # Loads the package's manifest.xml file for the current package
         #
         # Right now, the absence of a manifest makes autoproj only issue a
         # warning. This will later be changed into an error.
-        def load_package_manifests(selected_packages)
-            packages.each_value do |package, source, file|
-                next unless selected_packages.include?(package.name)
-                manifest_path = File.join(package.srcdir, "manifest.xml")
-                if !File.file?(manifest_path)
-                    Autoproj.warn "#{package.name} from #{source.name} does not have a manifest"
-                    next
-                end
+        def load_package_manifest(pkg_name)
+            package, source, file = packages.values.
+                find { |package, source, file| package.name == pkg_name }
 
-                manifest = PackageManifest.load(package, manifest_path)
-                package_manifests[package.name] = manifest
+            if !pkg_name
+                raise ArgumentError, "package #{pkg_name} is not defined"
+            end
 
-                manifest.each_package_dependency do |name|
-                    if Autoproj.verbose
-                        STDERR.puts "  #{package.name} depends on #{name}"
-                    end
-                    begin
-                        package.depends_on name
-                    rescue Autobuild::ConfigException => e
-                        raise ConfigError, "manifest of #{package.name} from #{source.name} lists '#{name}' as dependency, but this package does not exist (manifest file: #{manifest_path})"
-                    end
+            manifest_path = File.join(package.srcdir, "manifest.xml")
+            if !File.file?(manifest_path)
+                Autoproj.warn "#{package.name} from #{source.name} does not have a manifest"
+                return
+            end
+
+            manifest = PackageManifest.load(package, manifest_path)
+            package_manifests[package.name] = manifest
+
+            manifest.each_package_dependency do |name|
+                if Autoproj.verbose
+                    STDERR.puts "  #{package.name} depends on #{name}"
+                end
+                begin
+                    package.depends_on name
+                rescue Autobuild::ConfigException => e
+                    raise ConfigError, "manifest of #{package.name} from #{source.name} lists '#{name}' as dependency, but this package does not exist (manifest file: #{manifest_path})"
                 end
             end
         end
 
-        AUTOPROJ_OSDEPS = File.join(File.expand_path(File.dirname(__FILE__)), 'default.osdeps')
+        # Loads the manifests for all packages known to this project.
+        #
+        # See #load_package_manifest
+        def load_package_manifests(selected_packages)
+            selected_packages.each(&:load_package_manifest)
+        end
+
         # Returns an OSDependencies instance that defined the known OS packages,
         # as well as how to install them
         def known_os_packages
-            osdeps = OSDependencies.load(AUTOPROJ_OSDEPS)
+            osdeps = OSDependencies.load_default
 
             each_osdeps_file do |source, file|
                 osdeps.merge(OSDependencies.load(file))
@@ -675,15 +683,17 @@ module Autoproj
             osdeps
         end
 
-        def install_os_dependencies
+        def install_os_dependencies(packages)
             osdeps = known_os_packages
 
-            all_packages = Set.new
-            package_manifests.each_value do |pkg_manifest|
-                all_packages |= pkg_manifest.each_os_dependency.to_set
+            required_os_packages = Set.new
+            packages.each do |pkg_name|
+                if manifest = package_manifests[pkg_name]
+                    required_os_packages |= manifest.each_os_dependency.to_set
+                end
             end
 
-            osdeps.install(all_packages)
+            osdeps.install(required_os_packages)
         end
     end
 

data/lib/autoproj/osdeps.rb

@@ -2,7 +2,18 @@ require 'tempfile'
 module Autoproj
     class OSDependencies
         def self.load(file)
-            OSDependencies.new(YAML.load(File.read(file)))
+            data =
+                begin
+                    YAML.load(File.read(file))
+                rescue ArgumentError => e
+                    raise ConfigError, "error in #{file}: #{e.message}"
+                end
+
+            OSDependencies.new(data)
+        end
+        AUTOPROJ_OSDEPS = File.join(File.expand_path(File.dirname(__FILE__)), 'default.osdeps')
+        def self.load_default
+            OSDependencies.load(AUTOPROJ_OSDEPS)
         end
 
         attr_reader :definitions
@@ -15,14 +26,38 @@ module Autoproj
         end
 
         def operating_system
-            if File.exists?('/etc/debian_version')
-                codename = File.read('/etc/debian_version').chomp
-                ['debian', codename]
+            if @operating_system
+                return @operating_system
+            elsif data = os_from_lsb
+                @operating_system = data
             else
-                raise ConfigError, "Unknown operating system"
+                # Need to do some heuristics unfortunately
+                @operating_system =
+                    if File.exists?('/etc/debian_version')
+                        codename = File.read('/etc/debian_version').chomp
+                        ['debian', [codename]]
+                    else
+                        raise ConfigError, "Unknown operating system"
+                    end
             end
+
+            # Normalize the names to lowercase
+            @operating_system =
+                [@operating_system[0].downcase,
+                 @operating_system[1].map(&:downcase)]
         end
 
+        def os_from_lsb
+            distributor = `lsb_release -i -s`
+            return unless $?.success?
+            distributor = distributor.chomp
+            codename    = `lsb_release -c -s`.chomp
+            version     = `lsb_release -r -s`.chomp
+
+            return [distributor, [codename, version]]
+        end
+
+
         GAIN_ROOT_ACCESS = <<-EOSCRIPT
         if test `id -u` != "0"; then
             exec sudo /bin/bash $0 "$@"
@@ -31,27 +66,47 @@ module Autoproj
         EOSCRIPT
 
         OS_PACKAGE_INSTALL = {
-            'debian' => 'apt-get install -y %s'
+            'debian' => 'apt-get install -y %s',
+            'ubuntu' => 'apt-get install -y %s'
         }
 
         def generate_os_script(dependencies)
             os_name, os_version = operating_system
+            if !OS_PACKAGE_INSTALL.has_key?(os_name)
+                raise ConfigError, "I don't know how to install packages on #{os_name}"
+            end
+
             shell_snippets = ""
             os_packages    = []
             dependencies.each do |name|
                 dep_def = definitions[name]
                 if !dep_def
                     raise ConfigError, "I don't know how to install '#{name}'"
-                elsif !dep_def[os_name]
+                end
+
+                # Find a matching entry for the OS name
+                os_entry = dep_def.find do |name_list, data|
+                    name_list.split(',').
+                        map(&:downcase).
+                        any? { |n| n == os_name }
+                end
+
+                if !os_entry
                     raise ConfigError, "I don't know how to install '#{name}' on #{os_name}"
                 end
 
-                data = dep_def[os_name]
+                data = os_entry.last
                 if data.kind_of?(Hash)
-                    data = data[os_version]
-                    if !data
-                        raise ConfigError, "I don't know how to install '#{name}' on this specific version of #{os_name} (#{os_version})"
+                    version_entry = data.find do |version_list, data|
+                        version_list.to_s.split(',').
+                            map(&:downcase).
+                            any? { |v| os_version.include?(v) }
+                    end
+
+                    if !version_entry
+                        raise ConfigError, "I don't know how to install '#{name}' on this specific version of #{os_name} (#{os_version.join(", ")})"
                     end
+                    data = version_entry.last
                 end
 
                 if data.respond_to?(:to_ary)
@@ -101,19 +156,21 @@ module Autoproj
             #
             # So, for now, reimplement rosdep by ourselves. Given how things
             # are done, this is actually not so hard.
-            shell_script = generate_os_script(osdeps)
-            if Autoproj.verbose
-                STDERR.puts "Installing non-ruby OS dependencies with"
-                STDERR.puts shell_script
-            end
+            if !osdeps.empty?
+                shell_script = generate_os_script(osdeps)
+                if Autoproj.verbose
+                    STDERR.puts "Installing non-ruby OS dependencies with"
+                    STDERR.puts shell_script
+                end
 
-            File.open('osdeps.sh', 'w') do |file|
-                file.write shell_script
-            end
-            begin
-                Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', './osdeps.sh'
-            ensure
-                FileUtils.rm_f 'osdeps.sh'
+                File.open('osdeps.sh', 'w') do |file|
+                    file.write shell_script
+                end
+                begin
+                    Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', './osdeps.sh'
+                ensure
+                    FileUtils.rm_f 'osdeps.sh'
+                end
             end
 
             # Don't install gems that are already there ...

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
 end

data/samples/manifest

@@ -1,9 +1,18 @@
 package_sets:
-# Example source from a git repository
+# Example from the RubyInMotion orocos package set
 #   - type: git
-#     url: git://github.com/doudou/autoproj.orocos.git
-#
-# If you want to enable only a subset of the listed sources,
-# list their names in the following section. Note that the
-# name is given in the source's source.yml file
+#     url: git://github.com/doudou/rubim.orocos.git
 
+# If you want to adapt the layout to your needs, uncomment the following (again,
+# RubyInMotion orocos package set)
+# layout:
+#   - orocos:
+#     - rubim.orocos
+#
+# The principle is to have a hierarchy of names, package names and names of
+# package sets. In the above example, all packages of the rubim.orocos package
+# set will be built under the orocos/ subdirectory. Alternatively, you could do:
+#
+# layout:
+#   - tools:
+#     - rubim.orocos

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 +02:00
+date: 2009-10-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency