autoproj 1.2.6 → 1.3.0

data/lib/autoproj/osdeps.rb

@@ -111,7 +111,7 @@ module Autoproj
 
                 data = os_entry.last
                 # This package does not need to be installed on this operating system (example: build tools on Gentoo)
-                next if !data
+                next if !data || data == "ignore"
 
                 if data.kind_of?(Hash)
                     version_entry = data.find do |version_list, data|
@@ -141,21 +141,29 @@ module Autoproj
                 "\n" + shell_snippets
         end
 
-        def partition_packages(package_set)
+        # call-seq:
+        #   partition_packages(package_names) => os_packages, gem_packages
+        def partition_packages(package_set, package_osdeps = Hash.new)
             package_set = package_set.to_set
             osdeps, gems = [], []
             package_set.to_set.each do |name|
                 pkg_def = definitions[name]
                 if !pkg_def
-                    raise ConfigError, "I know nothing about a prepackaged '#{name}' software"
+                    msg = "I know nothing about a prepackaged software called '#{name}'"
+                    if pkg_names = package_osdeps[name]
+                        msg += ", it is listed as dependency of the following package(s): #{pkg_names.join(", ")}"
+                    end
+
+                    raise ConfigError, msg
                 end
 
                 if pkg_def.respond_to?(:to_str)
                     case(pkg_def.to_str)
+                    when "ignore" then
                     when "gem" then
                         gems << name
                     else
-                        raise ConfigError, "unknown OS-independent package management type #{pkg_def}"
+                        raise ConfigError, "unknown OS-independent package management type #{pkg_def} for #{name}"
                     end
                 else
                     osdeps << name
@@ -164,8 +172,9 @@ module Autoproj
             return osdeps, gems
         end
 
-        def install(packages)
-            osdeps, gems = partition_packages(packages)
+        # Requests the installation of the given set of packages
+        def install(packages, package_osdeps = Hash.new)
+            osdeps, gems = partition_packages(packages, package_osdeps)
 
             did_something = false
 
@@ -187,7 +196,7 @@ module Autoproj
                 end
                 Autobuild.progress "installing/updating OS dependencies: #{osdeps.join(", ")}"
                 begin
-                    Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', './osdeps.sh'
+                    Autobuild::Subprocess.run 'autoproj', 'osdeps', '/bin/bash', File.expand_path('osdeps.sh')
                 ensure
                     FileUtils.rm_f 'osdeps.sh'
                 end

data/lib/autoproj/system.rb

@@ -53,8 +53,14 @@ module Autoproj
         Autoproj.env_set 'LD_LIBRARY_PATH'
     end
 
-    def self.export_env_sh(subdir)
-        File.open(File.join(Autoproj.root_dir, subdir, "env.sh"), "w") do |io|
+    def self.export_env_sh(subdir = nil)
+        filename = if subdir
+                       File.join(Autoproj.root_dir, subdir, "env.sh")
+                   else
+                       File.join(Autoproj.root_dir, "env.sh")
+                   end
+
+        File.open(filename, "w") do |io|
             Autobuild.environment.each do |name, value|
                 shell_line = "export #{name}=#{value.join(":")}"
                 if Autoproj.env_inherit?(name)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.2.6"
+    VERSION = "1.3.0"
 end

data/samples/autoproj/manifest

@@ -1,9 +1,13 @@
 # List of VCS information or subdirectories of autoproj/ in which to find
 # package set definitions.
 package_sets:
-# Example from the RubyInMotion orocos package set
+# Examples from the RubyInMotion package sets
+#   - type: git
+#     url: git://github.com/doudou/rubim.base.git
 #   - type: git
 #     url: git://github.com/doudou/rubim.orocos.git
+#   - type: git
+#     url: git://github.com/doudou/rubim.drivers.git
 
 # The layout section specifies what to build, and where to build it (as a
 # subdirectory of the root installation directory). In the example below, all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
+  version: 1.3.0
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 +01:00
+date: 2009-12-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,6 +142,7 @@ files:
 - doc/guide/src/customization.page
 - doc/guide/src/default.css
 - doc/guide/src/default.template
+- doc/guide/src/error_messages.page
 - doc/guide/src/htmldoc.metainfo
 - doc/guide/src/htmldoc.virtual
 - doc/guide/src/images/bodybg.png