autobuild 1.5.25 → 1.5.26

data/Changes.txt

@@ -1,3 +1,6 @@
+== Version 1.5.26
+* add statistics support
+
 == Version 1.5.25
 * small bugfixes
 

data/lib/autobuild/package.rb

@@ -71,6 +71,14 @@ module Autobuild
 	# The list of packages this one depends upon
 	attr_reader :dependencies
 
+        # Some statistics about the commands that have been run
+        attr_reader :statistics
+
+        def add_stat(phase, duration)
+            @statistics[phase] ||= 0
+            @statistics[phase] += duration
+        end
+
 	# Absolute path to the source directory. See #srcdir=
 	def srcdir; File.expand_path(@srcdir || name, Autobuild.srcdir) end
 	# Absolute path to the installation directory. See #prefix=
@@ -97,6 +105,7 @@ module Autobuild
 	    @dependencies   = Array.new
 	    @provides       = Array.new
             @parallel_build_level = nil
+            @statistics     = Hash.new
 
 	    if Hash === spec
 		name, depends = spec.to_a.first

data/lib/autobuild/packages/cmake.rb

@@ -189,7 +189,7 @@ module Autobuild
         def install
             Dir.chdir(builddir) do
                 progress "installing %s"
-                Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
+                Subprocess.run(self, 'install', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
             end
             super
         end

data/lib/autobuild/subcommand.rb

@@ -21,6 +21,23 @@ module Autobuild
         @logfiles.include?(logfile)
     end
 
+    def self.statistics
+        @statistics
+    end
+    def self.reset_statistics
+        @statistics = Hash.new
+    end
+    def self.add_stat(package, phase, duration)
+        if !@statistics[package]
+            @statistics[package] = { phase => duration }
+        elsif !@statistics[package][phase]
+            @statistics[package][phase] = duration
+        else
+            @statistics[package][phase] += duration
+        end
+    end
+    reset_statistics
+
     @parallel_build_level = nil
     class << self
         # Sets the level of parallelism during the build
@@ -86,6 +103,8 @@ module Autobuild::Subprocess
     def self.run(target, phase, *command)
         STDOUT.sync = true
 
+        start_time = Time.now
+
         # Filter nil and empty? in command
         command.reject!  { |o| o.nil? || (o.respond_to?(:empty?) && o.empty?) }
         command.collect! { |o| o.to_s }
@@ -223,6 +242,15 @@ module Autobuild::Subprocess
             raise Failed.new(status.exitstatus), "'#{command.join(' ')}' returned status #{status.exitstatus}"
         end
 
+        duration = Time.now - start_time
+        Autobuild.add_stat(target, phase, duration)
+        File.open(File.join(Autobuild.logdir, "stats.log"), 'a') do |io|
+            io.puts "#{target} #{phase} #{duration}"
+        end
+        if target.respond_to?(:add_stat)
+            target.add_stat(phase, duration)
+        end
+
     rescue Failed => e
         error = Autobuild::SubcommandFailed.new(target_name, command.join(" "), logname, e.status)
         error.phase = phase

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.25" unless defined? Autobuild::VERSION
+    VERSION = "1.5.26" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 1
   - 5
-  - 25
-  version: 1.5.25
+  - 26
+  version: 1.5.26
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +01:00
+date: 2010-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency