autobuild 1.2.6 → 1.2.7

data/Changes.txt

@@ -1,3 +1,9 @@
+== Version 1.2.7
+* fixes to documentation support
+  - '--no-doc' now works
+  - failures to generate documentation are now simple warnings, an error can be obtained
+    by setting Autobuild.doc_errors or by using the --doc-errors command line flag
+
 == Version 1.2.6
 * really fix the dependency problem
 * add documentation support in autotools

data/lib/autobuild.rb

@@ -3,6 +3,6 @@ require 'autobuild/reporting'
 require 'autobuild/package'
 
 module Autobuild
-    VERSION = "1.2.6" unless defined? Autobuild::VERSION
+    VERSION = "1.2.7" unless defined? Autobuild::VERSION
 end
 

data/lib/autobuild/config.rb

@@ -18,6 +18,8 @@ end
 # debug:: more verbose than 'verbose': displays Rake's debugging output
 # do_update:: if we should update the packages
 # do_build:: if we should build the packages
+# do_doc:: if we should produce the documentation
+# doc_errors:: if errors during the documentation generation are treated as errors
 # daemonize:: if the build should go into daemon mode (only if the daemons gem is available)
 # clean_log:: remove all logs before starting the build
 # packages:: a list of packages to build specifically
@@ -26,7 +28,7 @@ end
 module Autobuild
     class << self
         %w{ nice srcdir prefix
-            verbose debug do_update do_build only_doc do_doc
+            verbose debug do_update do_build only_doc do_doc doc_errors
             daemonize clean_log packages default_packages
             doc_prefix }.each do |name|
             attr_accessor name
@@ -46,7 +48,7 @@ module Autobuild
         :srcdir => Dir.pwd, :prefix => Dir.pwd, :logdir => nil,
         :verbose => false, :debug => false, :do_build => true, :do_update => true, 
         :daemonize => false, :packages => [], :default_packages => [],
-        :only_doc => false, :do_doc => true,
+        :only_doc => false, :do_doc => true, :doc_errors => false,
         :doc_prefix => 'doc' }
 
     @programs = Hash.new
@@ -154,7 +156,8 @@ module Autobuild
                 opts.on("--no-update", "update already checked-out sources") do |@do_update| end
                 opts.on("--no-build",  "only prepare packages, do not build them") do |@do_build| end 
                 opts.on("--only-doc", "only generate documentation") do |@only_doc| end
-                opts.on("--no-doc", "don't generate documentation") do |@doc_doc| end
+                opts.on("--no-doc", "don't generate documentation") do |@do_doc| end
+                opts.on("--doc-errors", "treat documentation failure as error") do |@doc_errors| end
 
                 opts.separator ""
                 opts.separator "Program output"

data/lib/autobuild/package.rb

@@ -127,12 +127,21 @@ module Autobuild
             task "#{name}-doc" => "#{name}-build" do
                 @installed_doc = false
                 catch(:doc_disabled) do
-                    Dir.chdir(srcdir) do
-                        yield if block_given?
-                    end
-
-                    unless @installed_doc
-                        install_doc
+                    begin
+                        Dir.chdir(srcdir) do
+                            yield if block_given?
+                        end
+
+                        unless @installed_doc
+                            install_doc
+                        end
+
+                    rescue Exception => e
+                        if Autobuild.doc_errors
+                            raise
+                        else
+                            STDERR.puts "W: failed to generate documentation for #{name}"
+                        end
                     end
                 end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-17 00:00:00 +02:00
+date: 2008-10-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency