autoproj 1.2.2 → 1.2.4

data/History.txt

@@ -1,3 +1,18 @@
+= Version 1.2.4
+ * manage LD_LIBRARY_PATH
+ * only include the values relevant to our packages in the generated env.sh,
+   instead of overcrowding them with inherited values.
+
+= Version 1.2.3
+ * fix the definition of the subversion package under ubuntu/debian
+ * improve selection of packages on the command line. Most glitches
+   that appears when using that feature are gone now.
+ * allow to give options to the VCS during boostrap, and to switch
+   the source of the configuration. I.e.
+     autoproj switch-config git URL branch=newbranch
+   will exchange/update the configuration in autoproj/ with the specified one.
+ * bugfixes
+
 = Version 1.2.2
  * added support for Gentoo
  * added support for Ubuntu 9.10 [Karmic Koala]

data/Manifest.txt

@@ -13,6 +13,7 @@ doc/guide/src/customization.page
 doc/guide/src/default.css
 doc/guide/src/default.template
 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

data/Rakefile

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

data/bin/autoproj

@@ -35,18 +35,28 @@ parser = OptionParser.new do |opts|
     opts.banner = <<-EOBANNER
 autoproj mode [options]
 where 'mode' is one of:
-  build:  import, build and install all selected packages
+  build:  import, build and install all packages that need it. A package or package
+    set name can be given, in which case only this package and its dependencies
+    will be taken into account. Example:
+
+    autoproj build drivers/hokuyo
+      
   force-build: triggers all build commands, i.e. don't be lazy like in "build"
-  fast-build: builds without updating and installing OS dependencies
-  rebuild: remove all build products, thus triggering a full rebuild
+  fast-build: builds without updating and without considering OS dependencies
+  rebuild: clean and then 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
   bootstrap: starts a new autoproj installation. Usage:
     autoproj bootstrap [manifest_url|source_vcs source_url opt1=value1 opt2=value2 ...]
   
-  list-sets:   list all available sources
-  update-sets: update all remote sources, but do not build
+  list-sets:   list all available package sets
+  update-sets: update the package sets definitions
+  switch-config: change where the configuration should be taken from. Syntax:
+    autoproj switch-config source_vcs source_url opt1=value1 opt2=value2 ...
+
+    For example:
+    autoproj switch-config git git://github.com/doudou/rubim-all.git branch=all
 
 Additional options:
     EOBANNER
@@ -185,6 +195,68 @@ def do_status(packages)
     end
 end
 
+def switch_config(*args)
+    Autoproj.load_config
+    if Autoproj.has_config_key?('manifest_source')
+        vcs = Autoproj.normalize_vcs_definition(Autoproj.user_config('manifest_source'))
+    end
+
+    if vcs && (vcs.type == args[0] && vcs.url == args[1])
+        # Don't need to do much: simply change the options and save the config
+        # file, the VCS handler will take care of switching the options
+    else
+        # We will have to delete the current autoproj directory. Ask the user.
+        opt = Autoproj::BuildOption.new("delete current config", "boolean", Hash[:default => "false", :doc => "delete the current configuration ? (required to switch)"], nil)
+        return if !opt.ask(nil)
+        FileUtils.rm_rf File.join(Autoproj.config_dir)
+        do_switch_config(*args)
+    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' => args.shift, 'url' => args.shift]
+    args.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 do_switch_config(*args)
+    vcs_def = Hash.new
+    vcs_def[:type] = args.shift
+    vcs_def[:url]  = args.shift
+    while !args.empty?
+        name, value = args.shift.split("=")
+        vcs_def[name] = value
+    end
+
+    vcs = Autoproj.normalize_vcs_definition(vcs_def)
+
+    # Install the OS dependencies required for this VCS
+    Autobuild::Reporting.report do
+        osdeps = Autoproj::OSDependencies.load_default
+        osdeps.install([vcs.type])
+        Autoproj::Manifest.import_whole_installation(vcs, File.join(Dir.pwd, "autoproj"))
+    end
+
+    # 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
+    end
+end
 
 def do_bootstrap(*args)
     if File.exists?(File.join("autoproj", "manifest"))
@@ -192,10 +264,6 @@ def do_bootstrap(*args)
     end
     Autobuild.logdir = File.join('build', 'log')
 
-    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
@@ -226,33 +294,8 @@ def do_bootstrap(*args)
             io.write(manifest_data)
         end
 
-    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
-        while !args.empty?
-            name, value = args.shift.split("=")
-            vcs_def[name] = value
-        end
-
-        vcs = Autoproj.normalize_vcs_definition(vcs_def)
-
-        # Install the OS dependencies required for this VCS
-        Autobuild::Reporting.report do
-            osdeps = Autoproj::OSDependencies.load_default
-            osdeps.install([vcs.type])
-            Autoproj::Manifest.import_whole_installation(vcs, File.join(Dir.pwd, "autoproj"))
-        end
-
-        # 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
-        end
+    elsif args.size > 2 # is a VCS definition for the manifest itself ...
+        do_switch_config(*args)
     end
 
     # Finally, generate an env.sh script
@@ -313,7 +356,12 @@ begin
     when "list-sets"
         only_update_sources = true
         Autobuild.do_update = false
-        
+    when "switch-config"
+        if switch_config(*args)
+            exit 0
+        else
+            exit 1
+        end
     when "doc"
         Autobuild.do_update = false
         Autobuild.do_doc    = true
@@ -323,7 +371,16 @@ begin
         exit(1)
     end
 
+    # Expand directories in the selected_packages set
     root_dir = Autoproj.root_dir
+    selected_packages.map! do |name|
+        if File.directory?(name)
+            File.expand_path(name).gsub(/^#{Regexp.quote(root_dir)}/, '')
+        else
+            name
+        end
+    end
+
     Dir.chdir(root_dir)
 
     # Load user configuration
@@ -335,7 +392,7 @@ begin
         end
     end
     # Set up some important autobuild parameters
-    Autoproj.env_inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB'
+    Autoproj.env_inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB', 'LD_LIBRARY_PATH'
     Autoproj.env_set 'GEM_HOME', Autoproj.gem_home
     Autoproj.env_set 'RUBYOPT', "-rubygems"
     Autobuild.prefix  = Autoproj.build_dir
@@ -490,6 +547,10 @@ begin
     # Now starts a different stage of the whole build. Until now, we were
     # working on the whole package set. Starting from now, we need to build the
     # package sets based on the layout file
+    #
+    # First, we allow to user to specify packages based on disk paths, so
+    # resolve those
+    selected_packages = Autoproj.manifest.expand_package_selection(selected_packages)
 
     # This keeps a hash of package_name => layout_name for all packages that
     # have already been handled
@@ -613,6 +674,11 @@ begin
                 STDERR.puts color("WARN: #{name} has not been completely built, #{name}env.sh is not updated", :magenta)
             end
         end
+
+        libdir = File.join(prefix, "lib")
+        if File.directory?(libdir)
+            Autoproj.validate_solib_dependencies(libdir)
+        end
     end
 
     if !all_env_sh.empty?

data/doc/guide/src/autoproj_bootstrap

@@ -306,7 +306,7 @@ git:
     gentoo: dev-util/git
 
 svn:
-    debian,ubuntu: svn
+    debian,ubuntu: subversion
     gentoo: dev-util/subversion
 
 cmake:

data/doc/guide/src/htmldoc.virtual

@@ -0,0 +1,19 @@
+\--- !omap
+- /api/:
+    in_menu: true
+
+- /api/index.html:
+    routed_title: Autoproj API
+    in_menu: false
+    sort_info: 99999
+    url: ../../api/index.html
+
+- /autobuild/:
+    in_menu: true
+
+- /autobuild/index.html:
+    routed_title: Autobuild API
+    in_menu: false
+    sort_info: 99999
+    url: http://doudou.github.com/autobuild/index.html
+

data/doc/guide/src/source_yml.page

@@ -5,9 +5,65 @@ sort_info: 100
 A package set is made of three things:
 
  * the description file (source.yml)
- * an optional initialization script (init.rb)
+ * an optional initialization script (init.rb) and override script
+   (overrides.rb)
  * autobuild scripts (\*.autobuild)
 
+Starting a new package set
+--------------------------
+
+Create a subdirectory in autoproj/ and add a source.yml file that looks like:
+
+{coderay:: yaml}
+name my_package_set_name
+{coderay}
+
+Et voila ! You have a new empty package set
+
+Adding a package
+----------------
+
+Adding a package to a package set involves changing two files:
+
+ * the package set's autobuild file that declares what type of package it is and
+ * the package set's source.yml file that declares where to get it (version
+   control information)
+
+For the first step, you need to add one of the following lines:
+
+{coderay:: ruby}
+cmake_package "my/package" # for CMake package
+autotools_package "my/package" # for autoconf/automake packages
+orogen_package "my/package" # for orogen packages
+{coderay}
+
+The package name will be used to refer to this particular package later on --
+especially for version control definition. If subdirectories are used, like "my"
+in the above example, the package source will be checked out and built in the
+corresponding subdirectory.
+
+Now that the package is declared, we need to add version control information to
+the source.yml file. This needs to be done in the version\_control section of
+the file, as for instance:
+
+{coderay:: yaml}
+version_control:
+  - my/package:
+      type: git
+      url: git://github.com/blabla/my-package.git
+{coderay}
+
+The corresponding subversion definition would be:
+
+{coderay:: yaml}
+version_control:
+  - my/package:
+      type: svn
+      url: svn+ssh://svnhosting.com/blabla/trunk/my/package
+{coderay}
+
+The remaining of this page is a more in-depth description of this process.
+
 Autobuild scripts
 -----------------
 The autobuild scripts lists all the packages defined by this set. It is a

data/lib/autoproj/default.osdeps

@@ -27,7 +27,7 @@ git:
     gentoo: dev-util/git
 
 svn:
-    debian,ubuntu: svn
+    debian,ubuntu: subversion
     gentoo: dev-util/subversion
 
 cmake:

data/lib/autoproj/manifest.rb

@@ -53,7 +53,7 @@ module Autoproj
 
     # Set a new environment variable
     def self.env_set(name, *value)
-        Autobuild.environment[name] = nil
+        Autobuild.env_clear(name)
         env_add(name, *value)
     end
     def self.env_add(name, *value)
@@ -61,7 +61,7 @@ module Autoproj
         Autobuild.env_add(name, *value)
     end
     def self.env_set_path(name, *value)
-        Autobuild.environment[name] = nil
+        Autobuild.env_clear(name)
         env_add_path(name, *value)
     end
     def self.env_add_path(name, *value)
@@ -89,7 +89,7 @@ module Autoproj
             return if type == "none"
 
             url = Autoproj.single_expansion(self.url, 'HOME' => ENV['HOME'])
-            if url && url !~ /^(\w+:\/)?\/|^\w+\@/
+            if url && url !~ /^(\w+:\/)?\/|^\w+\@|^(\w+\@)?[\w\.-]+:/
                 url = File.expand_path(url, Autoproj.root_dir)
             end
             Autobuild.send(type, url, options)
@@ -164,6 +164,12 @@ module Autoproj
         def present?; File.directory?(local_dir) end
         # True if this source is local, i.e. is not under a version control
         def local?; vcs.local? end
+        # True if this source defines nothing
+        def empty?
+            !source_definition['version_control'] &&
+                !each_package.find { true }
+        end
+
         # The directory in which data for this source will be checked out
         def local_dir
             if local?
@@ -307,6 +313,7 @@ module Autoproj
 
             if all_vcs
                 all_vcs.each do |spec|
+                    spec = spec.dup
                     if spec.values.size != 1
                         # Maybe the user wrote the spec like
                         #   - package_name:
@@ -490,7 +497,7 @@ module Autoproj
                 return enum_for(:each_source_file)
             end
 
-            each_source do |source|
+            each_source(false) do |source|
 		Dir.glob(File.join(source.local_dir, "*.osdeps")).each do |file|
 		    yield(source, file)
 		end
@@ -525,8 +532,12 @@ module Autoproj
                       end
 
             source = Source.new(vcs_def)
-            if source.present? && load_description
-                source.load_description_file
+            if load_description
+                if source.present?
+                    source.load_description_file
+                else
+                    raise InternalError, "cannot load description file as it has not been checked out yet"
+                end
             else
                 # Try to load just the name from the source.yml file
                 source.load_name
@@ -541,11 +552,15 @@ module Autoproj
         #
         # Lists all package sets defined in this manifest, by yielding a Source
         # object that describes it.
-        def each_source(load_description = true)
+        def each_source(load_description = true, &block)
             if !block_given?
                 return enum_for(:each_source, load_description)
             end
 
+            if @sources
+                return @sources.each(&block)
+            end
+
             return if !data['package_sets']
 
             # Load the local source first ...
@@ -555,10 +570,24 @@ module Autoproj
             else
                 local.load_name
             end
-            yield(local)
+            if load_description
+                if !local.empty?
+                    yield(local)
+                    if load_description
+                        @sources = [local]
+                    end
+                end
+                @sources ||= []
+            else
+                yield(local)
+            end
 
 	    data['package_sets'].each do |spec|
-                yield(source_from_spec(spec, load_description))
+                source = source_from_spec(spec, load_description)
+                if load_description
+                    @sources << source
+                end
+                yield(source)
             end
         end
 
@@ -687,6 +716,7 @@ module Autoproj
             result
         end
 
+        # Enumerates the sublayouts defined in +layout_def+.
         def each_sublayout(layout_def)
             layout_def.each do |value|
                 if value.kind_of?(Hash)
@@ -700,18 +730,18 @@ 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(layout_name, default_packages, default_packages)
                 return nil
             end
 
-            selection = selection.to_set
+            selection = selection.to_set if selection
 
             # 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)}\/?/ }
+            if selection
                 selected_packages = packages.find_all { |pkg_name| selection.include?(pkg_name) }
             else
                 selected_packages = packages.dup
@@ -802,6 +832,66 @@ module Autoproj
 
             osdeps.install(required_os_packages)
         end
+
+        # Package selection can be done in three ways:
+        #  * as a subdirectory in the layout
+        #  * as a on-disk directory
+        #  * as a package name
+        #
+        # This method converts the first two directories into the third one
+        def expand_package_selection(selected_packages)
+            base_dir = Autoproj.root_dir
+
+            expanded_packages = []
+
+            # Get all the package names
+            package_names = Autobuild::Package.each(true).
+                map do |name, pkg|
+                    pkg.name
+                end
+
+            selected_packages = selected_packages.map do |sel|
+                if sel[0] == ?/ # anchored selection
+                    /^#{sel}/
+                else
+                    Regexp.new(sel)
+                end
+            end
+
+            # First, remove packages that are directly referenced by name or by
+            # package set names
+            selected_packages.delete_if do |sel|
+                packages = package_names.find_all { |pkg_name| pkg_name =~ sel }
+                expanded_packages.concat(packages)
+
+                sources = each_source.find_all { |source| source.name =~ sel }
+                sources.each do |source|
+                    expanded_packages.concat(resolve_package_set(source.name))
+                end
+
+                !packages.empty? && !sources.empty?
+            end
+
+            if selected_packages.empty?
+                return expanded_packages
+            end
+
+            # Now, expand sublayout and directory names 
+            each_package_set(nil) do |layout_name, packages, _|
+                selected_packages.delete_if do |sel|
+                    if layout_name[0..-1] =~ Regexp.new("#{sel}\/?$")
+                        expanded_packages.concat(packages.to_a)
+                    else
+                        packages = packages.find_all do |pkg_name|
+                            (layout_name + pkg_name) =~ sel
+                        end
+                        expanded_packages.concat(packages)
+                        !packages.empty?
+                    end
+                end
+            end
+            expanded_packages.to_set
+        end
     end
 
     # The singleton manifest object on which the current run works

data/lib/autoproj/options.rb

@@ -76,6 +76,10 @@ module Autoproj
         end
     end
 
+    def self.change_option(key, value, user_validated = false)
+        @user_config[key] = [value, user_validated]
+    end
+
     def self.user_config(key)
         value, seen = @user_config[key]
         # All non-user options are always considered as "seen"

data/lib/autoproj/system.rb

@@ -50,6 +50,7 @@ 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_set 'LD_LIBRARY_PATH'
     end
 
     def self.export_env_sh(subdir)
@@ -81,5 +82,17 @@ module Autoproj
             self.load(source, *path)
         end
     end
+
+    def self.validate_solib_dependencies(dir, exclude_paths = [])
+        Find.find(File.expand_path(dir)) do |name|
+            next unless name =~ /\.so$/
+            next if exclude_paths.find { |p| name =~ p }
+
+            output = `ldd -r #{name} 2>&1`
+            if output =~ /undefined symbol/
+                STDERR.puts Autoproj.console.color("WARN: #{name} has undefined symbols", :magenta)
+            end
+        end
+    end
 end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.2.2"
+    VERSION = "1.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 +01:00
+date: 2009-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.4.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: rmail
@@ -143,6 +143,7 @@ files:
 - doc/guide/src/default.css
 - doc/guide/src/default.template
 - 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