autobuild 1.5.43 → 1.5.45

data/Changes.txt

@@ -1,3 +1,18 @@
+== Version 1.5.45
+* fix zip support in the archive importer (patch from Thomas Roehr)
+
+== Version 1.5.44
+* when autodetecting the parallel build level, use the number of physical cores
+  (ignore "logical processors" that are present due to SMT technologies like
+  HyperThreading)
+* add an experimental feature to make autobuild run doxygen by itself instead of
+  using "make doc" for CMake targets. This will sped up documentation
+  generation in simple cases, as dependencies won't need to be installed before
+  "make doc" can be run. This feature is turned OFF by default, and can be
+  turned ON by doing
+
+     Autobuild::CMake.always_use_doc_target = false
+
 == Version 1.5.43
 * cvs: accept the common importer options, such as :patches
   (Patch from Charles Lesire-Cabaniols)

data/lib/autobuild/configurable.rb

@@ -101,9 +101,6 @@ module Autobuild
                 end
             end
             task "#{name}-build" => buildstamp
-            if has_doc?
-                task "#{name}-doc" => configurestamp
-            end
             file installstamp => buildstamp
         end
 

data/lib/autobuild/import/archive.rb

@@ -151,7 +151,9 @@ module Autobuild
                            else base_dir
                            end
 
-                cmd = [ 'unzip', '-o', '-f', cachefile, '-d', main_dir ]
+                cmd = [ '-o', cachefile, '-d', main_dir ]
+                Subprocess.run(package, :import, Autobuild.tool('unzip'), *cmd)
+                
                 if archive_dir
                     FileUtils.rm_rf File.join(package.srcdir)
                     FileUtils.mv File.join(base_dir, archive_dir), package.srcdir

data/lib/autobuild/package.rb

@@ -361,6 +361,8 @@ module Autobuild
                             install_doc
                         end
 
+                    rescue Interrupt
+                        raise
                     rescue ::Exception => e
                         if Autobuild.doc_errors
                             raise

data/lib/autobuild/packages/autotools.rb

@@ -38,6 +38,7 @@ module Autobuild
         
         # Declare that the given target can be used to generate documentation
         def with_doc(target = 'doc')
+            task "#{name}-doc" => configurestamp
             doc_task do
                 Dir.chdir(builddir) do
                     progress "generating documentation for %s"

data/lib/autobuild/packages/cmake.rb

@@ -65,12 +65,131 @@ module Autobuild
             end
         end
 
+        DOXYGEN_ACCEPTED_VARIABLES = {
+            '@CMAKE_SOURCE_DIR@' => lambda { |pkg| pkg.srcdir },
+            '@PROJECT_SOURCE_DIR@' => lambda { |pkg| pkg.srcdir },
+            '@CMAKE_BINARY_DIR@' => lambda { |pkg| pkg.builddir },
+            '@PROJECT_BINARY_DIR@' => lambda { |pkg| pkg.builddir },
+            '@PROJECT_NAME@' => lambda { |pkg| pkg.name }
+        }
+
+        class << self
+            # Flag controlling whether autobuild should run doxygen itself or
+            # use the "doc" target generated by CMake
+            #
+            # This is experimental and OFF by default. See CMake#run_doxygen for
+            # more details
+            #
+            # See also CMake#always_use_doc_target= and CMake#always_use_doc_target?
+            # for a per-package control of that feature
+            attr_writer :always_use_doc_target
+
+            # Flag controlling whether autobuild should run doxygen itself or
+            # use the "doc" target generated by CMake
+            #
+            # This is experimental and OFF by default. See CMake#run_doxygen for
+            # more details
+            #
+            # See also CMake#always_use_doc_target= and CMake#always_use_doc_target?
+            # for a per-package control of that feature
+            def always_use_doc_target?
+                @always_use_doc_target
+            end
+        end
+        @always_use_doc_target = true
+
+        # Flag controlling whether autobuild should run doxygen itself or
+        # use the "doc" target generated by CMake
+        #
+        # This is experimental and OFF by default. See CMake#run_doxygen for
+        # more details
+        #
+        # See also CMake.always_use_doc_target= and CMake.always_use_doc_target?
+        # for a global control of that feature
+        attr_reader :always_use_doc_target
+
+        # Flag controlling whether autobuild should run doxygen itself or
+        # use the "doc" target generated by CMake
+        #
+        # This is experimental and OFF by default. See CMake#run_doxygen for
+        # more details
+        #
+        # See also CMake.always_use_doc_target= and CMake.always_use_doc_target?
+        # for a global control of that feature
+        def always_use_doc_target?
+            if @always_use_doc_target.nil?
+                return CMake.always_use_doc_target?
+            else
+                @always_use_doc_target
+            end
+        end
+
+        # To avoid having to build packages to run the documentation target, we
+        # try to autodetect whether (1) the package is using doxygen and (2)
+        # whether the cmake variables in the doxyfile can be provided by
+        # autobuild itself.
+        #
+        # This can be disabled globally by setting
+        # Autobuild::CMake.always_use_doc_target= or on a per-package basis with
+        # #always_use_doc_target=
+        #
+        # This method returns true if the package can use the internal doxygen
+        # mode and false otherwise
+        def internal_doxygen_mode?
+            if always_use_doc_target?
+                return false
+            end
+
+            doxyfile_in = File.join(srcdir, "Doxyfile.in")
+            if !File.file?(doxyfile_in)
+                puts "NO INTERNAL: #{name}"
+                return false
+            end
+            File.readlines(doxyfile_in).each do |line|
+                matches = line.scan(/@[^@]+@/)
+                if matches.any? { |str| !DOXYGEN_ACCEPTED_VARIABLES.has_key?(str) }
+                    return false
+                end
+            end
+        end
+
+        # To avoid having to build packages to run the documentation target, we
+        # try to autodetect whether (1) the package is using doxygen and (2)
+        # whether the cmake variables in the doxyfile can be provided by
+        # autobuild itself.
+        #
+        # This can be disabled globally by setting
+        # Autobuild::CMake.always_use_doc_target or on a per-package basis with
+        # #always_use_doc_target
+        #
+        # This method generates the corresponding doxygen file in
+        # <builddir>/Doxygen and runs doxygen. It raises if the internal doxygen
+        # support cannot be used on this package
+        def run_doxygen
+            doxyfile_in = File.join(srcdir, "Doxyfile.in")
+            if !File.file?(doxyfile_in)
+                raise RuntimeError, "no Doxyfile.in in this package, cannot use the internal doxygen support"
+            end
+            doxyfile_data = File.readlines(doxyfile_in).map do |line|
+                line.gsub(/@[^@]+@/) { |match| DOXYGEN_ACCEPTED_VARIABLES[match].call(self) }
+            end
+            doxyfile = File.join(builddir, "Doxyfile")
+            File.open(doxyfile, 'w') do |io|
+                io.write(doxyfile_data)
+            end
+            Subprocess.run(self, 'doc', Autobuild.tool(:doxygen), doxyfile)
+        end
+
         # Declare that the given target can be used to generate documentation
         def with_doc(target = 'doc')
             doc_task do
                 Dir.chdir(builddir) do
                     progress "generating documentation for %s"
-                    Subprocess.run(self, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target)
+                    if internal_doxygen_mode?
+                        run_doxygen
+                    else
+                        Subprocess.run(self, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target)
+                    end
                     yield if block_given?
                 end
             end
@@ -106,6 +225,10 @@ module Autobuild
         end
 
         def prepare
+            if !internal_doxygen_mode? && has_doc?
+                task "#{name}-doc" => configurestamp
+            end
+
             # A failed initial CMake configuration leaves a CMakeCache.txt file,
             # but no Makefile.
             #

data/lib/autobuild/subcommand.rb

@@ -71,16 +71,32 @@ module Autobuild
             return @processor_count
         end
 
-        if File.file?('/sys/devices/system/cpu/present')
-            range = File.read('/sys/devices/system/cpu/present').
-                chomp
-                
-            @processor_count = Integer(range.split('-').last) + 1
-        elsif File.file?('/proc/cpuinfo')
-            # Just count the numer of processor: \d lines
-            @processor_count = File.readlines('/proc/cpuinfo').
-                find_all { |l| l =~ /^processor\s+:\s+\d+$/ }.
-                count
+        if File.file?('/proc/cpuinfo')
+            cpuinfo = File.readlines('/proc/cpuinfo')
+            physical_ids, core_count, processor_ids = [], [], []
+            cpuinfo.each do |line|
+                case line
+                when /^processor\s+:\s+(\d+)$/
+                    processor_ids << Integer($1)
+                when /^physical id\s+:\s+(\d+)$/
+                    physical_ids << Integer($1)
+                when /^cpu cores\s+:\s+(\d+)$/
+                    core_count << Integer($1)
+                end
+            end
+            
+            # Try to count the number of physical cores, not the number of
+            # logical ones. If the info is not available, fallback to the
+            # logical count
+            if (physical_ids.size == core_count.size) && (physical_ids.size == processor_ids.size)
+                info = Array.new
+                while (id = physical_ids.shift)
+                    info[id] = core_count.shift
+                end
+                @processor_count = info.inject(&:+)
+            else
+                @processor_count = processor_ids.size
+            end
         else
             # Hug... What kind of system is it ?
             STDERR.puts "INFO: cannot autodetect the number of CPUs on this sytem"

data/lib/autobuild/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 89
   prerelease: 
   segments: 
   - 1
   - 5
-  - 43
-  version: 1.5.43
+  - 45
+  version: 1.5.45
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 Z
+date: 2011-08-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake