autobuild 1.5.0 → 1.5.1

data/Changes.txt

@@ -1,3 +1,13 @@
+== Version 1.5.1
+* autotools: must run libtool before the other tools
+* autotools: properly autodetect need for autoconf (autoconf was always enabled
+  before)
+* logs: properly log everything that happens in one session. The previous
+  behaviour was to have, in each log file, only the last command that has been
+  run.
+* logs: only attach relevant logs to report mails. The previous behaviour was to
+  attach all log files that were in <prefix>/log
+
 == Version 1.5.0
 * now Ruby1.9 compatibility fixes, can be run with ruby1.9.1 on Debian
 * properly runs if the ruby interpreter is not called 'ruby', as ruby1.9.1

data/lib/autobuild.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.0" unless defined? Autobuild::VERSION
+    VERSION = "1.5.1" unless defined? Autobuild::VERSION
 end
 
 require 'autobuild/config'

data/lib/autobuild/packages/autotools.rb

@@ -138,12 +138,23 @@ module Autobuild
                         #
                         # Let the user disable the use of autoconf explicitely by using 'false'.
                         # 'nil' means autodetection
-                        using[:autoconf] = true if using[:autoconf].nil?
+                        if using[:autoconf].nil?
+                            if File.file?(File.join(srcdir, 'configure.in')) || File.file?(File.join(srcdir, 'configure.ac'))
+                                using[:autoconf] = true 
+                            end
+                        end
                         using[:aclocal] = using[:autoconf] if using[:aclocal].nil?
                         if using[:automake].nil?
                             using[:automake] = File.exists?(File.join(srcdir, 'Makefile.am'))
                         end
 
+                        if using[:libtool].nil?
+                            using[:libtool] = File.exists?(File.join(srcdir, 'ltmain.sh'))
+                        end
+                        if using[:libtool]
+                            Subprocess.run(self, 'configure', Autobuild.tool('libtoolize'), '--copy')
+                        end
+
                         [ :aclocal, :autoconf, :autoheader, :automake ].each do |tool|
                             if tool_flag = using[tool]
 				tool_program = if tool_flag.respond_to?(:to_str)
@@ -154,13 +165,6 @@ module Autobuild
                                 Subprocess.run(self, 'configure', tool_program)
                             end
                         end
-
-                        if using[:libtool].nil?
-                            using[:libtool] = File.exists?(File.join(srcdir, 'ltmain.sh'))
-                        end
-                        if using[:libtool]
-                            Subprocess.run(self, 'configure', Autobuild.tool('libtoolize'), '--copy')
-                        end
                     end
                 end
             end

data/lib/autobuild/reporting.rb

@@ -74,12 +74,8 @@ module Autobuild
 	end
 
         ## Iterate on all log files
-        def self.each_log
-            Find.find(Autobuild.logdir) do |path|
-                if File.file?(path) && path =~ /\.log$/
-                    yield(path)
-                end
-            end
+        def self.each_log(&block)
+            Autobuild.logfiles.each(&block)
         end
     end
 
@@ -160,16 +156,25 @@ module Autobuild
             end
 
             # Send the mails
-	    smtp = Net::SMTP.new(smtp_hostname, smtp_port)
-	    smtp.start {
-		to_email.each do |email|
-		    mail.header.to = email
-		    smtp.send_mail RMail::Serialize.write('', mail), from_email, email
-		end
-	    }
-
-            # Notify the sending
-            puts "Sent notification mail to #{to_email} with source #{from_email}"
+            if File.directory?(File.dirname(smtp_hostname))
+                File.open(smtp_hostname, 'w') do |io|
+                    io.puts "From: #{from_email}"
+                    io.puts "To: #{to_email.join(" ")}"
+                    io.write RMail::Serialize.write('', mail)
+                end
+                puts "saved notification email in #{smtp_hostname}"
+            else
+                smtp = Net::SMTP.new(smtp_hostname, smtp_port)
+                smtp.start {
+                    to_email.each do |email|
+                        mail.header.to = email
+                        smtp.send_mail RMail::Serialize.write('', mail), from_email, email
+                    end
+                }
+
+                # Notify the sending
+                puts "sent notification mail to #{to_email} with source #{from_email}"
+            end
         end
     end
 end

data/lib/autobuild/subcommand.rb

@@ -1,8 +1,26 @@
+require 'set'
 require 'autobuild/exceptions'
 require 'autobuild/reporting'
 require 'fcntl'
 
 module Autobuild
+    @logfiles = Set.new
+    def self.clear_logfiles
+        @logfiles.clear
+    end
+
+    def self.logfiles
+        @logfiles
+    end
+
+    def self.register_logfile(path)
+        @logfiles << path
+    end
+
+    def self.registered_logfile?(logfile)
+        @logfiles.include?(logfile)
+    end
+
     @parallel_build_level = nil
     class << self
         # Sets the level of parallelism during the build
@@ -81,7 +99,7 @@ module Autobuild::Subprocess
                  else Autobuild.logdir
                  end
 
-        logname = "#{logdir}/#{target_name}-#{phase}.log"
+        logname = File.join(logdir, "#{target_name}-#{phase}.log")
         if !File.directory?(File.dirname(logname))
             FileUtils.mkdir_p File.dirname(logname)
         end
@@ -94,9 +112,12 @@ module Autobuild::Subprocess
         command.reject! { |o| o =~ /^\<(.+)/ }
 
         open_flag = if Autobuild.keep_oldlogs then 'a'
+                    elsif Autobuild.registered_logfile?(logname) then 'a'
                     else 'w'
                     end
 
+        Autobuild.register_logfile(logname)
+
         status = File.open(logname, open_flag) do |logfile|
             if Autobuild.keep_oldlogs
                 logfile.puts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 +01:00
+date: 2010-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency