autoproj 1.7.8 → 1.7.9

data/History.txt

@@ -1,3 +1,19 @@
+= Version 1.7.9
+ * improve ruby 1.9 compatibility
+ * fix ignoring osdeps dependencies completely, i.e.
+
+    ruby: ignore
+
+   is now working fine (before, one had to provide at least an OS name)
+
+ * on dpkg-based systems (debian, ubuntu), fix detection of installed virtual packages
+ * fix passing autoproj options from aup and amake to autoproj itself (it was
+   broken). One can now *really* do
+
+     amake --no-deps
+
+   as advertised by the 1.7.8 release notes.
+
 = Version 1.7.8
  * fix bootstrap and switch-config with VCS options (i.e. setting a branch on
    the git importer)

data/README.txt

@@ -7,21 +7,21 @@ version control repository (think "distributed version control"). It also
 provides an easy integration of the local operating system (Debian, Ubuntu,
 Fedora, maybe MacOSX at some point).
 
-This tool has been developped in the frame of the RubyInMotion project
-(http://sites.google.com/site/rubyinmotion), to install robotics-related
+This tool has been over the years. It is now maintained in the frame of the Rock
+robotics project (http://rock-robotics.org), to install robotics-related
 software -- that is often bleeding edge. Unlike [the ROS build
 system](http://ros.org), it is not bound to one build system, one VCS and one
 integration framework. The philosophy behind autoproj
 is:
- * supports both CMake and autotools, and can be adapted to other tools
- * supports different VCS: cvs, svn, git, plain tarballs.
- * software packages are plain packages, meaning that they can be built and
-   installed /outside/ an autoproj tree, and are not tied *at all* to the
-   autoproj build system.
- * leverage the actual OS package management system. Right now, only Debian-like
-   systems (like Ubuntu) are supported, simply because it is the only one I have
-   access to.
- * handle code generation properly
+* supports both CMake and autotools, and can be adapted to other tools
+* supports different VCS: cvs, svn, git, plain tarballs.
+* software packages are plain packages, meaning that they can be built and
+  installed /outside/ an autoproj tree, and are not tied *at all* to the
+  autoproj build system.
+* leverage the actual OS package management system. Right now, only Debian-like
+  systems (like Ubuntu) are supported, simply because it is the only one I have
+  access to.
+* handle code generation properly
 
 It tries as much as possible to follow the lead of Willow Garage on the package
 specification. More specifically, the package manifest files are common between
@@ -38,12 +38,12 @@ complete configuration per-project).
 
 Each package definition includes:
 
- * how to get the package's source code
- * how to build the package
- * on what the package depends. This can be either another package built by
-   autoproj, or an operating system package.
+* how to get the package's source code
+* how to build the package
+* on what the package depends. This can be either another package built by
+  autoproj, or an operating system package.
 
-See [this page](writing_manifest.html) for more information.
+See this page[http://rock-robotics.org/writing_manifest.html] for more information.
 
 
 Software packages in Autoproj
@@ -59,6 +59,6 @@ As a guideline, we recommend that inter-package dependencies are managed by
 using pkg-config.
 
 To describe the package, and more importantly to setup cross-package
-dependencies, [an optional manifest file can be
-added](package_sets/manifest-xml.html).
+dependencies, an optional manifest file can be
+added[http://rock-robotics.org/package_sets/manifest-xml.html].
 

data/bin/amake

@@ -1,8 +1,56 @@
 #! /usr/bin/env ruby
 
-if ARGV.grep(/^-/).size == ARGV.size
-    ARGV.push '.'
+require 'optparse'
+
+build_all = false
+force = false
+
+parser = OptionParser.new do |opt|
+    opt.banner = "amake [options] [dir_or_package]
+Runs autoproj build for the given directory or package name.
+Selects the current directory if none is given
+
+Accepts all options from autoproj build plus the following options:
+
+"
+    opt.on('--all', 'runs autoproj build without arguments (does not add the current directory)') do
+        build_all = true
+    end
+    opt.on('--force', 'runs autoproj force-build instead of autoproj build') do
+        force = true
+    end
+    opt.on('--help', 'shows this help message') do
+        puts parser
+        exit(0)
+    end
+end
+
+# Accept options that are invalid in +parser+, to pass them on to autoproj
+# itself
+options = ARGV.dup
+remaining = []
+while !options.empty?
+    begin
+        head = options.shift
+        remaining.concat(parser.parse([head]))
+    rescue OptionParser::InvalidOption
+        remaining << head
+        retry
+    end
+end
+
+# If --all is not given *and* there is no non-option argument (i.e. no directory
+# / package name), add the current directory to the command line
+if remaining.grep(/^-/).size == remaining.size && !build_all
+    remaining.push '.'
+end
+
+if force
+    remaining.unshift "force-build"
+else
+    remaining.unshift "build"
 end
-ARGV.unshift "build"
+ARGV.clear
+ARGV.concat(remaining)
 load File.expand_path('autoproj', File.dirname(__FILE__))
 

data/bin/aup

@@ -1,8 +1,47 @@
 #! /usr/bin/env ruby
+require 'optparse'
 
-if ARGV.grep(/^-/).size == ARGV.size
-    ARGV.push '.'
+build_all = false
+parser = OptionParser.new do |opt|
+    opt.banner = "aup [options] [dir_or_package]
+Runs autoproj update for the given directory or package name.
+Selects the current directory if none is given. Override by
+passing the --all option.
+
+Accepts all options from autoproj update plus the following options:
+
+"
+    opt.on('--all', 'runs autoproj build without arguments (does not add the current directory)') do
+        build_all = true
+    end
+    opt.on('--help', 'shows this help message') do
+        puts parser
+        exit(0)
+    end
+end
+
+# Accept options that are invalid in +parser+, to pass them on to autoproj
+# itself
+options = ARGV.dup
+remaining = []
+while !options.empty?
+    begin
+        head = options.shift
+        remaining.concat(parser.parse([head]))
+    rescue OptionParser::InvalidOption
+        remaining << head
+        retry
+    end
 end
-ARGV.unshift "update"
+
+# If --all is not given *and* there is no non-option argument (i.e. no directory
+# / package name), add the current directory to the command line
+if remaining.grep(/^-/).size == remaining.size && !build_all
+    remaining.push '.'
+end
+remaining.unshift 'update'
+
+ARGV.clear
+ARGV.concat(remaining)
 load File.expand_path('autoproj', File.dirname(__FILE__))
 

data/bin/autoproj

@@ -166,9 +166,15 @@ EOTEXT
     elsif Autoproj::CmdLine.revshow_osdeps?
         all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
         Autoproj::CmdLine.revshow_osdeps(all_enabled_packages)
+        exit(0)
     elsif Autoproj::CmdLine.show_osdeps?
         all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
         Autoproj::CmdLine.show_osdeps(all_enabled_packages)
+        exit(0)
+    elsif Autoproj::CmdLine.list_unused?
+        all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
+        Autoproj::CmdLine.list_unused(all_enabled_packages)
+        exit(0)
     end
 
     STDERR.puts

data/bin/autoproj_bootstrap

@@ -255,7 +255,7 @@ module Autoproj
         #
         # Examples: ['debian', ['sid', 'unstable']] or ['ubuntu', ['lucid lynx', '10.04']]
         def self.operating_system
-            if @operating_system
+            if !@operating_system.nil?
                 return @operating_system
             elsif Autoproj.has_config_key?('operating_system')
                 os = Autoproj.user_config('operating_system')
@@ -268,19 +268,28 @@ module Autoproj
                 end
             end
 
-            Autoproj.progress "  autodetecting the operating system"
-            name, versions = os_from_lsb
-            if name
-                if name != "debian"
-                    if File.exists?("/etc/debian_version")
-                        @operating_system = [[name, "debian"], versions]
-                    else
-                        @operating_system = [[name], versions]
+            if user_os = ENV['AUTOPROJ_OS']
+                if user_os.empty?
+                    @operating_system = false
+                else
+                    names, versions = user_os.split(':')
+                    @operating_system = [names.split(','), versions.split(',')]
+                end
+            else
+                Autoproj.progress "  autodetecting the operating system"
+                name, versions = os_from_lsb
+                if name
+                    if name != "debian"
+                        if File.exists?("/etc/debian_version")
+                            @operating_system = [[name, "debian"], versions]
+                        else
+                            @operating_system = [[name], versions]
+                        end
                     end
                 end
             end
 
-            if !@operating_system
+            if @operating_system.nil?
                 # Need to do some heuristics unfortunately
                 @operating_system =
                     if File.exists?('/etc/debian_version')
@@ -334,12 +343,27 @@ module Autoproj
             if !@dpkg_installed_packages
                 @dpkg_installed_packages = Set.new
                 dpkg_status = File.readlines('/var/lib/dpkg/status')
-                dpkg_status.grep(/^(Package|Status)/).
-                    each_slice(2) do |package, status|
-                        if status.chomp == "Status: install ok installed"
-                            @dpkg_installed_packages << package.split[1].chomp
+
+                current_packages = []
+                is_installed = false
+                dpkg_status.each do |line|
+                    line = line.chomp
+                    if line == ""
+                        if is_installed
+                            current_packages.each do |pkg|
+                                @dpkg_installed_packages << pkg
+                            end
+                            current_packages.clear
+                            is_installed = false
                         end
+                    elsif line =~ /Package: (.*)$/
+                        current_packages << $1
+                    elsif line =~ /Provides: (.*)$/
+                        current_packages << $1
+                    elsif line == "Status: install ok installed"
+                        is_installed = true
                     end
+                end
             end
             
             if package_name =~ /^(\w[a-z0-9+-.]+)/
@@ -410,6 +434,10 @@ fi
                 return NO_PACKAGE
             end
 
+            if dep_def == 'ignore'
+                return IGNORE
+            end
+
             if !os_names
                 return UNKNOWN_OS
             end
@@ -699,6 +727,8 @@ Finally, OS dependencies can be installed by calling "autoproj osdeps"
 with the corresponding option (--all, --ruby, --os or --none). Calling
 "autoproj osdeps" without arguments will also give you information as
 to what you should install to compile the software successfully.
+
+So, what do you want ? (ruby or none)
             EOT
             message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically (ruby, none) ?", long_doc.strip ]
 
@@ -736,6 +766,8 @@ an autoproj operation with the --reconfigure option (e.g. autoproj update
 
 Finally, OS dependencies can be installed by calling "autoproj osdeps"
 with the corresponding option (--all, --ruby, --os or --none).
+
+So, what do you want ? (all, ruby, os or none)
             EOT
             message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically (all, ruby, os, none) ?", long_doc.strip ]
 
@@ -825,7 +857,7 @@ with the corresponding option (--all, --ruby, --os or --none).
         def osdeps_interaction_unknown_os(osdeps)
             puts <<-EOMSG
   #{Autoproj.color("The build process requires some other software packages to be installed on our operating system", :bold)}
-  #{Autoproj.color("If they are already installed, simply ignore this message", :red)}"
+  #{Autoproj.color("If they are already installed, simply ignore this message", :red)}
   
     #{osdeps.join("\n    ")}
 

data/lib/autoproj/autobuild.rb

@@ -116,6 +116,8 @@ module Autobuild
                 if osdeps_availability == Autoproj::OSDependencies::AVAILABLE
                     @os_packages << name
                     return
+                elsif osdeps_availability == Autoproj::OSDependencies::IGNORE
+                    return
                 end
 
                 if osdeps_availability == Autoproj::OSDependencies::UNKNOWN_OS
@@ -135,7 +137,7 @@ module Autobuild
                         # Call osdeps to get a proper error message
                         osdeps, gems = Autoproj.osdeps.partition_packages([name].to_set, name => [self.name])
                         Autoproj.osdeps.resolve_os_dependencies(osdeps)
-                    rescue ConfigError => e
+                    rescue Autoproj::ConfigError => e
                         if osdeps_availability != Autoproj::OSDependencies::NO_PACKAGE && !Autoproj.osdeps.installs_os_packages?
                             Autoproj.warn "in #{File.join(srcdir, 'manifest.xml')}: #{e.message}"
                             Autoproj.warn "this osdeps dependency is simply ignored as you asked autoproj to not install osdeps packages"

data/lib/autoproj/cmdline.rb

@@ -707,6 +707,7 @@ module Autoproj
         def self.doc?; @mode == "doc" end
         def self.snapshot?; @mode == "snapshot" end
         def self.reconfigure?; @mode == "reconfigure" end
+        def self.list_unused?; @mode == "list-unused" end
 
         def self.show_statistics?; !!@show_statistics end
         def self.ignore_dependencies?; @ignore_dependencies end
@@ -794,13 +795,18 @@ where 'mode' is one of:
     autoproj bootstrap [manifest_url|source_vcs source_url opt1=value1 opt2=value2 ...]
 
     For example:
-    autoproj bootstrap git git://github.com/doudou/rubim-all.git branch=all
+    autoproj bootstrap git git://gitorious.org/rock/buildconfig.git
 
   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
+    autoproj switch-config git git://gitorious.org/rock/buildconfig.git
+
+    In case only the options need to be changed, the source_vcs and source_url fields can be omitted:
+
+    For example:
+    autoproj switch-config branch=next
 
 -- Additional options:
     EOBANNER
@@ -927,6 +933,7 @@ where 'mode' is one of:
                 @mode = args.shift
                 unknown_mode = catch(:unknown) do
                     handle_mode(@mode, args)
+                    false
                 end
                 if unknown_mode
                     STDERR.puts "unknown mode #{@mode}"
@@ -1059,6 +1066,10 @@ where 'mode' is one of:
                 @update_os_dependencies = false
                 Autobuild.do_doc    = true
                 Autobuild.only_doc  = true
+            when "list-unused"
+                Autobuild.do_update = false
+                Autobuild.do_build  = false
+                @update_os_dependencies = false
             else
                 throw :unknown, true
             end
@@ -1483,11 +1494,11 @@ export PATH=$GEM_HOME/bin:$PATH
             end
 
             overrides_path = File.join(target_dir, 'overrides.yml')
-            overrides =
-                if File.exists?(overrides_path)
-                    YAML.load(File.read(overrides_path))
-                else Hash.new
-                end
+            if File.exists?(overrides_path)
+                overrides = YAML.load(File.read(overrides_path))
+            end
+            # In Ruby 1.9, an empty file results in YAML.load returning false
+            overrides ||= Hash.new
 
             if overrides['overrides']
                 overrides['overrides'].concat(version_control)
@@ -1648,6 +1659,48 @@ export PATH=$GEM_HOME/bin:$PATH
                 raise
             end
         end
+
+        def self.list_unused(all_enabled_packages)
+            all_enabled_packages = all_enabled_packages.map do |pkg_name|
+                Autobuild::Package[pkg_name]
+            end
+            leaf_dirs = (all_enabled_packages.map(&:srcdir) +
+                all_enabled_packages.map(&:prefix)).to_set
+            leaf_dirs << Autoproj.config_dir
+            leaf_dirs << Autoproj.gem_home
+            leaf_dirs << Autoproj.remotes_dir
+
+            root = Autoproj.root_dir
+            all_dirs = leaf_dirs.dup
+            leaf_dirs.each do |dir|
+                dir = File.dirname(dir)
+                while dir != root
+                    break if all_dirs.include?(dir)
+                    all_dirs << dir
+                    dir = File.dirname(dir)
+                end
+            end
+            all_dirs << Autoproj.root_dir
+
+            unused = Set.new
+            Find.find(Autoproj.root_dir) do |path|
+                next if !File.directory?(path)
+                if !all_dirs.include?(path)
+                    unused << path
+                    Find.prune
+                elsif leaf_dirs.include?(path)
+                    Find.prune
+                end
+            end
+
+
+            root = Pathname.new(Autoproj.root_dir)
+            Autoproj.progress
+            Autoproj.progress "The following directories are not part of a package used in the current autoproj installation", :bold
+            unused.to_a.sort.each do |dir|
+                puts "  #{Pathname.new(dir).relative_path_from(root)}"
+            end
+        end
     end
 end
 

data/lib/autoproj/manifest.rb

@@ -820,6 +820,14 @@ module Autoproj
             end
 	end
 
+
+        # Call this method to ignore a specific package. It must not be used in
+        # init.rb, as the manifest is not yet loaded then
+        def ignore_package(package_name)
+            list = (data['ignore_packages'] ||= Array.new)
+            list << package_name
+        end
+
         # True if the given package should not be built, with the packages that
         # depend on him have this dependency met.
         #

data/lib/autoproj/osdeps.rb

@@ -156,7 +156,7 @@ module Autoproj
         #
         # Examples: ['debian', ['sid', 'unstable']] or ['ubuntu', ['lucid lynx', '10.04']]
         def self.operating_system
-            if @operating_system
+            if !@operating_system.nil?
                 return @operating_system
             elsif Autoproj.has_config_key?('operating_system')
                 os = Autoproj.user_config('operating_system')
@@ -169,19 +169,28 @@ module Autoproj
                 end
             end
 
-            Autoproj.progress "  autodetecting the operating system"
-            name, versions = os_from_lsb
-            if name
-                if name != "debian"
-                    if File.exists?("/etc/debian_version")
-                        @operating_system = [[name, "debian"], versions]
-                    else
-                        @operating_system = [[name], versions]
+            if user_os = ENV['AUTOPROJ_OS']
+                if user_os.empty?
+                    @operating_system = false
+                else
+                    names, versions = user_os.split(':')
+                    @operating_system = [names.split(','), versions.split(',')]
+                end
+            else
+                Autoproj.progress "  autodetecting the operating system"
+                name, versions = os_from_lsb
+                if name
+                    if name != "debian"
+                        if File.exists?("/etc/debian_version")
+                            @operating_system = [[name, "debian"], versions]
+                        else
+                            @operating_system = [[name], versions]
+                        end
                     end
                 end
             end
 
-            if !@operating_system
+            if @operating_system.nil?
                 # Need to do some heuristics unfortunately
                 @operating_system =
                     if File.exists?('/etc/debian_version')
@@ -235,12 +244,27 @@ module Autoproj
             if !@dpkg_installed_packages
                 @dpkg_installed_packages = Set.new
                 dpkg_status = File.readlines('/var/lib/dpkg/status')
-                dpkg_status.grep(/^(Package|Status)/).
-                    each_slice(2) do |package, status|
-                        if status.chomp == "Status: install ok installed"
-                            @dpkg_installed_packages << package.split[1].chomp
+
+                current_packages = []
+                is_installed = false
+                dpkg_status.each do |line|
+                    line = line.chomp
+                    if line == ""
+                        if is_installed
+                            current_packages.each do |pkg|
+                                @dpkg_installed_packages << pkg
+                            end
+                            current_packages.clear
+                            is_installed = false
                         end
+                    elsif line =~ /Package: (.*)$/
+                        current_packages << $1
+                    elsif line =~ /Provides: (.*)$/
+                        current_packages << $1
+                    elsif line == "Status: install ok installed"
+                        is_installed = true
                     end
+                end
             end
             
             if package_name =~ /^(\w[a-z0-9+-.]+)/
@@ -311,6 +335,10 @@ fi
                 return NO_PACKAGE
             end
 
+            if dep_def == 'ignore'
+                return IGNORE
+            end
+
             if !os_names
                 return UNKNOWN_OS
             end
@@ -600,6 +628,8 @@ Finally, OS dependencies can be installed by calling "autoproj osdeps"
 with the corresponding option (--all, --ruby, --os or --none). Calling
 "autoproj osdeps" without arguments will also give you information as
 to what you should install to compile the software successfully.
+
+So, what do you want ? (ruby or none)
             EOT
             message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically (ruby, none) ?", long_doc.strip ]
 
@@ -637,6 +667,8 @@ an autoproj operation with the --reconfigure option (e.g. autoproj update
 
 Finally, OS dependencies can be installed by calling "autoproj osdeps"
 with the corresponding option (--all, --ruby, --os or --none).
+
+So, what do you want ? (all, ruby, os or none)
             EOT
             message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically (all, ruby, os, none) ?", long_doc.strip ]
 
@@ -726,7 +758,7 @@ with the corresponding option (--all, --ruby, --os or --none).
         def osdeps_interaction_unknown_os(osdeps)
             puts <<-EOMSG
   #{Autoproj.color("The build process requires some other software packages to be installed on our operating system", :bold)}
-  #{Autoproj.color("If they are already installed, simply ignore this message", :red)}"
+  #{Autoproj.color("If they are already installed, simply ignore this message", :red)}
   
     #{osdeps.join("\n    ")}
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.8"
+    VERSION = "1.7.9"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 1
   - 7
-  - 8
-  version: 1.7.8
+  - 9
+  version: 1.7.9
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 +01:00
+date: 2011-05-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,21 +156,21 @@ description: |-
   provides an easy integration of the local operating system (Debian, Ubuntu,
   Fedora, maybe MacOSX at some point).
   
-  This tool has been developped in the frame of the RubyInMotion project
-  (http://sites.google.com/site/rubyinmotion), to install robotics-related
+  This tool has been over the years. It is now maintained in the frame of the Rock
+  robotics project (http://rock-robotics.org), to install robotics-related
   software -- that is often bleeding edge. Unlike [the ROS build
   system](http://ros.org), it is not bound to one build system, one VCS and one
   integration framework. The philosophy behind autoproj
   is:
-   * supports both CMake and autotools, and can be adapted to other tools
-   * supports different VCS: cvs, svn, git, plain tarballs.
-   * software packages are plain packages, meaning that they can be built and
-     installed /outside/ an autoproj tree, and are not tied *at all* to the
-     autoproj build system.
-   * leverage the actual OS package management system. Right now, only Debian-like
-     systems (like Ubuntu) are supported, simply because it is the only one I have
-     access to.
-   * handle code generation properly
+  * supports both CMake and autotools, and can be adapted to other tools
+  * supports different VCS: cvs, svn, git, plain tarballs.
+  * software packages are plain packages, meaning that they can be built and
+    installed /outside/ an autoproj tree, and are not tied *at all* to the
+    autoproj build system.
+  * leverage the actual OS package management system. Right now, only Debian-like
+    systems (like Ubuntu) are supported, simply because it is the only one I have
+    access to.
+  * handle code generation properly
 email: 
 - sylvain.joyeux@dfki.de
 executables: 
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of robotics software