autoproj 1.7.14.rc5 → 1.7.14.rc6

data/History.txt

@@ -17,6 +17,16 @@
    must match the package name, as e.g.
       rock.git/external/yaml-cpp.xml
    The package set's manifest takes precedence over the package one.
+ * added the --exit-code option to autoproj status. It is meant to be used
+   in scripts to check whether autoproj update will modify the source code
+   (for instance, in build servers)
+ * removed explicit installation of rdoc to fix issues with RubyGems 1.7.x.
+   Additionally, the Gems documentation is not generated by default anymore as
+   most people don't need it. It can be reenabled with
+     Autoproj::OSDependencies.gem_doc = true
+ * be compatible with (soon-to-be-removed) deprecations in RubyGems 1.8.x
+ * allow usage of metapackages in the dependency tracking (i.e. one can use a
+   metapackage as a dependency of another package now)
 
 = Version 1.7.13
  * bugfix release: fix HTTP fallback mechanism for gitorious servers

data/Rakefile

@@ -1,16 +1,16 @@
+require 'utilrb/rake_common'
 $LOAD_PATH.unshift File.join(Dir.pwd, 'lib')
 
 task 'default'
-begin
-    require 'hoe'
+Utilrb::Rake.hoe do
     namespace 'dist' do
-        config = Hoe.spec 'autoproj' do
+        Hoe.spec 'autoproj' do
             self.developer "Sylvain Joyeux", "sylvain.joyeux@dfki.de"
 
-            self.url = ["http://doudou.github.com/autoproj",
+            self.url = ["http://rock-robotics.org/autoproj",
                 "git://github.com/doudou/autoproj.git"]
             self.rubyforge_name = 'autobuild'
-            self.summary = 'Easy installation and management of robotics software'
+            self.summary = 'Easy installation and management of software packages'
             self.description = paragraphs_of('README.txt', 0..1).join("\n\n")
             self.changes     = paragraphs_of('History.txt', 0..1).join("\n\n")
 
@@ -26,13 +26,6 @@ begin
                 ['rdoc', '>= 2.4.0']
         end
     end
-
-rescue LoadError => e
-    STDERR.puts "cannot load the Hoe gem. Distribution is disabled"
-    STDERR.puts "error message is: #{e.message}"
-rescue Exception => e
-    STDERR.puts "cannot load the Hoe gem, or Hoe fails. Distribution is disabled"
-    STDERR.puts "error message is: #{e.message}"
 end
 
 namespace 'dist' do
@@ -68,15 +61,7 @@ namespace 'dist' do
 end
 file 'bin/autoproj_bootstrap' => 'dist:bootstrap'
 
-do_doc = begin
-             require 'rdoc/task'
-             true
-         rescue LoadError => e
-             STDERR.puts "WARN: cannot load RDoc, documentation generation disabled"
-             STDERR.puts "WARN:   #{e.message}"
-         end
-
-if do_doc
+Utilrb::Rake.rdoc do
     task 'doc' => 'doc:all'
     task 'clobber_docs' => 'doc:clobber'
     task 'redocs' do
@@ -96,4 +81,3 @@ if do_doc
     end
 end
 
-

data/bin/autoproj_bootstrap

@@ -1588,7 +1588,7 @@ rescue Autoproj::ConfigError => e
 end
 
 # Now try to find out the name of the gem binary
-PACKAGES      = %w{autobuild libxml2 libxslt zlib build-essential lsb_release}
+PACKAGES      = %w{libxml2 libxslt zlib build-essential lsb_release}
 
 ENV['RUBYOPT']  = "-rubygems"
 require 'rubygems'
@@ -1620,6 +1620,7 @@ if ARGV.first != "localdev"
         ARGV.shift
     end
     begin
+        osdeps_management.install(['autobuild'])
         osdeps_management.install(['autoproj'])
     rescue Autoproj::ConfigError => e
         STDERR.puts "failed: #{e.message}"

data/lib/autoproj/cmdline.rb

@@ -47,6 +47,15 @@ module Autoproj
             Autoproj.loaded_autobuild_files.clear
             Autoproj.load_config
 
+            if Autoproj.has_config_key?('autobuild')
+                params = Autoproj.user_config('autobuild')
+                if params.kind_of?(Hash)
+                    params.each do |k, v|
+                        Autobuild.send("#{k}=", v)
+                    end
+                end
+            end
+
             if Autoproj.has_config_key?('prefix')
                 Autoproj.prefix = Autoproj.user_config('prefix')
             end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.14.rc5"
+    VERSION = "1.7.14.rc6"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 15424063
+  hash: 15424057
   prerelease: 7
   segments: 
   - 1
   - 7
   - 14
   - rc
-  - 5
-  version: 1.7.14.rc5
+  - 6
+  version: 1.7.14.rc6
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-24 00:00:00 Z
+date: 2011-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild
@@ -228,7 +228,7 @@ files:
 - test/test_debian.rb
 - test/test_manifest.rb
 - .gemtest
-homepage: http://doudou.github.com/autoproj
+homepage: http://rock-robotics.org/autoproj
 licenses: []
 
 post_install_message: 
@@ -263,7 +263,7 @@ rubyforge_project: autobuild
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Easy installation and management of robotics software
+summary: Easy installation and management of software packages
 test_files: 
 - test/test_manifest.rb
 - test/test_debian.rb