autoproj 1.5.3 → 1.5.4

data/History.txt

@@ -1,3 +1,6 @@
+= Version 1.5.4
+ * better error message when a dependency does not exist
+
 = Version 1.5.3
  * use osdeps-provided packages instead of autobuild-built ones even if they are
    implicitely selected in the layout (i.e. because of a package set name).

data/Rakefile

@@ -39,6 +39,19 @@ begin
         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'))
+            # Filter rubygems dependencies from the OSdeps default. They will be
+            # installed at first build
+            osdeps = YAML.load(osdeps_defaults)
+            osdeps.delete_if do |name, content|
+                if content.respond_to?(:delete)
+                    content.delete('gem')
+                    content.empty?
+                else
+                    content == 'gem'
+                end
+            end
+            osdeps_defaults = YAML.dump(osdeps)
+
             bootstrap_code = File.read(File.join(Dir.pwd, 'bin', 'autoproj_bootstrap.in')).
                 gsub('OSDEPS_CODE', osdeps_code).
                 gsub('OSDEPS_DEFAULTS', osdeps_defaults)

data/doc/guide/src/autoproj_bootstrap

@@ -98,7 +98,16 @@ module Autoproj
 
         AUTOPROJ_OSDEPS = File.join(File.expand_path(File.dirname(__FILE__)), 'default.osdeps')
         def self.load_default
-            @default_osdeps ||= OSDependencies.load(AUTOPROJ_OSDEPS)
+            if @default_osdeps
+                @default_osdeps
+            else
+                file = ENV['AUTOPROJ_DEFAULT_OSDEPS'] || AUTOPROJ_OSDEPS
+                if !File.file?(file)
+                    STDERR.puts "WARN: #{file} (from AUTOPROJ_DEFAULT_OSDEPS) is not a file, falling back to #{AUTOPROJ_OSDEPS}"
+                    file = AUTOPROJ_OSDEPS
+                end
+                @default_osdeps = OSDependencies.load(file)
+            end
         end
 
         attr_reader :definitions
@@ -195,14 +204,18 @@ module Autoproj
             'arch' => 'pacman -Sy --noconfirm %s'
         }
 
