autoproj 1.7.0.rc1 → 1.7.0.rc2

data/History.txt

@@ -18,10 +18,12 @@
    well. This is meant to test the definition and handling of dependencies
    between the different packages.
  * added the autolocate tool, which returns the full path to a certain package.
-   The shell function "acd", akin to rosbuild's roscd, it provided in shell/
+   The shell function "acd", akin to rosbuild's roscd, is also provided for
+   recognized shells (bash and zsh at the moment). The relevant files are
+   sourced in env.sh
  * added an easier way to add a local checked-out package to a build without
    going through editing 20 files. Packages are automatically detected and added
-   as soon as they are explicitely added to autoproj/manifest.
+   as soon as they are explicitely listed in autoproj/manifest.
  * added the --stats option that displays timing statistics about the build
    
 = Version 1.6.2

data/Manifest.txt

@@ -2,6 +2,7 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+bin/autolocate
 bin/autoproj
 doc/guide/config.yaml
 doc/guide/ext/init.rb
@@ -49,6 +50,8 @@ samples/autoproj/overrides.rb
 samples/autoproj/overrides.yml
 samples/manifest.xml
 samples/osdeps.yml
+shell/autoproj_bash
+shell/autoproj_zsh
 test/data/test_manifest/autoproj/local/local.autobuild
 test/data/test_manifest/autoproj/manifest
 test/test_debian.rb

data/bin/autolocate

@@ -0,0 +1,91 @@
+#! /usr/bin/env ruby
+
+require "enumerator"
+require 'autobuild'
+require 'autobuild/reporting'
+require 'autoproj/autobuild'
+require 'autoproj/base'
+require 'autoproj/version'
+require 'autoproj/manifest'
+require 'autoproj/osdeps'
+require 'autoproj/system'
+require 'autoproj/options'
+require 'autoproj/cmdline'
+require 'logger'
+require 'utilrb/logger'
+
+include Autoproj
+
+root_dir =
+    begin Autoproj.root_dir
+    rescue UserError => error
+        if ENV['GEM_HOME']
+            Dir.chdir(File.join(ENV['GEM_HOME'], '..'))
+            begin Autoproj.root_dir
+            rescue UserError
+                raise error
+            end
+        else
+            raise
+        end
+    end
+
+Autoproj.silent = true
+selection = Autoproj::CmdLine.parse_arguments(ARGV, false).first
+if !selection
+    STDERR.puts Autoproj.console.color("no package name given on the command line", :bold, :red)
+    exit 1
+end
+
+Autoproj::CmdLine.update_os_dependencies = false
+Dir.chdir(Autoproj.root_dir)
+Autoproj::CmdLine.initialize
+Autoproj::CmdLine.load_configuration
+Autoproj::CmdLine.initial_package_setup
+
+selection_rx = Regexp.new(Regexp.quote(selection))
+candidates = []
+Autoproj.manifest.each_package do |pkg|
+    name = pkg.name
+    next if !Autoproj.manifest.package_enabled?(name)
+
+    srcdir = Autobuild::Package[name].srcdir
+    if name == selection
+        puts srcdir
+        exit(0)
+    elsif name =~ selection_rx
+        candidates << srcdir
+    end
+end
+
+if candidates.empty?
+    # Try harder. Match directory prefixes
+    directories = selection.split('/')
+    rx = directories.
+        map { |d| "#{Regexp.quote(d)}\\w*" }.
+        join("/")
+    rx = Regexp.new(rx)
+
+    Autoproj.manifest.each_package do |pkg|
+        name = pkg.name
+        next if !Autoproj.manifest.package_enabled?(name)
+
+        srcdir = Autobuild::Package[name].srcdir
+        if name =~ rx
+            candidates << srcdir
+        end
+    end
+
+end
+
+if candidates.empty?
+    STDERR.puts Autoproj.console.color("cannot find #{selection} in the current autoproj installation", :bold, :red)
+    exit 1
+elsif candidates.size > 1
+    STDERR.puts Autoproj.console.color("multiple packages match #{selection} in the current autoproj installation: #{candidates.join(", ")}", :bold, :red)
+    exit 1
+else
+    puts candidates.first
+    exit(0)
+end
+

