autoproj 1.7.0.rc2 → 1.7.0

data/History.txt

@@ -1,30 +1,39 @@
 = Version 1.7.0
  * 1.6.2 should have been 1.7.0. Bump it now.
+== For basic use
+ * removed some OS dependency updates that should not be there. In practice, it
+   means that build and fast-build will generally be a lot faster
+ * 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 if the user's shell is compatible
+   See http://rock-robotics.org/quick_start.html#shell_helpers
+ * 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
+   to the build as soon as their path, relative to the root dir, are explicitely
+   listed in autoproj/manifest.
+   See http://rock-robotics.org/autoproj/autoproj/adding_packages.html
+ * added the --stats option that displays timing statistics about the build.
+   Raw statistics are always saved in install/log/stats.log
+== For advanced use
  * introduced cross-package-set imports. A package set can now tell autoproj to
-   install another one in a recursive manner (see user's guide)
- * added optional dependencies, which will not be considered if the
-   depended-upon package is either not existing or is explicitely excluded from
-   the build. It is specified in Ruby with
-       pkg.optional_dependency pkg_name
-   or in the package's manifest.xml files by setting the "optional" attribute to 1:
-       <depend package="pkg_name" optional="1" />
-
+   install another one in a recursive manner
+   See http://rock-robotics.org/autoproj/advanced/cross_set_dependencies.html
+ * added optional dependencies, which will not be considered if the depended-
+   upon package is either not existing or is explicitely excluded from the build.
+   See http://rock-robotics.org/autoproj/advanced/package_dependencies.html
  * added the #package toplevel method to get a package handle, i.e.
        package('orocos/rtt')
    is equivalent to the former
        Autobuild::Package['orocos/rtt']
- * added the --randomize-layout option which makes autoproj build each package
-   in a separate non-trivial subfolder, and install it in a separate folder as
-   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, 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 listed in autoproj/manifest.
- * added the --stats option that displays timing statistics about the build
+ * added tools to test the build configuration on build servers.
+   - the --randomize-layout option which makes autoproj build each package
+     in a separate non-trivial subfolder, and install it in a separate folder as
+     well. This is meant to test the definition and handling of dependencies
+     between the different packages.
+   - the autoproj_stress_test script clears the layout and adds packages one by
+     one in a random order, testing at each step if the resulting configuration
+     works fine. It turns on --randomize-layout as well.
+ * "acd" is using the autolocate tool, which returns the full path to a certain package.
    
 = Version 1.6.2
  * overhauled osdeps fine-grained configuration. See

data/Manifest.txt

@@ -4,35 +4,8 @@ README.txt
 Rakefile
 bin/autolocate
 bin/autoproj
-doc/guide/config.yaml
-doc/guide/ext/init.rb
-doc/guide/ext/previous_next.rb
-doc/guide/ext/rdoc_links.rb
-doc/guide/src/adding_packages.page
-doc/guide/src/autoproj_bootstrap
-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
-doc/guide/src/images/contbg.png
-doc/guide/src/images/footerbg.png
-doc/guide/src/images/gradient1.png
-doc/guide/src/images/gradient2.png
-doc/guide/src/index.page
-doc/guide/src/manifest.xml
-doc/guide/src/overview.png
-doc/guide/src/overview.svg
-doc/guide/src/package_sets/autobuild.page
-doc/guide/src/package_sets/importers.page
-doc/guide/src/package_sets/index.page
-doc/guide/src/package_sets/manifest-xml.page
-doc/guide/src/package_sets/osdeps.page
-doc/guide/src/quick_start.page
-doc/guide/src/toc.page
-doc/guide/src/writing_manifest.page
+bin/autoproj_bootstrap
+bin/autoproj_stress_test
 lib/autoproj.rb
 lib/autoproj/autobuild.rb
 lib/autoproj/base.rb

data/Rakefile

@@ -26,10 +26,6 @@ begin
         end
     end
 
-    # Define our own documentation handling. Rake.clear_tasks is defined by Hoe
-    Rake.clear_tasks(/dist:(re|clobber_|)docs/)
-    Rake.clear_tasks(/dist:publish_docs/)
-
 rescue LoadError
     STDERR.puts "cannot load the Hoe gem. Distribution is disabled"
 rescue Exception => e
@@ -38,15 +34,6 @@ rescue Exception => e
 end
 
 namespace 'dist' do
-    task 'publish_docs' => 'doc' do
-        if !system('doc/update_github')
-            raise "cannot update the gh-pages branch for GitHub"
-        end
-        if !system('git', 'push', 'origin', '+gh-pages')
-            raise "cannot push the documentation"
-        end
-    end
-
     desc "generate the bootstrap script"
     task 'bootstrap' do
         require 'yaml'
@@ -72,19 +59,19 @@ namespace 'dist' do
             gsub('OPTIONS_CODE', options_code).
             gsub('SYSTEM_CODE', system_code).
             gsub('OSDEPS_DEFAULTS', osdeps_defaults)
-        File.open(File.join(Dir.pwd, 'doc', 'guide', 'src', 'autoproj_bootstrap'), 'w') do |io|
+        File.open(File.join(Dir.pwd, 'bin', 'autoproj_bootstrap'), 'w') do |io|
             io.write bootstrap_code
         end
     end
 end
+file 'bin/autoproj_bootstrap' => 'dist:bootstrap'
 
 do_doc = begin
-             require 'webgen/webgentask'
              require 'rdoc/task'
              true
          rescue LoadError => e
-             STDERR.puts "ERROR: cannot load webgen and/or RDoc, documentation generation disabled"
-             STDERR.puts "ERROR:   #{e.message}"
+             STDERR.puts "WARN: cannot load RDoc, documentation generation disabled"
+             STDERR.puts "WARN:   #{e.message}"
          end
 
 if do_doc
@@ -96,18 +83,10 @@ if do_doc
     end
 
     namespace 'doc' do
-        task 'all' => %w{guide api}
-        task 'clobber' => 'clobber_guide'
-        Webgen::WebgenTask.new('guide') do |website|
-            website.clobber_outdir = true
-            website.directory = File.join(Dir.pwd, 'doc', 'guide')
-            website.config_block = lambda do |config|
-                config['output'] = ['Webgen::Output::FileSystem', File.join(Dir.pwd, 'doc', 'html')]
-            end
-        end
-        task 'guide' => 'dist:bootstrap'
+        task 'all' => %w{api}
+        task 'clobber' => 'clobber_api'
         RDoc::Task.new("api") do |rdoc|
-            rdoc.rdoc_dir = 'doc/html/api'
+            rdoc.rdoc_dir = 'doc'
             rdoc.title    = "autoproj"
             rdoc.options << '--show-hash'
             rdoc.rdoc_files.include('lib/**/*.rb')

data/bin/autolocate

@@ -1,47 +1,19 @@
 #! /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'
 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)
+root_dir  = Autoproj::CmdLine.initialize_root_directory
+selection = Autoproj::CmdLine.initialize_and_load(ARGV)
+if selection.empty?
+    puts root_dir
+    exit 0
+elsif selection.size > 1
+    STDERR.puts Autoproj.console.color("more than one name given on the command line", :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 = selection.first
 
 selection_rx = Regexp.new(Regexp.quote(selection))
 candidates = []

data/{doc/guide/src → bin}/autoproj_bootstrap

@@ -146,6 +146,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
@@ -163,11 +166,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
@@ -195,6 +201,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
@@ -1241,6 +1257,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
@@ -1266,6 +1288,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/bin/autoproj_stress_test

@@ -0,0 +1,40 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+
+root_dir = Autoproj::CmdLine.initialize_root_directory
+Autoproj::CmdLine.initialize_and_load([])
+manifest = Autoproj.manifest
+
+manifest_path = File.join(Autoproj.config_dir, 'manifest')
+manifest_data = YAML.load(File.read(manifest_path))
+manifest_data['layout'] = Array.new
+
+packages = manifest.each_package.map(&:name)
+
+while !packages.empty?
+    pkg = packages[rand(packages.size)]
+    next if !pkg
+    packages.delete(pkg)
+
+    manifest_data['layout'] << pkg
+    File.open(manifest_path, 'w') do |io|
+        io.write YAML.dump(manifest_data)
+    end
+
+    STDERR.puts
+    STDERR.puts
+    STDERR.puts
+    STDERR.puts "=================================================="
+    STDERR.puts "==== added #{pkg}"
+    if !system('autoproj', 'full-build', '--randomize-layout', pkg)
+        File.open(File.join(root_dir, 'failures.txt'), 'a') do |io|
+            io.puts "the following layout failed:"
+            io.puts "  - " + manifest_data['layout'].join("\n  - ")
+        end
+        STDERR.puts "the following layout failed:"
+        STDERR.puts "  - " + manifest_data['layout'].join("\n  - ")
+    end
+end
+

data/lib/autoproj/cmdline.rb

@@ -97,6 +97,9 @@ module Autoproj
             if Autobuild.do_update.nil?
                 Autobuild.do_update = manifest.auto_update?
             end
+            if @update_os_dependencies.nil?
+                @update_os_dependencies = manifest.auto_update?
+            end
 
             # Initialize the Autoproj.osdeps object by loading the default. The
             # rest is loaded later
@@ -745,7 +748,7 @@ where 'mode' is one of:
                     Autoproj.reconfigure = true
                 end
                 opts.on("--version", "displays the version and then exits") do
-                    STDERR.puts "autoproj v#{Autoproj::VERSION}"
+                    puts "autoproj v#{Autoproj::VERSION}"
                     exit(0)
                 end
                 opts.on("--[no-]update", "[do not] update already checked-out packages (build modes only)") do |value|
@@ -1512,12 +1515,13 @@ export PATH=$GEM_HOME/bin:$PATH
         # initialize an autoproj environment for standalone tools
         #
         # Beware, it changes the current directory to the autoproj root dir
-        def self.initialize_and_load
+        def self.initialize_and_load(cmdline_arguments = ARGV.dup)
             require 'autoproj/autobuild'
             require 'open-uri'
             require 'autoproj/cmdline'
 
-            Autoproj::CmdLine.parse_arguments(ARGV.dup, false)
+            remaining_arguments = Autoproj::CmdLine.
+                parse_arguments(cmdline_arguments, false)
             Dir.chdir(Autoproj.root_dir)
 
             Autoproj::CmdLine.update_os_dependencies = false
@@ -1532,6 +1536,21 @@ export PATH=$GEM_HOME/bin:$PATH
                     manifest.load_package_manifest(pkg.autobuild.name)
                 end
             end
+            remaining_arguments
+        end
+
+        def self.initialize_root_directory
+            Autoproj.root_dir
+        rescue Autoproj::UserError => error
+            if ENV['GEM_HOME']
+                Dir.chdir(File.join(ENV['GEM_HOME'], '..'))
+                begin Autoproj.root_dir
+                rescue Autoproj::UserError
+                    raise error
+                end
+            else
+                raise
+            end
         end
     end
 end

data/lib/autoproj/manifest.rb

@@ -800,8 +800,6 @@ module Autoproj
             @disabled_imports = Set.new
             @moved_packages = Hash.new
 
-            @explicit_selection = Set.new
-
             @constant_definitions = Hash.new
             if Autoproj.has_config_key?('manifest_source')
                 @vcs = Autoproj.normalize_vcs_definition(Autoproj.user_config('manifest_source'))

data/lib/autoproj/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 977940583
-  prerelease: true
+  hash: 11
+  prerelease: false
   segments: 
   - 1
   - 7
   - 0
-  - rc2
-  version: 1.7.0.rc2
+  version: 1.7.0
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +01:00
+date: 2010-12-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,6 +192,8 @@ email:
 executables: 
 - autolocate
 - autoproj
+- autoproj_bootstrap
+- autoproj_stress_test
 extensions: []
 
 extra_rdoc_files: 
@@ -207,35 +208,8 @@ files:
 - Rakefile
 - bin/autolocate
 - bin/autoproj
-- doc/guide/config.yaml
-- doc/guide/ext/init.rb
-- doc/guide/ext/previous_next.rb
-- doc/guide/ext/rdoc_links.rb
-- doc/guide/src/adding_packages.page
-- doc/guide/src/autoproj_bootstrap
-- 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
-- doc/guide/src/images/contbg.png
-- doc/guide/src/images/footerbg.png
-- doc/guide/src/images/gradient1.png
-- doc/guide/src/images/gradient2.png
-- doc/guide/src/index.page
-- doc/guide/src/manifest.xml
-- doc/guide/src/overview.png
-- doc/guide/src/overview.svg
-- doc/guide/src/package_sets/autobuild.page
-- doc/guide/src/package_sets/importers.page
-- doc/guide/src/package_sets/index.page
-- doc/guide/src/package_sets/manifest-xml.page
-- doc/guide/src/package_sets/osdeps.page
-- doc/guide/src/quick_start.page
-- doc/guide/src/toc.page
-- doc/guide/src/writing_manifest.page
+- bin/autoproj_bootstrap
+- bin/autoproj_stress_test
 - lib/autoproj.rb
 - lib/autoproj/autobuild.rb
 - lib/autoproj/base.rb
@@ -281,14 +255,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: autobuild