autoproj 1.9.5.rc2 → 1.9.5.rc3

data/bin/autoproj_bootstrap

@@ -2082,27 +2082,14 @@ end
 
 DEFS = <<EODEFS
 --- 
-pip: 
-  debian,ubuntu: python-pip
-cvs: 
-  fedora: cvs
-  darwin: cvs
-  debian,ubuntu: cvs
-lsb_release: 
-  fedora: redhat-lsb
-  arch: ignore
-  gentoo: sys-apps/lsb-release
-  darwin: ignore
-  debian,ubuntu: lsb-release
-cmake: 
-  fedora: cmake
-  arch: cmake
-  gentoo: dev-util/cmake
-  darwin: cmake
-  debian,ubuntu: cmake
-autobuild: gem
-none: ignore
+ruby20: ignore
 archive: 
+  darwin: 
+  - gnutar
+  - unzip
+  debian,ubuntu: 
+  - tar
+  - unzip
   fedora: 
   - tar
   - unzip
@@ -2112,80 +2099,59 @@ archive:
   gentoo: 
   - app-arch/tar
   - app-arch/unzip
-  darwin: 
-  - gnutar
-  - unzip
-  debian,ubuntu: 
-  - tar
-  - unzip
-autotools: 
-  fedora: 
-  - automake
-  - autoconf
-  arch: automake autoconf
-  gentoo: 
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-  darwin: 
-  - automake
-  - autoconf
-  debian,ubuntu: 
-  - automake1.9
-  - autoconf
+autoproj: gem
+lsb_release: 
+  darwin: ignore
+  debian,ubuntu: lsb-release
+  fedora: redhat-lsb
+  arch: ignore
+  gentoo: sys-apps/lsb-release
 svn: 
+  darwin: subversion
+  debian,ubuntu: subversion
   fedora: subversion
   arch: subversion
   gentoo: dev-util/subversion
-  darwin: subversion
-  debian,ubuntu: subversion
-ruby20: ignore
-autoproj: gem
+autobuild: gem
 build-essential: 
+  darwin: ignore
+  debian,ubuntu: build-essential
   fedora: ignore
   arch: ignore
   gentoo: ignore
-  darwin: ignore
-  debian,ubuntu: build-essential
 ruby19: 
-  fedora: 
-    "17": 
-    - ruby
-    - rubygems
-  arch: 
-  - ruby
-  - rake
-  gentoo: 
-  - dev-lang/ruby:1.9
-  - rake
-  default: nonexistent
   darwin: 
   - ruby19
   - rake
-  ubuntu: 
+  default: nonexistent
+  debian: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
-  - ri1.9.1
-  - libopenssl-ruby1.9.1
   - rake
-  debian: 
+  - rubygems-integration
+  ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
+  - ri1.9.1
+  - libopenssl-ruby1.9.1
   - rake
-  - rubygems-integration
-ruby18: 
   fedora: 
-    "15,16": 
+    "17": 
     - ruby
     - rubygems
+  arch: 
+  - ruby
+  - rake
   gentoo: 
-  - dev-lang/ruby:1.8
+  - dev-lang/ruby:1.9
   - rake
-  default: nonexistent
+ruby18: 
   darwin: 
   - ruby
   - rb-rake
+  default: nonexistent
   debian,ubuntu: 
   - ruby1.8-dev
   - ruby1.8
@@ -2193,15 +2159,49 @@ ruby18:
   - ri1.8
   - libopenssl-ruby1.8
   - rake
+  fedora: 
+    "15,16": 
+    - ruby
+    - rubygems
+  gentoo: 
+  - dev-lang/ruby:1.8
+  - rake
 git: 
-  fedora: git
-  arch: git
-  gentoo: dev-vcs/git
   darwin: git-core
-  ubuntu: git-core
   debian: 
-    lenny: git
     default: git-core
+    lenny: git
+  ubuntu: git-core
+  fedora: git
+  arch: git
+  gentoo: dev-vcs/git
+autotools: 
+  darwin: 
+  - automake
+  - autoconf
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
+  fedora: 
+  - automake
+  - autoconf
+  arch: automake autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+cmake: 
+  darwin: cmake
+  debian,ubuntu: cmake
+  fedora: cmake
+  arch: cmake
+  gentoo: dev-util/cmake
+none: ignore
+pip: 
+  debian,ubuntu: python-pip
+cvs: 
+  darwin: cvs
+  debian,ubuntu: cvs
+  fedora: cvs
 
 EODEFS
 

data/lib/autoproj/cmdline.rb

@@ -1531,7 +1531,7 @@ where 'mode' is one of:
             end
 
             require 'set'
-            curdir_entries = Dir.entries('.').to_set - [".", "..", "autoproj_bootstrap", ".gems", @env].to_set
+            curdir_entries = Dir.entries('.').to_set - [".", "..", "autoproj_bootstrap", ".gems", ENV_FILENAME].to_set
             if !curdir_entries.empty? && ENV['AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR'] != '1'
                 while true
                     print "The current directory is not empty, continue bootstrapping anyway ? [yes] "
@@ -1552,7 +1552,9 @@ where 'mode' is one of:
             end
 
             Autoproj.root_dir = Dir.pwd
-            Autobuild.logdir = File.join(Autoproj.prefix, 'log')
+            Autobuild.prefix  = Autoproj.build_dir
+            Autobuild.srcdir  = Autoproj.root_dir
+            Autobuild.logdir = File.join(Autobuild.prefix, 'log')
 
             Autoproj.manifest = Manifest.new
             load_autoprojrc

data/lib/autoproj/manifest.rb

@@ -949,6 +949,10 @@ module Autoproj
         # cannot be built. This modifies the behaviour to simply ignore the
         # problematic packages.
         attr_writer :weak_dependencies
+
+        # @return [Boolean] whether the dependencies from this metapackage are
+        #   weak or not
+        # @see #weak_dependencies
         def weak_dependencies?
             !!@weak_dependencies
         end
@@ -958,13 +962,24 @@ module Autoproj
             @packages = []
             @weak_dependencies = false
         end
+
         # Adds a package to this metapackage
+        #
+        # @param [Autobuild::Package] pkg
         def add(pkg)
             @packages << pkg
         end
+
+        # Lists the packages contained in this metapackage
+        #
+        # @yieldparam [Autobuild::Package] pkg
         def each_package(&block)
             @packages.each(&block)
         end
+
+        # Tests if the given package is included in this metapackage
+        #
+        # @param [String,#name] pkg the package or package name
         def include?(pkg)
             if !pkg.respond_to?(:to_str)
                 pkg = pkg.name

data/lib/autoproj/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: -3341178882
+  hash: 2119809063
   prerelease: 6
   segments: 
   - 1
   - 9
   - 5
   - rc
-  - 2
-  version: 1.9.5.rc2
+  - 3
+  version: 1.9.5.rc3
 platform: ruby
 authors: 
 - Rock Core Developers