data/bin/autoproj

@@ -142,7 +142,7 @@ The resulting software is installed in
 EOTEXT
     end
 
-    if Autoproj::CmdLine.only_config?
+    if Autoproj::CmdLine.only_config? || Autoproj::CmdLine.reconfigure?
         exit(0)
     end
 

data/lib/autoproj/cmdline.rb

@@ -155,7 +155,9 @@ module Autoproj
             if !silent
                 Autoproj.progress("autoproj: loading ...", :bold)
                 if !Autoproj.reconfigure?
-                    Autoproj.progress("run 'autoproj --reconfigure' to change configuration values", :bold)
+                    Autoproj.progress("run 'autoproj reconfigure' to change configuration options", :bold)
+                    Autoproj.progress("and use 'autoproj switch-config' to change the remote source for", :bold)
+                    Autoproj.progress("autoproj's main build configuration", :bold)
                 end
             end
             manifest.each_autobuild_file do |source, name|
@@ -262,7 +264,7 @@ module Autoproj
                 pkg = Autobuild::Package[pkg_name]
                 pkg.srcdir = File.join(Autoproj.root_dir, place)
                 pkg.prefix = File.join(Autoproj.build_dir, layout)
-                pkg.doc_target_dir = File.join(Autoproj.build_dir, 'doc', name, pkg_name)
+                pkg.doc_target_dir = File.join(Autoproj.build_dir, 'doc', pkg_name)
                 pkg.logdir = File.join(pkg.prefix, "log")
             end
 
@@ -584,6 +586,7 @@ module Autoproj
 
         def self.build_packages(selected_packages, all_enabled_packages)
             if Autoproj::CmdLine.doc?
+                Autobuild.only_doc = true
                 Autoproj.progress("autoproj: building and installing documentation", :bold)
             else
                 Autoproj.progress("autoproj: building and installing packages", :bold)
@@ -641,6 +644,7 @@ module Autoproj
         def self.build?; @mode =~ /build/ end
         def self.doc?; @mode == "doc" end
         def self.snapshot?; @mode == "snapshot" end
+        def self.reconfigure?; @mode == "reconfigure" end
 
         def self.show_statistics?; !!@show_statistics end
 
@@ -708,6 +712,9 @@ where 'mode' is one of:
   list-config:   list all available packages
   update:        only import/update packages, do not build them
   update-config: only update the configuration
+  reconfigure:   change the configuration options. Additionally, the
+                 --reconfigure option can be used in other modes like
+                 update or build
 
 -- Experimental Features (USE AT YOUR OWN RISK)
   check:  compares dependencies in manifest.xml with autodetected ones
@@ -770,15 +777,15 @@ where 'mode' is one of:
                 opts.on("--list-newest", "for each source directory, list what is the newest file used by autoproj for dependency tracking") do
                     Autoproj::CmdLine.list_newest = true
                 end
-                opts.on("--rshow", "in the osdeps mode, shows information for each OS package") do
+                opts.on("--no-osdeps", "in build and update modes, disable osdeps handling") do |value|
+                    @osdeps_forced_mode = 'none'
+                end
+                opts.on("--rshow", "in osdeps mode, shows information for each OS package") do
                     @revshow_osdeps = true
                 end
-                opts.on("--show", "in the osdeps mode, show a per-package listing of the OS dependencies instead of installing them") do
+                opts.on("--show", "in osdeps mode, show a per-package listing of the OS dependencies instead of installing them") do
                     @show_osdeps = true
                 end
-                opts.on("--no-osdeps", "disable osdeps handling in build and update modes") do |value|
-                    @osdeps_forced_mode = 'none'
-                end
                 opts.on("--all", "in osdeps mode, install both OS packages and RubyGem packages, regardless of the otherwise selected mode") do
                     @osdeps_forced_mode = 'all'
                 end
@@ -870,6 +877,9 @@ where 'mode' is one of:
             @force_re_build_with_depends = force_re_build_with_depends if !force_re_build_with_depends.nil?
             Autobuild.do_update = do_update if !do_update.nil?
             selection
+
+        rescue OptionParser::InvalidOption => e
+            raise ConfigError, e.message, e.backtrace
         end
 
         def self.handle_mode(mode, remaining_args)
@@ -902,6 +912,12 @@ where 'mode' is one of:
                 switch_config(*remaining_args)
                 exit 0
 
+            when "reconfigure"
+                Autoproj.reconfigure = true
+                Autobuild.do_update = false
+                Autobuild.do_build = false
+                @update_os_dependencies = false
+
             when "build"
             when "force-build"
                 Autobuild.do_forced_build = true
@@ -1097,22 +1113,6 @@ where 'mode' is one of:
                     do_switch_config(true, type, url, *options)
                 end
             end
-
-            # And now save the options: note that we keep the current option set even
-            # though we switched configuration. This is not a problem as undefined
-            # options will not be reused
-            #
-            # TODO: cleanup the options to only keep the relevant ones
-            vcs_def = Hash['type' => type, 'url' => url]
-            options.each do |opt|
-                opt_name, opt_val = opt.split '='
-                vcs_def[opt_name] = opt_val
-            end
-            # Validate the option hash, just in case
-            Autoproj.normalize_vcs_definition(vcs_def)
-            # Save the new options
-            Autoproj.change_option('manifest_source', vcs_def, true)
-            Autoproj.save_config
         end
 
         def self.do_switch_config(delete_current, type, url, *options)
@@ -1147,17 +1147,25 @@ where 'mode' is one of:
             end
             Autoproj::Manifest.update_package_set(vcs, "autoproj main configuration", config_dir)
 
-            Autoproj.change_option "manifest_source", vcs_def.dup, true
+            # If the new tree has a configuration file, load it and set
+            # manifest_source
+            Autoproj.load_config
 
-            # Now write it in the config file
-            File.open(File.join(Autoproj.config_dir, "config.yml"), "a") do |io|
-                io.puts <<-EOTEXT
-manifest_source:
-    type: #{vcs_def.delete(:type)}
-    url: #{vcs_def.delete(:url)}
-    #{vcs_def.map { |k, v| "#{k}: #{v}" }.join("\n    ")}
-                EOTEXT
+            # And now save the options: note that we keep the current option set even
+            # though we switched configuration. This is not a problem as undefined
+            # options will not be reused
+            #
+            # TODO: cleanup the options to only keep the relevant ones
+            vcs_def = Hash['type' => type, 'url' => url]
+            options.each do |opt|
+                opt_name, opt_val = opt.split '='
+                vcs_def[opt_name] = opt_val
             end
+            # Validate the option hash, just in case
+            Autoproj.normalize_vcs_definition(vcs_def)
+            # Save the new options
+            Autoproj.change_option "manifest_source", vcs_def.dup, true
+            Autoproj.save_config
 
         rescue Exception
             if backup_name
@@ -1234,6 +1242,8 @@ manifest_source:
                 manifest_data =
                     begin open(manifest_url) { |file| file.read }
                     rescue
+                        # Delete the autoproj directory
+                        FileUtils.rm_rf 'autoproj'
                         raise ConfigError.new, "cannot read #{manifest_url}, did you mean 'autoproj bootstrap VCSTYPE #{manifest_url}' ?"
                     end
 

data/lib/autoproj/manifest.rb

@@ -251,6 +251,14 @@ module Autoproj
         # local? returns true.
         attr_accessor :vcs
 
+        # The set of OSDependencies object that represent the osdeps files
+        # available in this package set
+        attr_reader :all_osdeps
+
+        # The OSDependencies which is a merged version of all OSdeps in
+        # #all_osdeps
+        attr_reader :osdeps
+
         # If this package set has been imported from another package set, this
         # is the other package set object
         attr_accessor :imported_from
@@ -272,12 +280,27 @@ module Autoproj
         def initialize(manifest, vcs)
             @manifest = manifest
             @vcs = vcs
+            @osdeps = OSDependencies.new
+            @all_osdeps = []
 
             @provides = Set.new
             @imports  = Array.new
             @auto_imports = true
         end
 
+        # Load a new osdeps file for this package set
+        def load_osdeps(file)
+            new_osdeps = OSDependencies.load(file)
+            @all_osdeps << new_osdeps
+            @osdeps.merge(@all_osdeps.last)
+            new_osdeps
+        end
+
+        # Enumerate all osdeps package names from this package set
+        def each_osdep(&block)
+            @osdeps.definitions.each_key(&block)
+        end
+
         # True if this source has already been checked out on the local autoproj
         # installation
         def present?; File.directory?(raw_local_dir) end
@@ -722,7 +745,7 @@ module Autoproj
         # Load the manifest data contained in +file+
         def load(file)
             if !File.exists?(file)
-                raise ConfigError.new(dirname), "expected an autoproj configuration in #{dirname}, but #{file} does not exist"
+                raise ConfigError.new(File.dirname(file)), "expected an autoproj configuration in #{File.dirname(file)}, but #{file} does not exist"
             end
 
             data = Autoproj.in_file(file, ArgumentError) do
@@ -1546,7 +1569,7 @@ module Autoproj
 
     def self.load_osdeps_from_package_sets
         manifest.each_osdeps_file do |source, file|
-            osdeps.merge(OSDependencies.load(file))
+            osdeps.merge(source.load_osdeps(file))
         end
         osdeps
     end
@@ -1564,9 +1587,28 @@ module Autoproj
         # The raw XML data as a Nokogiri document
         attr_reader :xml
 
+        def documentation
+            xml.xpath('//description').each do |node|
+                doc = node.content.strip
+                if doc.empty?
+                    if doc = short_documentation
+                        return doc
+                    end
+                    return "no documentation available for #{package.name} in its manifest.xml file"
+                else
+                    return doc
+                end
+            end
+            nil
+        end
+
         def short_documentation
             xml.xpath('//description').each do |node|
-                if doc = node['brief']
+                doc = node['brief']
+                if doc
+                    doc = doc.to_s.strip
+                end
+                if doc && !doc.empty?
                     return doc.to_s
                 end
             end

data/lib/autoproj/osdeps.rb

@@ -47,6 +47,9 @@ module Autoproj
 
         # The information contained in the OSdeps files, as a hash
         attr_reader :definitions
+        # All the information contained in all the OSdeps files, as a mapping
+        # from the OSdeps package name to [osdeps_file, definition] pairs
+        attr_reader :all_definitions
         # The information as to from which osdeps file the current package
         # information in +definitions+ originates. It is a mapping from the
         # package name to the osdeps file' full path
@@ -64,11 +67,14 @@ module Autoproj
 
         def initialize(defs = Hash.new, file = nil)
             @definitions = defs.to_hash
+            @all_definitions = Hash.new { |h, k| h[k] = Array.new }
+
             @sources     = Hash.new
             @installed_packages = Array.new
             if file
                 defs.each_key do |package_name|
                     sources[package_name] = file
+                    all_definitions[package_name] << [[file], defs[package_name]]
                 end
             end
             @silent = true
@@ -96,6 +102,16 @@ module Autoproj
                 v2
             end
             @sources = sources.merge(info.sources)
+            @all_definitions = all_definitions.merge(info.all_definitions) do |package_name, all_defs, new_all_defs|
+                all_defs = all_defs.dup
+                new_all_defs = new_all_defs.dup
+                new_all_defs.delete_if do |files, data|
+                    if entry = all_defs.find { |_, d| d == data }
+                        entry[0] |= files
+                    end
+                end
+                all_defs.concat(new_all_defs)
+            end
         end
 
         # Perform some sanity checks on the given osdeps definitions

data/lib/autoproj/system.rb

@@ -112,6 +112,12 @@ module Autoproj
         Autoproj.env_set 'LD_LIBRARY_PATH'
     end
 
+    class << self
+        attr_writer :shell_helpers
+        def shell_helpers?; !!@shell_helpers end
+    end
+    @shell_helpers = true
+
     # Create the env.sh script in +subdir+. In general, +subdir+ should be nil.
     def self.export_env_sh(subdir = nil)
         filename = if subdir
@@ -137,6 +143,20 @@ module Autoproj
             variables.each do |var|
                 io.puts "export #{var}"
             end
+
+            shell_dir = File.expand_path(File.join("..", "..", "shell"), File.dirname(__FILE__))
+            if Autoproj.shell_helpers? && shell = ENV['SHELL']
+                shell_kind = File.basename(shell)
+                if shell_kind =~ /^\w+$/
+                    shell_file = File.join(shell_dir, "autoproj_#{shell_kind}")
+                    if File.exists?(shell_file)
+                        Autoproj.progress
+                        Autoproj.progress "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
+                        Autoproj.progress "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
+                        io.puts "source \"#{shell_file}\""
+                    end
+                end
+            end
         end
     end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.0.rc1"
+    VERSION = "1.7.0.rc2"
 end

data/samples/autoproj/manifest

@@ -1,13 +1,9 @@
 # List of VCS information or subdirectories of autoproj/ in which to find
 # package set definitions.
 package_sets:
-# Examples from the RubyInMotion package sets
+# Examples from the Rock package set
 #   - 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
+#     url: git://gitorious.com/rock/package_set.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
@@ -16,8 +12,8 @@ package_sets:
 # files in build/tools/typelib, build/tools/orocos/rtt, ...
 #
 # layout:
-#   - tools:
-#     - rubim.orocos
+#   - rock:
+#     - rock.toolchain
 #
 # Single packages can also be selected instead of whole package sets. The
 # package names are interpreted as a regular expression, so it is possible to

data/samples/autoproj/overrides.rb

@@ -1,4 +1,4 @@
 # Write in this file customization code that will get executed after all the
-# soures have beenloaded.
+# soures have been loaded.
 
 

data/samples/autoproj/overrides.yml

@@ -1,8 +1,18 @@
 # This file has the same format than the source.yml files. It can be used to
 # locally override version control information.
+
+
+# You can add sources for new packages
 #
 # version_control:
 #   - orocos/rtt:
 #       type: git
 #       url: git://my.own.git.server
+
+
+# You can override source information for packages coming from the package
+# sets
 #
+# overrides:
+#   - orogen:
+#       branch: test

data/shell/autoproj_bash

@@ -0,0 +1,12 @@
+function acd {
+    local pkg_path
+    pkg_path=$(autolocate $1)
+
+    if [ $? != 0 ]; then
+      return 1
+    else
+      cd $pkg_path
+      return 0
+    fi
+}
+

data/shell/autoproj_zsh

@@ -0,0 +1,12 @@
+function acd {
+    local pkg_path
+    pkg_path=$(autolocate $1)
+
+    if [ $? != 0 ]; then
+      return 1
+    else
+      cd $pkg_path
+      return 0
+    fi
+}
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 977940582
+  hash: 977940583
   prerelease: true
   segments: 
   - 1
   - 7
   - 0
-  - rc1
-  version: 1.7.0.rc1
+  - rc2
+  version: 1.7.0.rc2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +01:00
+date: 2010-12-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -191,6 +191,7 @@ description: |-
 email: 
 - sylvain.joyeux@dfki.de
 executables: 
+- autolocate
 - autoproj
 extensions: []
 
@@ -204,6 +205,7 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- bin/autolocate
 - bin/autoproj
 - doc/guide/config.yaml
 - doc/guide/ext/init.rb
@@ -251,6 +253,8 @@ files:
 - samples/autoproj/overrides.yml
 - samples/manifest.xml
 - samples/osdeps.yml
+- shell/autoproj_bash
+- shell/autoproj_zsh
 - test/data/test_manifest/autoproj/local/local.autobuild
 - test/data/test_manifest/autoproj/manifest
 - test/test_debian.rb