autoproj 1.1.3 → 1.2.0

data/History.txt

@@ -1,3 +1,8 @@
+= Version 1.2.0
+ * added the rebuild and force-build modes
+ * added a local source that allows to override imported package sets and so on.
+ * improved documentation on the subject of customizing the installation
+
 = Version 1.1.3
  * fix --reconfigure on installations where the main configuration is managed by
    a VCS

data/Manifest.txt

@@ -9,6 +9,7 @@ doc/guide/ext/previous_next.rb
 doc/guide/ext/rdoc_links.rb
 doc/guide/src/autobuild.page
 doc/guide/src/autoproj_bootstrap
+doc/guide/src/customization.page
 doc/guide/src/default.css
 doc/guide/src/default.template
 doc/guide/src/htmldoc.metainfo
@@ -28,7 +29,10 @@ lib/autoproj/options.rb
 lib/autoproj/osdeps.rb
 lib/autoproj/system.rb
 lib/autoproj/version.rb
-samples/manifest
+samples/autoproj/init.rb
+samples/autoproj/manifest
+samples/autoproj/overrides.rb
+samples/autoproj/overrides.yml
 samples/manifest.xml
 samples/osdeps.yml
 test/data/test_manifest/autoproj/local/local.autobuild

data/Rakefile

@@ -14,7 +14,7 @@ begin
             self.changes     = paragraphs_of('History.txt', 0..1).join("\n\n")
 
             extra_deps << 
-                ['autobuild',   '>= 1.3.0'] <<
+                ['autobuild',   '>= 1.4.0'] <<
                 ['rmail',   '>= 1.0.0'] <<
                 ['utilrb', '>= 1.3.3'] <<
                 ['nokogiri', '>= 1.3.3'] <<

data/bin/autoproj

@@ -31,6 +31,8 @@ parser = OptionParser.new do |opts|
 autoproj mode [options]
 where 'mode' is one of:
   build:  import, build and install all selected packages
+  force-build: triggers all build commands, i.e. don't be lazy like in "build"
+  rebuild: remove all build products, thus triggering a full rebuild
   doc:    generate and install documentation for packages that have some
   update: only import/update packages, do not build them
   status: displays the state of the packages w.r.t. their source VCS
@@ -184,15 +186,25 @@ def do_bootstrap(*args)
     end
     Autobuild.logdir = File.join('build', 'log')
 
-    if args.empty? # no argument, simply add a manifest template
+    if args.size > 2
+        raise ConfigError, "usage: autoproj bootstrap [manifest_url | vcs_type vcs_url]"
+    end
+
+    # Check if we are being called from another GEM_HOME. If it is the case,
+    # assume that we are bootstrapping from another installation directory and
+    # start by copying the .gems directory
+    if ENV['GEM_HOME'] && ENV['GEM_HOME'] != File.join(Dir.pwd, ".gems")
+        FileUtils.cp_r ENV['GEM_HOME'], ".gems"
+    end
+
+    # If we are not getting the installation setup from a VCS, copy the template
+    # files
+    if args.empty? || args.size == 1
         sample_dir = File.expand_path(File.join("..", "samples"), File.dirname(__FILE__))
-        manifest_data = File.read(File.join(sample_dir, "manifest"))
-        FileUtils.mkdir_p "autoproj"
-        File.open(File.join(Autoproj.config_dir, "manifest"), "w") do |io|
-            io.write(manifest_data)
-        end
+        FileUtils.cp_r File.join(sample_dir, "autoproj"), "autoproj"
+    end
 
-    elsif args.size == 1 # must be a manifest file
+    if args.size == 1 # the user asks us to download a manifest
         manifest_url = args.first
         STDERR.puts color("autoproj: downloading manifest file #{manifest_url}", :bold)
         manifest_data =
@@ -201,12 +213,11 @@ def do_bootstrap(*args)
                 raise ConfigError, "cannot read #{manifest_url}, did you mean 'autoproj bootstrap VCSTYPE #{manifest_url}' ?"
             end
 
-        FileUtils.mkdir_p "autoproj"
         File.open(File.join(Autoproj.config_dir, "manifest"), "w") do |io|
             io.write(manifest_data)
         end
 
-    else # is a VCS definition for the manifest itself ...
+    elsif args.size == 2 # is a VCS definition for the manifest itself ...
         vcs_def = Hash.new
         vcs_def[:type] = args.shift
         vcs_def[:url]  = args.shift
@@ -234,6 +245,27 @@ manifest_source:
             EOTEXT
         end
     end
+
+    # Finally, generate an env.sh script
+    File.open('env.sh', 'w') do |io|
+        io.write <<-EOSHELL
+export RUBYOPT=-rubygems
+export GEM_HOME=#{Dir.pwd}/.gems
+export PATH=$GEM_HOME/bin:$PATH
+        EOSHELL
+    end
+
+    STDERR.puts <<EOTEXT
+
+add the following line at the bottom of your .bashrc:
+  source #{Dir.pwd}/env.sh
+
+WARNING: autoproj will not work until your restart all
+your consoles, or run the following in them:
+  $ source #{Dir.pwd}/env.sh
+
+EOTEXT
+
 end
 
 # Find the autoproj root dir
@@ -254,6 +286,10 @@ begin
         only_update_sources = true
 
     when "build"
+    when "force-build"
+        Autobuild.do_forced_build = true
+    when "rebuild"
+        Autobuild.do_rebuild = true
     when "update"
         Autobuild.do_build  = false
     when "status"
@@ -286,9 +322,9 @@ begin
             raise ConfigError, "RubyGems is already loaded with a different GEM_HOME, make sure you are loading the right env.sh script !"
         end
     end
-    # Set the initial environment
-    Autoproj.set_initial_env
     # Set up some important autobuild parameters
+    Autoproj.env_inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB'
+    Autoproj.env_set 'GEM_HOME', Autoproj.gem_home
     Autobuild.prefix  = Autoproj.build_dir
     Autobuild.srcdir  = root_dir
     Autobuild.logdir = File.join(Autobuild.prefix, 'log')
@@ -344,14 +380,7 @@ begin
     # Load init.rb files. each_source must not load the source.yml file, as
     # init.rb may define configuration options that are used there
     manifest.each_source(false) do |source|
-        init_rb = File.join(source.local_dir, "init.rb")
-        if File.exists?(init_rb)
-            begin
-                load init_rb
-            rescue Exception => e
-                Autoproj.filter_load_exception(e, source, init_rb)
-            end
-        end
+        Autoproj.load_if_present(source, source.local_dir, "init.rb")
     end
 
     # Load the required autobuild definitions
@@ -363,6 +392,13 @@ begin
         Autoproj.import_autobuild_file source, name
     end
 
+    # Load the package's override files. each_source must not load the
+    # source.yml file, as init.rb may define configuration options that are used
+    # there
+    manifest.each_source(false).to_a.reverse.each do |source|
+        Autoproj.load_if_present(source, source.local_dir, "overrides.rb")
+    end
+
     # The user is asked for configuration values both during the manifest
     # loading and the loading of autobuild files. Save it now.
     Autoproj.save_config
@@ -519,12 +555,6 @@ begin
                     manifest.install_os_dependencies(all_enabled_packages)
                 end
 
-                # Call the prepare target now, after we did the import *and* loaded
-                # the manifests
-                prepare_targets = all_enabled_packages.map { |pkg| "#{pkg}-prepare" }
-                task "autoproj-#{name}-prepare" => prepare_targets
-                Rake::Task["autoproj-#{name}-prepare"].invoke
-
                 # And now build
                 if Autobuild.only_doc
                     STDERR.puts color("  building and installing documentation", :bold)
@@ -532,7 +562,7 @@ begin
                     STDERR.puts color("  building and installing packages", :bold)
                 end
 
-                Autobuild.apply(enabled_packages, "autoproj-#{name}")
+                Autobuild.apply(all_enabled_packages, "autoproj-#{name}")
                 Autobuild::Reporting.success
             end
         end

data/doc/guide/src/customization.page

@@ -0,0 +1,168 @@
+---
+title: Customizing the installation
+sort_info: 75
+---
+
+Changing the installation's layout
+----------------------------------
+
+The <tt>layout</tt> section of <tt>autoproj/manifest</tt> offers two things:
+ * select which packages/package sets to build and
+ * build packages in specific subdirectories
+
+This section lists packages or package sets that ought to be built by autoproj.
+For instance, in the following example, only the <tt>orocos/rtt</tt> and
+<tt>orocos/ocl</tt>
+packages of the rubim.orocos source will be built. The other will be excluded
+from the build.
+
+{coderay:: yaml}
+package_sets:
+  - type: git
+    url: git://github.com/doudou/rubim.orocos.git
+
+layout:
+  - orocos/rtt
+  - orocos/ocl
+{coderay}
+
+Instead of giving a package name, the name of a package set can be provided,
+which translates into "all the packages of that set".
+
+As we mentionned before, the layout mechanism also allows you to place packages
+in subdirectories of the main installation. For instance, the following snippet
+will build the <tt>typelib</tt>, <tt>utilmm</tt> and <tt>utilrb</tt> libraries of rubim.orocos into
+the <tt>lib/</tt> subdirectory and all the <tt>orocos/</tt> packages in the root.
+
+{coderay:: yaml}
+layout:
+  - lib:
+    - typelib
+    - utilmm
+    - utilrb
+  - orocos/
+{coderay}
+
+Finally, names of sublayouts can be used as arguments in the autoproj command
+line, instead of package names:
+
+autoproj build lib
+{.commandline}
+
+Removing packages from the build
+--------------------------------
+Instead of having to list all packages that you do want to build, it is possible
+to list the packages that you don't want to build. Simply list them in the
+<tt>exclude\_packages</tt> section of the manifest file. In the following example, all
+of the rubim.orocos package set will be built *but* the pocosim-log package.
+
+{coderay:: yaml}
+layout:
+  - rubim.orocos
+
+exclude_packages:
+  - pocosim-log
+{coderay}
+
+Using packages that are already installed
+-----------------------------------------
+
+If some packages are already installed elsewhere, and you want to use that
+version instead of the one listed in the package sets, list them in the
+<tt>ignore\_packages</tt> section of the manifest. In the following example, the
+<tt>orocos/rtt</tt> package will *not* be built by autoproj.
+
+{coderay:: yaml}
+layout:
+  - rubim.orocos
+
+exclude_packages:
+  - pocosim-log
+
+ignore_packages:
+  - orocos/rtt
+{coderay}
+
+This differs from the <tt>exclude\_packages</tt> mechanism: packages listed in
+<tt>ignore\_packages</tt> are assumed to be present even though autoproj does not manage
+them, while packages in <tt>exclude\_packages</tt> are assumed to be absent and therefore
+issue an error if another package in the installation depend on them.
+
+Local overrides of version control information
+----------------------------------------------
+
+The <tt>autoproj/overrides.yml</tt> allows you to override version control information
+for specific packages. It has the same format than the source.yml file of
+package sets, so [check that page out](source_yml.html) for more information.
+
+This file can in particular be used to avoid further updates to a given software
+package. Simply do:
+
+{coderay:: yaml}
+version_control:
+  - orocos/rtt:
+    type: none
+{coderay}
+
+Building local packages
+-----------------------
+
+You can list local packages that are not in an imported package set by placing
+the definitions in autoproj/, in a file ending with <tt>.autobuild</tt>. See [this
+page](source_yml.html) for information on how to write autobuild files.
+
+Setting up the path to specific commands (make, parallel_builds)
+----------------------------------------------------------------
+
+The autobuild API allows to specify what specific installed command to use for
+each tool needed during the build. These commands can be used in
+<tt>autoproj/init.rb</tt> to tune the build system. Example:
+
+{coderay:: ruby}
+Autobuild.commands['make'] = '/path/to/ccmake'
+Autobuild.parallel_build_level = 10 # build with -j10
+{coderay}
+
+More complex customization
+--------------------------
+
+More complex customization can be achieved by accessing the Autoproj and
+Autobuild API directly in the <tt>autoproj/init.rb</tt> and
+<tt>autoproj/overrides.rb</tt>
+files. The former is loaded before all source files and the latter is loaded
+after all source files.
+
+Building packages selectively on the command line
+-------------------------------------------------
+
+The autoproj command line accepts subdirectories defined in the layout as well
+as package names.
+
+For instance, with the following layout:
+
+{coderay:: yaml}
+layout:
+  - typelib
+  - asguard:
+    - modules/base
+    - modules/logger
+{coderay}
+
+If the command line is
+
+autoproj build modules/logger
+{.cmdline}
+
+then only modules/logger and modules/base will be built -- assuming
+modules/logger depends on modules/base -- but typelib will be left alone
+_regardless of its state_. It may speed up the build process tremendously, but
+also may generate errors if other packages needed to be updated.
+
+Idem, if the command line is:
+
+autoproj build asguard
+{.cmdline}
+
+then all packages or asguard/ are built _but none of the dependencies that are
+defined in other places in the layout_.
+

data/doc/guide/src/structure.page

@@ -12,12 +12,14 @@ Structure
 A autoproj installation is characterized by a autoproj/ directory in which all
 autoproj-related configuration is saved. The contained files are as follows:
 
- * autoproj/manifest: list of available package sets, layout of the
-   installation. See "Management" below.
+ * autoproj/manifest: list of available package sets, customization options.
+   The first part is covered here, the second in the next page.
  * .remotes/\*: package sets that are imported from a remote version
    control system
  * autoproj/\*/: local sets, i.e. sets that have not been imported from a remote
    version control system.
+ * autoproj\/init.rb, autoproj\/overrides.rb and autoproj\/overrides.yml:
+   installation customization
 
 The build is done in two steps:
 
@@ -30,38 +32,23 @@ Moreover, the <tt>build/log</tt> directory contains the output of all commands
 that have been run during the build. Finally, a <tt>env.sh</tt> script is
 generated to set up your shell for the use of the installed software.
 
-Toplevel manifest
------------------
-The <tt>autoproj/manifest</tt> file is a yaml file which describes the package
-sets that are available, and how packages are organized in the installation. It
-looks like this:
+Listing and adding package sets
+-------------------------------
+Package sets are listed in the <tt>package\_sets</tt> section of
+<tt>autoproj/manifest</tt> file. This section looks like this:
 
 {coderay:: yaml}
-layout:
-  - autoproj.orocos
-  - asguard:
-    - dfki.imoby
-    
 package_sets:
   - imoby
   - type: git
     url:  git://github.com/doudou/autoproj-orocos.git
 {coderay}
 
-The first section, the <tt>layout</tt> section, lists the packages or package
-sets we want to have in this installation.  It is a layout, meaning that some packages
-can be built and installed in a subdirectory of the main installation
-(see "Layouts and dependencies" below). Packages are referred to by the name they
-have in the autobuild file (see [this page for more details](source_yml.hml)).
-Package sets are referred to by the name given in the [set's <tt>source.yml</tt>
-file](source_yml.html), and are interpreted as "build all packages of the given
-set".
-
-The second section, the <tt>package_sets</tt> section, lists both local and remote
-sets that are available to this installation. Local sets are
-subdirectories of the <tt>autoproj/</tt> directory: for instance, in the above
-example, autoproj will look at the <tt>autoproj/imoby/</tt> directory. Remote
-sets are taken from remote version control systems. Its general format is:
+It lists both local and remote sets that are available for this installation.
+Local sets are subdirectories of the <tt>autoproj/</tt> directory: for instance,
+in the above example, autoproj will look at the <tt>autoproj/imoby/</tt>
+directory. Remote sets are taken from remote version control systems. Its
+general format is:
 
 {coderay:: yaml}
   - type: version_control_type # git, svn, cvs, darcs
@@ -76,6 +63,9 @@ For the git importer, one of 'branch' or 'tag' options can be provided as well:
     tag: tag_to_stick_to # it is branch OR tag
 {coderay}
 
+Imported package sets are saved in the <tt>.remotes</tt> directory of the
+autoproj installation.
+
 Management
 ----------
 
@@ -105,6 +95,18 @@ If, on the other hand, you only want to update the source code, do
 autoproj update
 {.commandline}
 
+Finally, if you want to make sure that your build is fresh, then do
+
+autoproj rebuild
+{.commandline}
+
+A less intrusive version of it only forces all tools to reconsider building. It
+is mainly useful for CMake when the build environment changed -- cmake caches a
+lot of values. To trigger this, do
+
+autoproj force-build
+{.commandline}
+
 To add a new set, one edits the <tt>autoproj/manifest</tt> file and adds it
 there. Then, simply starting the build will update everything and rebuild what
 is needed.
@@ -114,40 +116,10 @@ Documentation is generated only when asked explicitely:
 autoproj doc
 {.commandline}
 
-Building packages selectively on the command line
--------------------------------------------------
-
-All the build-related commands given above (i.e. build, doc, and update) can be
-given a package name or a name used as a subdirectory in the layout section of
-the manifest.
-
-In the first case, only the package and the dependencies _that are on the same
-level on the installation layout_ are built. It means that with the following
-layout:
+All these commands (i.e. build, doc, and update) accept a package name as
+argument, thus triggering build only for this package and its dependencies. For
+instance:
 
-{coderay:: yaml}
-layout:
-  - typelib
-  - asguard:
-    - modules/base
-    - modules/logger
-{coderay}
-
-If the command line is
-
-autoproj build modules/logger
-{.cmdline}
-
-then only modules/logger and modules/base will be built -- assuming
-modules/logger depends on modules/base -- but typelib will be left alone
-_regardless of its state_. It may speed up the build process tremendously, but
-also may generate errors if other packages needed to be updated.
-
-Idem, if the command line is:
-
-autoproj build asguard
-{.cmdline}
-
-then all packages or asguard/ are built _but none of the dependencies that are
-defined in other places in the layout_.
+autoproj build orocos/rtt
+{.commandline}
 

data/lib/autoproj/autobuild.rb

@@ -61,7 +61,7 @@ module Autoproj
 
         @file_stack.push([source, File.basename(path)])
         begin
-            load path
+            Kernel.load path
         rescue Exception => e
             filter_load_exception(e, source, path)
         end
@@ -86,10 +86,16 @@ def package_common(package_type, spec)
 
     begin
         Rake::Task[package_name]
-        Autoproj.warn "#{package_name} in #{Autoproj.current_file[0]} has been overriden in #{Autoproj.definition_source(package_name)}"
+        Autoproj.warn "#{package_name} from #{Autoproj.current_file[0]} is overriden by the definition in #{Autoproj.definition_source(package_name)}"
+        return
     rescue
     end
 
+    # Check if this package is ignored
+    if Autoproj.manifest.ignored?(package_name)
+        return Autoproj.define(:dummy, spec)
+    end
+
     Autoproj.define(package_type, spec) do |pkg|
         pkg.srcdir   = pkg.name
         yield(pkg) if block_given?
@@ -129,6 +135,22 @@ def autotools_package(options, &block)
 end
 
 def ruby_common(pkg)
+    def pkg.prepare_for_forced_build
+        super
+        extdir = File.join(srcdir, 'ext')
+        if File.directory?(extdir)
+            FileUtils.rm_rf File.join(extdir, "build", "CMakeCache.txt")
+            FileUtils.rm_rf File.join(extdir, "Makefile")
+        end
+    end
+    def pkg.prepare_for_rebuild
+        super
+        extdir = File.join(srcdir, 'ext')
+        if File.directory?(extdir)
+            FileUtils.rm_rf File.join(extdir, "build")
+        end
+    end
+
     def pkg.prepare
         super
         Autobuild.update_environment srcdir

data/lib/autoproj/manifest.rb

@@ -28,18 +28,19 @@ module Autoproj
         # Perform constant expansion on the defined environment variables,
         # including the option set
         options = Autoproj.option_set
-        if Autoproj.manifest
-            loop do
-                new_value = Autoproj.manifest.single_expansion(value, options)
-                if new_value == value
-                    break
-                else
-                    value = new_value
-                end
+        options.each_key do |k|
+            options[k] = options[k].to_s
+        end
+
+        loop do
+            new_value = Autoproj.single_expansion(value, options)
+            if new_value == value
+                break
+            else
+                value = new_value
             end
-        else
-            value
         end
+        value
     end
 
     @env_inherit = Set.new
@@ -75,7 +76,7 @@ module Autoproj
 
         def initialize(type, url, options)
             @type, @url, @options = type, url, options
-            if type != "local" && !Autobuild.respond_to?(type)
+            if type != "none" && type != "local" && !Autobuild.respond_to?(type)
                 raise ConfigError, "version control #{type} is unknown to autoproj"
             end
         end
@@ -85,6 +86,8 @@ module Autoproj
         end
 
         def create_autobuild_importer
+            return if type == "none"
+
             url = Autoproj.single_expansion(self.url, 'HOME' => ENV['HOME'])
             if url && url !~ /^(\w+:\/)?\/|^\w+\@/
                 url = File.expand_path(url, Autoproj.root_dir)
@@ -202,7 +205,7 @@ module Autoproj
                 raise ConfigError, "error in #{source_file}: #{e.message}"
             end
 
-            if !source_definition
+            if !source_definition || !source_definition['name']
                 raise ConfigError, "#{source_file} does not have a 'name' field"
             end
 
@@ -212,6 +215,10 @@ module Autoproj
         def load_name
             definition = raw_description_file
             @name = definition['name']
+            if @name == "local"
+                raise ConfigError, "source #{self} is named 'local', but this is a reserved name"
+            end
+
         rescue InternalError
         end
 
@@ -336,6 +343,33 @@ module Autoproj
         end
     end
 
+    class LocalSource < Source
+        def initialize
+            super(Autoproj.normalize_vcs_definition(:type => 'local', :url => Autoproj.config_dir))
+        end
+
+        def name
+            'local'
+        end
+        def load_name
+        end
+
+        def raw_description_file
+            path = File.join(Autoproj.config_dir, "overrides.yml")
+            if File.file?(path)
+                begin
+                    data = YAML.load(File.read(path)) || Hash.new
+                rescue ArgumentError => e
+                    raise ConfigError, "error in #{source_file}: #{e.message}"
+                end
+                data['name'] = 'local'
+                data
+            else
+                { 'name' => 'local' }
+            end
+        end
+    end
+
     class Manifest
         FakePackage = Struct.new :name, :srcdir
 	def self.load(file)
@@ -372,6 +406,30 @@ module Autoproj
             end
 	end
 
+        # True if the given package should not be built, with the packages that
+        # depend on him have this dependency met.
+        #
+        # This is useful if the packages are already installed on this system.
+        def ignored?(package_name)
+            if data['ignored_packages']
+                data['ignored_packages'].any? { |l| Regexp.new(l) =~ package_name }
+            else
+                false
+            end
+        end
+        # True if the given package should not be built and its dependencies
+        # should be considered as met.
+        #
+        # This is useful to avoid building packages that are of no use for the
+        # user.
+        def excluded?(package_name)
+            if data['excluded_packages']
+                data['excluded_packages'].any? { |l| Regexp.new(l) =~ package_name }
+            else
+                false
+            end
+        end
+
         # Lists the autobuild files that are in the package sets we know of
 	def each_autobuild_file(source_name = nil, &block)
             if !block_given?
@@ -427,6 +485,28 @@ module Autoproj
             end
         end
 
+        def source_from_spec(spec, load_description) # :nodoc:
+            # Look up for short notation (i.e. not an explicit hash). It is
+            # either vcs_type:url or just url. In the latter case, we expect
+            # 'url' to be a path to a local directory
+            vcs_def = begin
+                          Autoproj.normalize_vcs_definition(spec)
+                      rescue ConfigError => e
+                          raise ConfigError, "in #{file}: #{e.message}"
+                      end
+
+            source = Source.new(vcs_def)
+            if source.present? && load_description
+                source.load_description_file
+            else
+                # Try to load just the name from the source.yml file
+                source.load_name
+            end
+
+            source
+        end
+
+
         # call-seq:
         #   each_source { |source_description| ... }
         #
@@ -439,25 +519,17 @@ module Autoproj
 
             return if !data['package_sets']
 
-	    data['package_sets'].each do |spec|
-                # Look up for short notation (i.e. not an explicit hash). It is
-                # either vcs_type:url or just url. In the latter case, we expect
-                # 'url' to be a path to a local directory
-                vcs_def = begin
-                              Autoproj.normalize_vcs_definition(spec)
-                          rescue ConfigError => e
-                              raise ConfigError, "in #{file}: #{e.message}"
-                          end
-
-                source = Source.new(vcs_def)
-                if source.present? && load_description
-                    source.load_description_file
-                else
-                    # Try to load just the name from the source.yml file
-                    source.load_name
-                end
+            # Load the local source first ...
+            local = LocalSource.new
+            if load_description
+                local.load_description_file
+            else
+                local.load_name
+            end
+            yield(local)
 
-                yield(source)
+	    data['package_sets'].each do |spec|
+                yield(source_from_spec(spec, load_description))
             end
         end
 
@@ -483,6 +555,7 @@ module Autoproj
 
         def self.update_remote_source(source)
             importer     = source.vcs.create_autobuild_importer
+            return if !importer # updates  have been disabled 
             fake_package = FakePackage.new(source.automatic_name, source.local_dir)
 
             importer.import(fake_package)
@@ -493,6 +566,7 @@ module Autoproj
         attr_reader :vcs
         def self.import_whole_installation(vcs, into)
             importer     = vcs.create_autobuild_importer
+            return if !importer # updates  have been disabled 
             fake_package = FakePackage.new('autoproj main configuration', into)
             importer.import(fake_package)
         rescue Autobuild::ConfigException => e
@@ -597,7 +671,7 @@ module Autoproj
         # and sublayout in order
         def each_package_set(selection, layout_name = '/', layout_def = data['layout'], &block)
             if !layout_def
-                yield('', default_packages, default_packages)
+                yield('/', default_packages, default_packages)
                 return nil
             end
 
@@ -605,6 +679,9 @@ module Autoproj
 
             # First of all, do the packages at this level
             packages = layout_packages(layout_def, false)
+            # Remove excluded packages
+            packages.delete_if { |pkg_name| excluded?(pkg_name) }
+
             if selection && !selection.any? { |sel| layout_name =~ /^\/?#{Regexp.new(sel)}\/?/ }
                 selected_packages = packages.find_all { |pkg_name| selection.include?(pkg_name) }
             else
@@ -629,6 +706,7 @@ module Autoproj
                             package.name
                         end
                     end
+            names = names.delete_if { |pkg_name| excluded?(pkg_name) }
             names.to_set
         end
 

data/lib/autoproj/system.rb

@@ -50,7 +50,6 @@ module Autoproj
         Autoproj.env_set_path 'PATH', "#{Autoproj.gem_home}/bin", "/usr/local/bin", "/usr/bin", "/bin"
         Autoproj.env_set 'PKG_CONFIG_PATH'
         Autoproj.env_set 'RUBYLIB'
-        Autoproj.env_inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB'
     end
 
     def self.export_env_sh(subdir)
@@ -68,5 +67,19 @@ module Autoproj
             end
         end
     end
+
+    def self.load(source, *path)
+        path = File.join(*path)
+        Kernel.load path
+    rescue Exception => e
+        Autoproj.filter_load_exception(e, source, path)
+    end
+
+    def self.load_if_present(source, *path)
+        path = File.join(*path)
+        if File.file?(path)
+            self.load(source, *path)
+        end
+    end
 end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.1.3"
+    VERSION = "1.2.0"
 end

data/samples/autoproj/init.rb

@@ -0,0 +1,23 @@
+# Write in this file customization code that will get executed before all the
+# soures are loaded.
+
+# Set the path to 'make'
+# Autobuild.commands['make'] = '/path/to/ccmake'
+
+# Set the parallel build level (defaults to the number of CPUs)
+# Autobuild.parallel_build_level = 10
+
+# Uncomment to initialize the environment variables to default values. This is
+# useful to ensure that the build is completely self-contained, but leads to
+# miss external dependencies installed in non-standard locations.
+#
+# set_initial_env
+#
+# Additionally, you can set up your own custom environment with calls to env_add
+# and env_set:
+#
+# env_add 'PATH', "/path/to/my/tool"
+# env_set 'VAR', "value"
+#
+# Variables set like this are exported in the generated env.sh scripts.
+

data/samples/autoproj/manifest

@@ -0,0 +1,52 @@
+# List of VCS information or subdirectories of autoproj/ in which to find
+# package set definitions.
+package_sets:
+# Example from the RubyInMotion orocos package set
+#   - type: git
+#     url: git://github.com/doudou/rubim.orocos.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
+# the packages of the rubim.orocos package set will be built, in the tools/
+# subdirectory: source in tools/typelib, tools/orocos/rtt, ... and installed
+# files in build/tools/typelib, build/tools/orocos/rtt, ...
+#
+# layout:
+#   - tools:
+#     - rubim.orocos
+#
+# 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
+# do:
+#
+# layout:
+#   - tools:
+#     - typelib
+#     - utilmm
+#     - orocos/
+#
+# The first two match the typelib and utilmm packages, while the second one
+# match all packages in which "orocos/" is found.
+#
+# Again, note that if a layout section is present, only the packages listed
+# there will be built.
+
+# Package exclusion: packages can be completely excluded from the build. This is
+# an alternative way than using the layout, mainly useful if you want to enable
+# all packages but a few ones. As with layout, the names are actually regular
+# expressions.
+#
+# exclude_packages:
+#   - orocos/
+
+# Ignoring packages: same principle than package exclusion, but this time the
+# packages are considered to be installed and up-to-date. This is useful if you
+# want to use an already installed software package.
+#
+# For instance, let's assume the orocos/rtt is already installed on your
+# machine. You would then simply do:
+#
+# ignored_packages:
+#   - orocos/rtt
+#
+

data/samples/autoproj/overrides.rb

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

data/samples/autoproj/overrides.yml

@@ -0,0 +1,8 @@
+# This file has the same format than the source.yml files. It can be used to
+# locally override version control information.
+#
+# version_control:
+#   - orocos/rtt:
+#       type: git
+#       url: git://my.own.git.server
+#

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 +02:00
+date: 2009-10-25 01:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rmail
@@ -139,6 +139,7 @@ files:
 - doc/guide/ext/rdoc_links.rb
 - doc/guide/src/autobuild.page
 - doc/guide/src/autoproj_bootstrap
+- doc/guide/src/customization.page
 - doc/guide/src/default.css
 - doc/guide/src/default.template
 - doc/guide/src/htmldoc.metainfo
@@ -158,7 +159,10 @@ files:
 - lib/autoproj/osdeps.rb
 - lib/autoproj/system.rb
 - lib/autoproj/version.rb
-- samples/manifest
+- samples/autoproj/init.rb
+- samples/autoproj/manifest
+- samples/autoproj/overrides.rb
+- samples/autoproj/overrides.yml
 - samples/manifest.xml
 - samples/osdeps.yml
 - test/data/test_manifest/autoproj/local/local.autobuild

data/samples/manifest

@@ -1,18 +0,0 @@
-package_sets:
-# Example from the RubyInMotion orocos package set
-#   - type: git
-#     url: git://github.com/doudou/rubim.orocos.git
-
-# If you want to adapt the layout to your needs, uncomment the following (again,
-# RubyInMotion orocos package set)
-# layout:
-#   - orocos:
-#     - rubim.orocos
-#
-# The principle is to have a hierarchy of names, package names and names of
-# package sets. In the above example, all packages of the rubim.orocos package
-# set will be built under the orocos/ subdirectory. Alternatively, you could do:
-#
-# layout:
-#   - tools:
-#     - rubim.orocos