autobuild 1.4.4 → 1.4.5

data/Changes.txt

@@ -1,3 +1,13 @@
+== Version 1.4.5
+* add support for zip in TarImporter, which is renamed ArchiveImporter to
+  reflect that. Backward compatibility is retained.
+* support sourceforge-like setups in ArchiveImporter: use wget for download and
+  add a :filename option to specify what is the name of the downloaded file.
+* improve configurability of the progress display for tools built on top of
+  autobuild
+* always call with_doc in orogen packages, as orogen itself adds a documentation
+  target
+
 == Version 1.4.4
 * minor bug fixes
 

data/lib/autobuild.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.4.4" unless defined? Autobuild::VERSION
+    VERSION = "1.4.5" unless defined? Autobuild::VERSION
 end
 
 require 'autobuild/config'
@@ -11,6 +11,7 @@ require 'autobuild/import/darcs'
 require 'autobuild/importer'
 require 'autobuild/import/git'
 require 'autobuild/import/svn'
+require 'autobuild/import/archive'
 require 'autobuild/import/tar'
 require 'autobuild/packages/autotools'
 require 'autobuild/packages/cmake'

data/lib/autobuild/configurable.rb

@@ -84,6 +84,7 @@ module Autobuild
 
             Autobuild.source_tree srcdir do |pkg|
 		pkg.exclude << Regexp.new("^#{Regexp.quote(builddir)}")
+                pkg.exclude << Regexp.new("^#{doc_dir}") if doc_dir
 	    end
 
             file buildstamp => [ srcdir, configurestamp ] do 

data/lib/autobuild/import/git.rb

@@ -74,7 +74,7 @@ module Autobuild
         # repository
         def validate_srcdir(package)
             if !File.directory?(File.join(package.srcdir, '.git'))
-                raise ConfigException, "#{Dir.pwd} is not a git repository"
+                raise ConfigException, "while importing #{package.name}, #{Dir.pwd} is not a git repository"
             end
         end
 
@@ -202,7 +202,7 @@ module Autobuild
                 status = merge_status(fetch_commit)
                 if status.needs_update?
                     if !merge? && status.status == Status::NEEDS_MERGE
-                        raise PackageException, "importing the current version would require a merge"
+                        raise PackageException, "importing the current version of #{package.name} would require a merge"
                     end
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'merge', fetch_commit)
                 end

data/lib/autobuild/import/tar.rb

@@ -1,145 +1 @@
-require 'autobuild/importer'
-require 'open-uri'
-
-module Autobuild
-    class TarImporter < Importer
-	# The tarball is not compressed
-        Plain = 0
-	# The tarball is compressed with gzip
-        Gzip  = 1
-	# The tarball is compressed using bzip
-        Bzip  = 2
-
-        TAR_OPTION = {
-            Plain => '',
-            Gzip => 'z',
-            Bzip => 'j'
-        }
-
-	# Known URI schemes for +url+
-        VALID_URI_SCHEMES = [ 'file', 'http', 'https', 'ftp' ]
-
-	# Returns the unpack mode from the file name
-        def self.url_to_mode(url)
-            ext = File.extname(url)
-            unless ext == '.tar'
-                raise "Invalid file type in #{url}" unless File.basename(url, ext) != '.tar'
-            end
-            mode =  case ext
-                        when '.tar'; Plain
-                        when '.gz';  Gzip
-			when '.tgz'; Gzip
-                        when '.bz2'; Bzip
-                    end
-
-            mode
-        end
-
-	# Updates the downloaded file in cache only if it is needed
-        def update_cache
-            do_update = true
-
-            if File.file?(cachefile)
-                cached_size = File.lstat(cachefile).size
-                cached_mtime = File.lstat(cachefile).mtime
-
-                size, mtime = nil
-                open @url, :content_length_proc => lambda { |size| } do |file| 
-                    mtime = file.last_modified
-                end
-
-                if mtime && size
-                    do_update = (size != cached_size || mtime > cached_mtime)
-                elsif mtime
-                    $stderr.puts "WARNING: size is not available for #{@url}, relying on modification time"
-                    do_update = (mtime > cached_mtime)
-                elsif size
-                    $stderr.puts "WARNING: modification time is not available for #{@url}, relying on size"
-                    do_update = (size != cached_size)
-                else
-                    $stderr.puts "WARNING: neither size nor modification time available for #{@url}, will always update"
-                end
-            end
-
-            if do_update
-                puts "downloading #{url}"
-                FileUtils.mkdir_p(cachedir)
-                File.open(cachefile, 'w') do |cache|
-                    open @url do |file|
-                        while block = file.read(4096)
-                            cache.write block
-                        end
-                    end
-                end
-                true
-            end
-        end
-
-	# Sets the source URL and update +cachefile+ and +mode+ attributes accordingly.
-        def url=(url)
-            @url = URI.parse(url)
-            raise ConfigException, "invalid URL #{@url}" unless VALID_URI_SCHEMES.include?(@url.scheme)
-
-            @mode = TarImporter.url_to_mode(url)
-            if @url.scheme == 'file'
-                @cachefile = @url.path
-            else
-                @cachefile = File.join(cachedir, File.basename(@url.path))
-            end
-        end
-
-	# The source URL
-        attr_reader :url
-	# The local file (either a downloaded file if +url+ is not local, or +url+ itself)
-	attr_reader :cachefile
-	# The unpack mode. One of Bzip, Gzip or Plain
-	attr_reader :mode
-	# The directory in which remote files are cached
-        def cachedir; @options[:cachedir] end
-	# The directory contained in the tar file
-	def tardir; @options[:tardir] end
-
-	# Creates a new importer which downloads +url+ in +cachedir+ and unpacks it. The following options
-	# are allowed:
-	# [:cachedir] the cache directory. Defaults to "#{Autobuild.prefix}/cache"
-	# [:tardir]   the directory contained in the tar file. If set, the importer will rename that directory
-	#             to make it match Package#srcdir
-        def initialize(url, options)
-            @options = options.dup
-            @options[:cachedir] ||= "#{Autobuild.prefix}/cache"
-            self.url = url
-        end
-
-        def update(package) # :nodoc:
-            checkout(package) if update_cache
-        rescue OpenURI::HTTPError
-            raise Autobuild::Exception.new(package.name, :import)
-        end
-
-        def checkout(package) # :nodoc:
-            update_cache
-
-            base_dir = File.dirname(package.srcdir)
-            FileUtils.mkdir_p base_dir
-            cmd = [ 'tar', "x#{TAR_OPTION[mode]}f", cachefile, '-C', base_dir ]
-
-            Subprocess.run(package, :import, *cmd)
-	    if tardir
-		File.mv File.join(base_dir, tardir), package.srcdir
-	    end
-
-        rescue OpenURI::HTTPError
-            raise Autobuild::Exception.new(package.name, :import)
-        rescue SubcommandFailed
-            FileUtils.rm_f cachefile
-            raise
-        end
-    end
-
-    # Creates an importer which downloads a tarball from +source+ and unpacks
-    # it. The allowed values in +options+ are described in TarImporter.new.
-    def self.tar(source, options = {})
-	TarImporter.new(source, options)
-    end
-end
-
+require 'autobuild/import/archive'

data/lib/autobuild/importer.rb

@@ -52,7 +52,7 @@ class Autobuild::Importer
         srcdir = package.srcdir
         if File.directory?(srcdir)
             if Autobuild.do_update
-		Autobuild.progress "updating #{package.name}"
+		package.progress "updating %s"
                 update(package)
                 patch(package)
             else
@@ -66,7 +66,7 @@ class Autobuild::Importer
             raise ConfigException, "#{srcdir} exists but is not a directory"
         else
             begin
-		Autobuild.progress "checking out #{package.name}"
+		package.progress "checking out %s"
                 checkout(package)
                 patch(package)
             rescue Autobuild::Exception
@@ -105,7 +105,7 @@ class Autobuild::Importer
                         end
 
 	if !patches.empty?
-	    Autobuild.progress "patching #{package.name}"
+	    package.progress "patching %s"
 	end
 
         # Do not be smart, remove all already applied patches

data/lib/autobuild/package.rb

@@ -120,7 +120,7 @@ module Autobuild
 		Rake::Task["#{name}-import"].invoke
 		Rake::Task["#{name}-prepare"].invoke
 		Rake::Task["#{name}-build"].invoke
-                if has_doc? && !Autobuild.no_doc
+                if has_doc? && Autobuild.do_doc
                     Rake::Task["#{name}-doc"].invoke
                 end
 	    end
@@ -168,6 +168,22 @@ module Autobuild
             Autobuild.update_environment prefix
         end
 
+        # Display a progress message. %s in the string is replaced by the
+        # package name
+        def progress(msg)
+            Autobuild.progress(msg % [name])
+        end
+
+        # Display a progress message, and later on update it with a progress
+        # value. %s in the string is replaced by the package name
+        def progress_with_value(msg)
+            Autobuild.progress_with_value(msg % [name])
+        end
+
+        def progress_value(value)
+            Autobuild.progress_value(value)
+        end
+
         # Directory in which the documentation target will have generated the
         # documentation (if any). The interpretation of relative directories
         # is package-specific. The default implementation interpret them

data/lib/autobuild/packages/autotools.rb

@@ -62,7 +62,7 @@ module Autobuild
         def with_doc(target = 'doc')
             doc_task do
                 Dir.chdir(builddir) do
-                    Autobuild.progress "generating documentation for #{name}"
+                    progress "generating documentation for %s"
                     Subprocess.run(self, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target)
                     yield if block_given?
                 end
@@ -182,7 +182,7 @@ module Autobuild
                         using[:autogen] = %w{autogen autogen.sh}.find { |f| File.exists?(f) }
                     end
 
-                    Autobuild.progress "generating build system for #{name}"
+                    progress "generating build system for %s"
                     if using[:autogen]
                         Subprocess.run(self, 'configure', File.expand_path(using[:autogen]))
                     else
@@ -224,7 +224,7 @@ module Autobuild
                 command = [ "#{srcdir}/configure", "--no-create", "--prefix=#{prefix}" ]
                 command += Array[*configureflags]
                 
-                Autobuild.progress "configuring build system for #{name}"
+                progress "configuring build system for %s"
                 Subprocess.run(self, 'configure', *command)
             }
         end
@@ -232,7 +232,7 @@ module Autobuild
         # Do the build in builddir
         def build
             Dir.chdir(builddir) do
-                Autobuild.progress "building #{name}"
+                progress "building %s"
                 Subprocess.run(self, 'build', './config.status')
                 Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}")
             end
@@ -242,7 +242,7 @@ module Autobuild
         # Install the result in prefix
         def install
             Dir.chdir(builddir) do
-                Autobuild.progress "installing #{name}"
+                progress "installing %s"
                 Subprocess.run(self, 'install', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
             end
             Autobuild.touch_stamp(installstamp)

data/lib/autobuild/packages/cmake.rb

@@ -63,7 +63,7 @@ module Autobuild
         def with_doc(target = 'doc')
             doc_task do
                 Dir.chdir(builddir) do
-                    Autobuild.progress "generating documentation for #{name}"
+                    progress "generating documentation for %s"
                     Subprocess.run(self, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target)
                     yield if block_given?
                 end
@@ -149,7 +149,7 @@ module Autobuild
                 end
                 command << srcdir
                 
-                Autobuild.progress "generating and configuring build system for #{name}"
+                progress "generating and configuring build system for %s"
                 if full_reconfigures?
                     FileUtils.rm_f configurestamp
                 end
@@ -161,13 +161,13 @@ module Autobuild
         # Do the build in builddir
         def build
             Dir.chdir(builddir) do
-                Autobuild.progress_with_value "building #{name}"
+                progress_with_value "building %s"
                 if always_reconfigure || !File.file?('Makefile')
                     Subprocess.run(self, 'build', Autobuild.tool(:cmake), '.')
                 end
                 Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}") do |line|
                     if line =~ /\[\s+(\d+)%\]/
-                        Autobuild.progress_value Integer($1)
+                        progress_value Integer($1)
                     end
                 end
             end
@@ -177,7 +177,7 @@ module Autobuild
         # Install the result in prefix
         def install
             Dir.chdir(builddir) do
-                Autobuild.progress "installing #{name}"
+                progress "installing %s"
                 Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
                 Autobuild.update_environment prefix
             end

data/lib/autobuild/packages/genom.rb

@@ -135,7 +135,7 @@ module Autobuild
 	    file genomstamp => genom_dependencies
             file genomstamp => srcdir do
                 Dir.chdir(srcdir) do
-                    Autobuild.progress "generating GenoM files for #{name}"
+                    progress "generating GenoM files for %s"
                     Subprocess.run(self, 'genom', *cmdline)
 		end
             end
@@ -145,7 +145,7 @@ module Autobuild
                 # configure does not depend on the .gen file
                 # since the generation takes care of rebuilding configure
                 # if .gen has changed
-                Autobuild.progress "generating build system for #{name}"
+                progress "generating build system for %s"
                 Dir.chdir(srcdir) { Subprocess.run(self, 'genom', File.expand_path('autogen')) }
             end
 

data/lib/autobuild/packages/import.rb

@@ -21,7 +21,11 @@ module Autobuild
         def prepare
             super
 
+            exclude = self.exclude.dup
 	    exclude << Regexp.new("^#{Regexp.quote(installstamp)}")
+            if doc_dir
+                exclude << Regexp.new("^#{doc_dir}")
+            end
 
             Autobuild.source_tree(srcdir) do |pkg|
 		pkg.exclude.concat exclude

data/lib/autobuild/packages/orogen.rb

@@ -246,6 +246,8 @@ module Autobuild
             file genstamp => File.join(srcdir, orogen_file) do
                 regen
             end
+
+            with_doc
         end
         def genstamp; File.join(srcdir, '.orogen', 'orogen-stamp') end
 
@@ -254,7 +256,7 @@ module Autobuild
             cmdline << '--corba' if corba
             cmdline << orogen_file
 
-            Autobuild.progress "generating oroGen project #{name}"
+            progress "generating oroGen project %s"
             Dir.chdir(srcdir) do
                 Subprocess.run self, 'orogen', *cmdline
                 Autobuild.touch_stamp genstamp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 +01:00
+date: 2009-12-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.4.0
     version: 
 description: |-
   This work is licensed under the GPLv2 license. See License.txt for details