autoproj 1.4.1 → 1.4.2

data/History.txt

@@ -1,3 +1,13 @@
+= Version 1.4.2
+ * change the order in which package sets are considered for version control
+   information in the manifest. The package set list needs now to be defined
+   from the most generic to the least generic
+ * define a shell script called 'ruby' in prefix/bin to call the right ruby
+   interpreter. This makes the "#! /usr/bin/env ruby" she-bang line working
+   on interpreters that are not called 'ruby'.
+ * the package directories (prefix, srcdir, builddir, ...) can be used by other
+   packages for their configuration now.
+
 = Version 1.4.1
  * add the envsh build mode: only update env.sh
  * rebuild <package> and force-build <package> only apply by default on the

data/bin/autoproj

@@ -469,6 +469,7 @@ report(debug) do
             raise ConfigError, "RubyGems is already loaded with a different GEM_HOME, make sure you are loading the right env.sh script !"
         end
     end
+
     # Set up some important autobuild parameters
     Autoproj.env_inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB', 'LD_LIBRARY_PATH'
     Autoproj.env_set 'GEM_HOME', Autoproj.gem_home
@@ -481,6 +482,20 @@ report(debug) do
         Autobuild::Reporting << Autobuild::MailReporter.new(mail_config)
     end
 
+
+    ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
+    if ruby != 'ruby'
+        bindir = File.join(Autoproj.build_dir, 'bin')
+        FileUtils.mkdir_p bindir
+        File.open(File.join(bindir, 'ruby'), 'w') do |io|
+            io.puts "#! /bin/sh"
+            io.puts "exec #{ruby} \"$@\""
+        end
+        FileUtils.chmod 0755, File.join(bindir, 'ruby')
+
+        Autoproj.env_add 'PATH', bindir
+    end
+
     # First things first, see if we need to update ourselves
     osdeps = Autoproj::OSDependencies.load_default
     if osdeps.install(%w{autobuild autoproj})
@@ -556,8 +571,8 @@ report(debug) do
     if Autoproj.verbose
         # List defined packages, and in which autobuild files they are defined
         STDERR.puts "Available packages:"
-        manifest.packages.each_value do |package, source, file|
-            STDERR.puts "  #{package.name}: #{file} from #{source.name}"
+        manifest.packages.each_value do |pkg|
+            STDERR.puts "  #{pkg.autobuild.name}: #{pkg.file} from #{pkg.package_set.name}"
         end
     end
 
@@ -656,6 +671,14 @@ report(debug) do
         seen |= packages
     end
 
+    # 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]
+        end
+    end
+
     if only_do_status
         STDERR.puts
         all_packages = Set.new

data/doc/guide/src/package_sets/importers.page

@@ -18,9 +18,8 @@ version_control:
 Autoproj follows the following rules to find the importer definition for a given
 package:
  
- - it looks *in order* in the package sets listed in the manifest file, and will
-   take the definition from the *first* package set that has a definition for
-   the package.
+ - it looks *in reverse order* in the package sets listed in the manifest file,
+   and will take the definition from the *first* package set that has one.
  - in the source.yml file, it will match the package's name with the
    package\_name fields. It will consider every matching block (i.e. every
    package\_name that matches), overriding earlier options by later ones.
@@ -29,19 +28,19 @@ As an example, let's consider the following manifest:
 
 {coderay:: ruby}
 package_sets:
-    - rubim.drivers
-    - rubim.orocos
     - rubim.base
+    - rubim.orocos
+    - rubim.drivers
 {coderay}
 
 Now, let's assume that the rubim.orocos package set has a source.yml file with:
 
 {coderay:: ruby}
 version_control:
-    orocos/:
+    - orocos/:
         type: git
         url: git://github.com/$PACKAGE.git
-    orocos/orocos.rb:
+    - orocos/orocos.rb:
         branch: roby
 {coderay}
 
@@ -49,7 +48,7 @@ Finally, the rubim.drivers package set has:
 
 {coderay:: ruby}
 version_control:
-    orocos/logger:
+    - orocos/logger:
         type: git
         url: git://github.com/$PACKAGE.git
         branch: perf

data/lib/autoproj/autobuild.rb

@@ -46,8 +46,9 @@ module Autoproj
     end
 
     def self.define(package_type, spec, &block)
-        package = Autobuild.send(package_type, spec, &block)
-        Autoproj.manifest.register_package package, *current_file
+        package = Autobuild.send(package_type, spec)
+        Autoproj.manifest.register_package package, block, *current_file
+        package
     end
 
     @loaded_autobuild_files = Set.new
@@ -90,7 +91,7 @@ def ruby_doc(pkg, target = 'doc')
 end
 
 # Common setup for packages
-def package_common(package_type, spec) # :nodoc:
+def package_common(package_type, spec, &block) # :nodoc:
     package_name = Autoproj.package_name_from_options(spec)
 
     begin
@@ -105,10 +106,9 @@ def package_common(package_type, spec) # :nodoc:
         return Autoproj.define(:dummy, spec)
     end
 
-    Autoproj.define(package_type, spec) do |pkg|
-        pkg.srcdir   = pkg.name
-        yield(pkg) if block_given?
-    end
+    pkg = Autoproj.define(package_type, spec, &block)
+    pkg.srcdir = pkg.name
+    pkg
 end
 
 def import_package(options, &block)

data/lib/autoproj/manifest.rb

@@ -420,9 +420,9 @@ module Autoproj
                 return enum_for(:each_package)
             end
 
-            Autoproj.manifest.packages.each do |pkg_name, (pkg, source, file)|
-                if source.name == name
-                    yield(pkg)
+            Autoproj.manifest.packages.each_value do |pkg|
+                if pkg.package_set.name == name
+                    yield(pkg.autobuild)
                 end
             end
         end
@@ -455,6 +455,8 @@ module Autoproj
         end
     end
 
+    PackageDefinition = Struct.new :autobuild, :user_block, :package_set, :file
+
     class Manifest
         FakePackage = Struct.new :text_name, :name, :srcdir, :importer
         class FakePackage
@@ -665,15 +667,15 @@ module Autoproj
         end
 
         # Register a new package
-        def register_package(package, source, file)
-            @packages[package.name] = [package, source, file]
+        def register_package(package, block, source, file)
+            @packages[package.name] = PackageDefinition.new(package, block, source, file)
         end
 
         def definition_source(package_name)
-            @packages[package_name][1]
+            @packages[package_name].package_set
         end
         def definition_file(package_name)
-            @packages[package_name][2]
+            @packages[package_name].file
         end
 
         # Lists all defined packages and where they have been defined
@@ -681,7 +683,7 @@ module Autoproj
             if !block_given?
                 return enum_for(:each_package)
             end
-            packages.each_value { |package, _| yield(package) }
+            packages.each_value { |pkg| yield(pkg.autobuild) }
         end
 
         # The VCS object for the main configuration itself
@@ -736,10 +738,12 @@ module Autoproj
 
         def importer_definition_for(package_name, package_source = nil)
             if !package_source
-                _, package_source, _ = packages.values.find { |pkg, pkg_source, _| pkg.name == package_name }
+                package_source = packages.values.
+                    find { |pkg| pkg.autobuild.name == package_name }.
+                    package_set
             end
 
-            each_source.each do |source|
+            each_source.to_a.reverse.each do |source|
                 vcs = source.importer_definition_for(package_name)
                 if vcs
                     return vcs
@@ -767,14 +771,14 @@ module Autoproj
         #  * S0 can have a VCS line for P, which would override the one defined
         #    by S1
         def load_importers
-            packages.each_value do |package, package_source, package_source_file|
-                vcs = importer_definition_for(package.name, package_source)
+            packages.each_value do |pkg|
+                vcs = importer_definition_for(pkg.autobuild.name, pkg.package_set)
 
                 if vcs
                     Autoproj.add_build_system_dependency vcs.type
-                    package.importer = vcs.create_autobuild_importer
+                    pkg.autobuild.importer = vcs.create_autobuild_importer
                 else
-                    raise ConfigError, "source #{package_source.name} defines #{package.name}, but does not provide a version control definition for it"
+                    raise ConfigError, "source #{pkg.package_set.name} defines #{pkg.autobuild.name}, but does not provide a version control definition for it"
                 end
             end
         end
@@ -790,8 +794,9 @@ module Autoproj
                 if !source
                     raise ConfigError, "#{name} is neither a package nor a source"
                 end
-                packages.values.find_all { |pkg, pkg_src, _| pkg_src.name == source.name }.
-                    map { |pkg, _| pkg.name }
+                packages.values.
+                    map { |pkg| pkg.autobuild.name if pkg.package_set.name == source.name }.
+                    compact
             end
         end
 
@@ -904,8 +909,9 @@ module Autoproj
         # Right now, the absence of a manifest makes autoproj only issue a
         # warning. This will later be changed into an error.
         def load_package_manifest(pkg_name)
-            package, source, file = packages.values.
-                find { |package, source, file| package.name == pkg_name }
+            pkg = packages.values.
+                find { |pkg| pkg.autobuild.name == pkg_name }
+            package, source, file = pkg.autobuild, pkg.package_set, pkg.file
 
             if !pkg_name
                 raise ArgumentError, "package #{pkg_name} is not defined"

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.4.1"
+    VERSION = "1.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 +01:00
+date: 2010-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency