autoproj 1.8.0.rc2 → 1.8.0.rc3

data/History.txt

@@ -1,3 +1,12 @@
+= Version 1.8.0
+ * fix issues with 1.9.3
+ * significantly refactor the osdeps handling. It should make the addition of
+   other OS-independent handlers (along rubygems) easier. Moreover, it is now
+   possible to specify gem dependency on a per-OS basis (was always global
+   before) 
+ * the autoproj command line learned the -p option to control parallelism (i.e.
+   -p1 forces to use only one process)
+
 = Version 1.7.20
  * do not generate an error if an unknown package is used as an optional
    dependency. The rationale is that one can then have optional features that

data/Rakefile

@@ -7,7 +7,7 @@ Utilrb::Rake.hoe do
         Hoe.spec 'autoproj' do
             self.developer "Sylvain Joyeux", "sylvain.joyeux@dfki.de"
 
-            self.url = ["http://rock-robotics.org/documentation/autoproj",
+            self.urls = ["http://rock-robotics.org/documentation/autoproj",
                 "git://github.com/doudou/autoproj.git"]
             self.rubyforge_name = 'autobuild'
             self.summary = 'Easy installation and management of software packages'

data/bin/autoproj_bootstrap

@@ -119,6 +119,10 @@ module Autoproj
                 @enabled = true
                 @silent = true
             end
+
+            def name
+                names.first
+            end
         end
 
         # Dummy package manager used for unknown OSes. It simply displays a
@@ -1729,93 +1733,93 @@ module Autoproj
 end
 
 DEFS = <<EODEFS
---- 
-cvs: 
-  debian,ubuntu: cvs
-svn: 
-  arch: subversion
-  gentoo: dev-util/subversion
-  debian,ubuntu: subversion
-autobuild: gem
-zlib: 
-  debian,ubuntu: zlib1g-dev
-libxml2: 
-  arch: libxml2
-  gentoo: dev-libs/libxml2
-  debian,ubuntu: libxml2-dev
+---
 none: ignore
-autotools: 
-  arch: automake autoconf
-  gentoo: 
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-  debian,ubuntu: 
-  - automake1.9
-  - autoconf
-autoproj: gem
-archive: 
-  arch: 
-  - tar
-  - unzip
-  gentoo: 
-  - app-arch/tar
-  - app-arch/unzip
-  debian,ubuntu: 
-  - tar
-  - unzip
-lsb_release: 
-  arch: ignore
-  gentoo: sys-apps/lsb-release
-  debian,ubuntu: lsb-release
-ruby18: 
-  gentoo: 
-  - dev-lang/ruby:1.8
-  - rake
-  debian,ubuntu: 
+ruby18:
+  debian,ubuntu:
   - ruby1.8-dev
   - ruby1.8
   - rubygems1.8
   - ri1.8
   - libopenssl-ruby1.8
   - rake
-ruby19: 
-  debian: 
+  gentoo:
+  - dev-lang/ruby:1.8
+  - rake
+ruby19:
+  debian:
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - rake
-  arch: 
-  - ruby
-  - rake
-  gentoo: 
-  - dev-lang/ruby:1.9
-  - rake
-  ubuntu: 
+  ubuntu:
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - ri1.9.1
   - libopenssl-ruby1.9.1
   - rake
-git: 
-  debian: 
+  gentoo:
+  - dev-lang/ruby:1.9
+  - rake
+  arch:
+  - ruby
+  - rake
+build-essential:
+  debian,ubuntu: build-essential
+  gentoo: ignore
+  arch: ignore
+libxml2:
+  debian,ubuntu: libxml2-dev
+  gentoo: dev-libs/libxml2
+  arch: libxml2
+libxslt:
+  debian,ubuntu: libxslt1-dev
+  gentoo: dev-libs/libxslt
+  arch: libxslt
+zlib:
+  debian,ubuntu: zlib1g-dev
+autobuild: gem
+autoproj: gem
+git:
+  debian:
     lenny: git
     default: git-core
-  arch: git
-  gentoo: dev-vcs/git
   ubuntu: git-core
-cmake: 
-  arch: cmake
-  gentoo: dev-util/cmake
+  gentoo: dev-vcs/git
+  arch: git
+svn:
+  debian,ubuntu: subversion
+  gentoo: dev-util/subversion
+  arch: subversion
+cmake:
   debian,ubuntu: cmake
-build-essential: 
+  gentoo: dev-util/cmake
+  arch: cmake
+autotools:
+  debian,ubuntu:
+  - automake1.9
+  - autoconf
+  gentoo:
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+  arch: automake autoconf
+lsb_release:
+  debian,ubuntu: lsb-release
+  gentoo: sys-apps/lsb-release
   arch: ignore
-  gentoo: ignore
-  debian,ubuntu: build-essential
-libxslt: 
-  arch: libxslt
-  gentoo: dev-libs/libxslt
-  debian,ubuntu: libxslt1-dev
+archive:
+  debian,ubuntu:
+  - tar
+  - unzip
+  gentoo:
+  - app-arch/tar
+  - app-arch/unzip
+  arch:
+  - tar
+  - unzip
+cvs:
+  debian,ubuntu: cvs
 
 EODEFS
 

data/lib/autoproj/cmdline.rb

@@ -1599,47 +1599,41 @@ export PATH=$GEM_HOME/bin:$PATH
             # osdeps package
             #
             # +definitions+ is a osdep_name => definition_file mapping
-            mapping = Hash.new { |h, k| h[k] = [false, false, Hash.new, Set.new] }
-
+            mapping = Hash.new { |h, k| h[k] = Array.new }
+            used_by = Hash.new { |h, k| h[k] = Array.new }
             ospkg_to_pkg.each do |pkg_osdep, pkgs|
-                osdeps, gems = Autoproj.osdeps.
-                    partition_packages([pkg_osdep])
-
-                gems.each do |gem_name|
-                    mapping[gem_name.join(" ")][1] = true
-                    mapping[gem_name.join(" ")][2][pkg_osdep] = Autoproj.osdeps.source_of(pkg_osdep)
-                    mapping[gem_name.join(" ")][3] |= pkgs
-                end
-
-                if Autoproj::OSDependencies.supported_operating_system?
-                    osdeps = Autoproj.osdeps.
-                        resolve_os_dependencies(osdeps)
-                end
-                osdeps.each do |ospkg_name|
-                    mapping[ospkg_name][0] = true
-                    mapping[ospkg_name][2][pkg_osdep] = Autoproj.osdeps.source_of(pkg_osdep)
-                    mapping[ospkg_name][3] |= pkgs
+                used_by[pkg_osdep].concat(pkgs)
+                packages = Autoproj.osdeps.resolve_package(pkg_osdep)
+                packages.each do |handler, status, entries|
+                    entries.each do |entry|
+                        if entry.respond_to?(:join)
+                            entry = entry.join(", ")
+                        end
+                        mapping[entry] << [pkg_osdep, handler, Autoproj.osdeps.source_of(pkg_osdep)]
+                    end
                 end
             end
 
             mapping = mapping.sort_by(&:first)
-            mapping.each do |pkg_name, (is_os_pkg, is_gem_pkg, definitions, used_by)|
-                kind = if is_os_pkg && is_gem_pkg
-                           "both a RubyGem and OS package"
-                       elsif is_os_pkg
-                           "an OS package"
-                       else
-                           "a RubyGem package"
-                       end
-
-                puts "#{pkg_name} is #{kind}"
-                definitions.to_a.
-                    sort_by(&:first).
-                    each do |osdep_name, file_name|
-                        puts "  defined as #{osdep_name} in #{file_name}"
-                    end
+            mapping.each do |pkg_name, handlers|
+                puts pkg_name
+                depended_upon = Array.new
+                handlers.each do |osdep_name, handler, source|
+                    install_state = 
+                        if handler.respond_to?(:installed?)
+                            !!handler.installed?(pkg_name)
+                        end
+                    install_state =
+                        if install_state == false
+                            ", currently not installed"
+                        elsif install_state == true
+                            ", currently installed"
+                        end # nil means "don't know"
 
-                puts "  depended-upon by #{used_by.sort.join(", ")}"
+                    puts "  defined as #{osdep_name} (#{handler.name}) in #{source}#{install_state}"
+                    depended_upon.concat(used_by[osdep_name])
+                end
+                puts "  depended-upon by #{depended_upon.sort.join(", ")}"
             end
         end
 

data/lib/autoproj/osdeps.rb

@@ -20,6 +20,10 @@ module Autoproj
                 @enabled = true
                 @silent = true
             end
+
+            def name
+                names.first
+            end
         end
 
         # Dummy package manager used for unknown OSes. It simply displays a

data/lib/autoproj/version.rb

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

metadata

@@ -1,117 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: autoproj
-version: !ruby/object:Gem::Version 
-  hash: 15424177
+version: !ruby/object:Gem::Version
+  version: 1.8.0.rc3
   prerelease: 6
-  segments: 
-  - 1
-  - 8
-  - 0
-  - rc
-  - 2
-  version: 1.8.0.rc2
 platform: ruby
-authors: 
+authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: autobuild
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &17568500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15424087
-        segments: 
-        - 1
-        - 6
-        - 0
-        - rc
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.0.rc1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: utilrb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *17568500
+- !ruby/object:Gem::Dependency
+  name: utilrb
+  requirement: &17568060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *17568060
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &17567600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *17567600
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &17567140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 12
-        version: "2.12"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id004
-description: |-
-  What is Autoproj
-  ----------------
-  Autoproj allows to easily install and maintain software that is under source
-  code form (usually from a version control system). It has been designed to support a
-  package-oriented development process, where each package can have its own
-  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 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
-email: 
+  prerelease: false
+  version_requirements: *17567140
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &17566640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: *17566640
+description: ! "What is Autoproj\n----------------\nAutoproj allows to easily install
+  and maintain software that is under source\ncode form (usually from a version control
+  system). It has been designed to support a\npackage-oriented development process,
+  where each package can have its own\nversion control repository (think \"distributed
+  version control\"). It also\nprovides an easy integration of the local operating
+  system (Debian, Ubuntu,\nFedora, maybe MacOSX at some point).\n\nThis tool has been
+  over the years. It is now maintained in the frame of the Rock\nrobotics project
+  (http://rock-robotics.org), to install robotics-related\nsoftware -- that is often
+  bleeding edge. Unlike [the ROS build\nsystem](http://ros.org), it is not bound to
+  one build system, one VCS and one\nintegration framework. The philosophy behind
+  autoproj\nis:\n* supports both CMake and autotools, and can be adapted to other
+  tools\n* supports different VCS: cvs, svn, git, plain tarballs.\n* software packages
+  are plain packages, meaning that they can be built and\n  installed /outside/ an
+  autoproj tree, and are not tied *at all* to the\n  autoproj build system.\n* leverage
+  the actual OS package management system. Right now, only Debian-like\n  systems
+  (like Ubuntu) are supported, simply because it is the only one I have\n  access
+  to.\n* handle code generation properly"
+email:
 - sylvain.joyeux@dfki.de
-executables: 
+executables:
 - amake
 - aup
 - autolocate
@@ -122,13 +96,12 @@ executables:
 - autoproj_bootstrap
 - autoproj_stress_test
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
 - samples/autoproj/README.txt
-files: 
+files:
 - History.txt
 - Manifest.txt
 - README.txt
@@ -173,41 +146,31 @@ files:
 - .gemtest
 homepage: http://rock-robotics.org/documentation/autoproj
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: autobuild
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of software packages
-test_files: 
+test_files:
 - test/test_os_dependencies.rb
 - test/package_managers/test_gem.rb
 - test/test_manifest.rb