-        def generate_os_script(dependencies)
+        # Resolves the given OS dependencies into the actual packages that need
+        # to be installed on this particular OS.
+        #
+        # Raises ConfigError if some packages can't be found
+        def resolve_os_dependencies(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    = []
+            shell_snippets = []
             dependencies.each do |name|
                 dep_def = definitions[name]
                 if !dep_def
@@ -221,6 +234,7 @@ module Autoproj
                 end
 
                 data = os_entry.last
+
                 # This package does not need to be installed on this operating system (example: build tools on Gentoo)
                 next if !data || data == "ignore"
 
@@ -244,20 +258,29 @@ module Autoproj
                 elsif data.to_str =~ /\w+/
                     os_packages << data.to_str
                 else
-                    shell_snippets << "\n" << data << "\n"
+                    shell_snippets << data.to_str
                 end
             end
 
+            return os_packages, shell_snippets
+        end
+
+
+        def generate_os_script(dependencies)
+            os_name, os_version = operating_system
+            os_packages, shell_snippets = resolve_os_dependencies(dependencies)
+
             "#! /bin/bash\n" +
             GAIN_ROOT_ACCESS + "\n" +
                 (OS_PACKAGE_INSTALL[os_name] % [os_packages.join(" ")]) +
-                "\n" + shell_snippets
+                "\n" + shell_snippets.join("\n")
         end
 
         # Returns true if there is an operating-system package with that name,
         # and false otherwise
         def has?(name)
-            partition_packages([name].to_set)
+            osdeps, gemdeps = partition_packages([name].to_set)
+            resolve_os_dependencies(osdeps)
             true
         rescue ConfigError
             false
@@ -398,92 +421,86 @@ end
 
 
 DEFS = <<EODEFS
-# The following definitions are needed to bootstrap autoproj
+--- 
 none: ignore
-
-ruby18:
-    debian,ubuntu:
-        - ruby1.8-dev
-        - ruby1.8
-        - rubygems1.8
-        - ri1.8
-        - libopenssl-ruby1.8
-    gentoo:
-        - dev-lang/ruby:1.8
-
-ruby19:
-    debian:
-        squeeze,sid:
-            - ruby1.9.1
-            - ruby1.9.1-dev
-            - rubygems1.9.1
-        stable:
-            - ruby1.9.1
-            - ruby1.9.1-dev
-            - rubygems1.9.1
-
-    ubuntu:
-        - ruby1.9.1
-        - ruby1.9.1-dev
-        - rubygems1.9.1
-        - ri1.9.1
-        - libopenssl-ruby1.9.1
-    gentoo:
-        - dev-lang/ruby:1.9
-    arch:
-        - ruby
-
+ruby18: 
+  debian,ubuntu: 
+  - ruby1.8-dev
+  - ruby1.8
+  - rubygems1.8
+  - ri1.8
+  - libopenssl-ruby1.8
+  gentoo: 
+  - dev-lang/ruby:1.8
+ruby19: 
+  debian: 
+    squeeze,sid: 
+    - ruby1.9.1
+    - ruby1.9.1-dev
+    - rubygems1.9.1
+    stable: 
+    - ruby1.9.1
+    - ruby1.9.1-dev
+    - rubygems1.9.1
+  ubuntu: 
+  - ruby1.9.1
+  - ruby1.9.1-dev
+  - rubygems1.9.1
+  - ri1.9.1
+  - libopenssl-ruby1.9.1
+  gentoo: 
+  - dev-lang/ruby:1.9
+  arch: 
+  - ruby
 rdoc: gem
-
-build-essential:
-    debian,ubuntu: build-essential
-    gentoo:
-    arch:
-
-libxml2:
-    debian,ubuntu: libxml2-dev
-    gentoo: dev-libs/libxml2
-    arch: libxml2
-
-libxslt:
-    debian,ubuntu: libxslt1-dev
-    gentoo: dev-libs/libxslt
-    arch: libxslt
-
+build-essential: 
+  debian,ubuntu: build-essential
+  gentoo: 
+  arch: 
+libxml2: 
+  debian,ubuntu: libxml2-dev
+  gentoo: dev-libs/libxml2
+  arch: libxml2
+libxslt: 
+  debian,ubuntu: libxslt1-dev
+  gentoo: dev-libs/libxslt
+  arch: libxslt
 autobuild: gem
 autoproj: gem
-
-# The following definitions are for the VCS and build systems
-git:
-    debian,ubuntu: git-core
-    gentoo: dev-vcs/git
-    arch: git
-svn:
-    debian,ubuntu: subversion
-    gentoo: dev-util/subversion
-    arch: subversion
-cmake:
-    debian,ubuntu: cmake
-    gentoo: dev-util/cmake
-    arch: cmake
-
-autotools:
-    debian,ubuntu: [automake1.9, autoconf]
-    gentoo: [sys-devel/automake:1.9, sys-devel/autoconf]
-    arch: automake autoconf
-
-lsb_release:
-    debian,ubuntu: lsb-release
-    gentoo: sys-apps/lsb-release
-    arch:
-    
-archive:
-    debian,ubuntu: [tar, unzip]
-    gentoo: [app-arch/tar, app-arch/unzip]
-    arch: [tar, unzip]
-
-# vim: expandtab
-
+git: 
+  debian,ubuntu: git-core
+  gentoo: dev-vcs/git
+  arch: git
+svn: 
+  debian,ubuntu: subversion
+  gentoo: dev-util/subversion
+  arch: subversion
+cmake: 
+  debian,ubuntu: cmake
+  gentoo: dev-util/cmake
+  arch: cmake
+autotools: 
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+  arch: automake autoconf
+lsb_release: 
+  debian,ubuntu: lsb-release
+  gentoo: sys-apps/lsb-release
+  arch: 
+archive: 
+  debian,ubuntu: 
+  - tar
+  - unzip
+  gentoo: 
+  - app-arch/tar
+  - app-arch/unzip
+  arch: 
+  - tar
+  - unzip
 
 EODEFS
 

data/lib/autoproj/autobuild.rb

@@ -11,11 +11,22 @@ module Autobuild
 
         alias __depends_on__ depends_on
         def depends_on(name)
-            if Autoproj.osdeps.has?(name) && !Autoproj.manifest.explicitly_selected_package?(name)
+            explicit_selection = Autoproj.manifest.explicitly_selected_package?(name)
+            if Autoproj.osdeps.has?(name) && !explicit_selection
                 @os_packages ||= Set.new
                 @os_packages << name
             else
-                __depends_on__(name)
+                begin
+                    __depends_on__(name)
+                rescue Exception => e
+                    if explicit_selection
+                        raise e
+                    else
+                        # Re-call osdeps to get a proper error message
+                        osdeps, gems = Autoproj.osdeps.partition_packages([name].to_set)
+                        Autoproj.osdeps.resolve_os_dependencies(osdeps)
+                    end
+                end
             end
         end
 

data/lib/autoproj/manifest.rb

@@ -1018,7 +1018,9 @@ module Autoproj
                 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})"
+                    raise ConfigError, "manifest #{manifest_path} of #{package.name} from #{source.name} lists '#{name}' as dependency, which is listed in the layout but has no autobuild definition"
+                rescue ConfigError => e
+                    raise ConfigError, "manifest #{manifest_path} of #{package.name} from #{source.name} lists '#{name}' as dependency, but it is neither a normal package nor an osdeps package. osdeps reports: #{e.message}"
                 end
             end
         end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.5.3"
+    VERSION = "1.5.4"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 3
-  version: 1.5.3
+  - 4
+  version: 1.5.4
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +02:00
+date: 2010-06-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency