autobuild 0.6.2 → 0.6.3

data/{CHANGES → Changes.txt}

@@ -1,4 +1,10 @@
-= Autobuild ChangeLog
+== Version 0.6.3
+
+* CVS and SVN importing plugins check that the current working copy comes from
+  the right source
+* the autotools and genom package are now reconfiguring if the flags
+  (configureflags and/or genomflags) changed
+* bugfixes
 
 == Version 0.6.2
 

data/Manifest.txt

@@ -1,5 +1,5 @@
 bin/autobuild
-CHANGES
+Changes.txt
 lib/autobuild/config.rb
 lib/autobuild/environment.rb
 lib/autobuild/exceptions.rb

data/README.txt

@@ -1,3 +1,6 @@
+Autobuild
+    http://autobuild.rubyforge.org
+
 = Introduction
 
 == WARNING for 0.5 users
@@ -5,9 +8,12 @@ Old configuration files used with autobuild 0.5 aren't accepted by Autobuild 0.6
 uses Ruby for configuration (just like rake does)
 
 == What's autobuild ?
-Autobuild is a builder for a set of software packages. It takes as input a yaml config file as input and
+Autobuild imports, configures, builds and installs various kinds of software packages.
+It can be used in software development to make sure that nothing is broken in the 
+build process of a set of packages, or can be used as an automated installation tool.
 
-* imports the package from a SCM or (optionnaly) updates it
+Autobuild config files are Ruby scripts which configure rake to
+* import the package from a SCM or (optionnaly) updates it
 * configures it. This phase can handle code generation, configuration (for instance for autotools-based
 packages), ...
 * build
@@ -119,7 +125,7 @@ Where +options+ is an option hash. See also Autobuild::SVNImporter and Autobuild
 * by default, no options are given to update. You can add some by giving a +svnup+ option
     svn url, :svnup => ['--my', '--svn', '--options']
 
-=== *Darcs*
+=== Darcs
     package.importer = darcs(url[, options])
 
 Where +options+ is a hash. See also Autobuild::DarcsImporter and Autobuild.darcs

data/Rakefile

@@ -1,20 +1,15 @@
-require 'rubygems'
 require 'hoe'
+require './lib/autobuild'
 
-$:.unshift('lib')
-
-Hoe.new('autobuild', "0.6.2") do |p|
+Hoe.new('autobuild', Autobuild::VERSION) do |p|
     p.author = "Sylvain Joyeux"
     p.email = "sylvain.joyeux@m4x.org"
+
     p.summary = 'Rake-based utility to build and install multiple packages with dependencies'
-    p.url = "http://autobuild.rubyforge.org"
-    p.description = <<-EOF
-    Autobuild imports, configures, builds and installs various kinds of software packages.
-    It can be used in software development to make sure that nothing is broken in the 
-    build process of a set of packages, or can be used as an automated installation tool.
-    EOF
-    p.changes = p.paragraphs_of("CHANGES", 1).join("\n\n")
-    p.extra_deps << ['rake', '>= 0.7.0']
+    p.url	  = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
+    p.description = p.paragraphs_of('README.txt', 3..5).join("\n\n")
+    p.changes     = p.paragraphs_of("Changes.txt", 1).join("\n\n")
+    p.extra_deps = [['rake', '>= 0.7.0']]
     p.extra_deps << ['rmail']
     p.extra_deps << ['daemons']
 end

data/lib/autobuild.rb

@@ -1,3 +1,7 @@
+module Autobuild
+    VERSION = "0.6.3"
+end
+
 require 'autobuild/config'
 require 'autobuild/reporting'
 require 'autobuild/package'

data/lib/autobuild/import/cvs.rb

@@ -24,11 +24,15 @@ module Autobuild
 
         def update(package)
             Dir.chdir(package.srcdir) do
+		if !File.exists?("#{package.srcdir}/CVS/Root")
+		    raise ConfigException, "#{package.srcdir} does not look like a CVS checkout"
+		end
+
 		root = File.open("#{package.srcdir}/CVS/Root") { |io| io.read }.chomp
 		mod  = File.open("#{package.srcdir}/CVS/Repository") { |io| io.read }.chomp
 
 		if root != @root || mod != @module
-		    raise ArgumentError, "checkout in #{package.srcdir} is from #{root}:#{mod}, was expecting #{@root}:#{@mod}"
+		    raise ConfigException, "checkout in #{package.srcdir} is from #{root}:#{mod}, was expecting #{@root}:#{@module}"
 		end
                 Subprocess.run(package.name, :import, @program, 'up', *@options_up)
 	    end

data/lib/autobuild/import/svn.rb

@@ -19,7 +19,7 @@ module Autobuild
 		url =~ /URL: (.+)/
 		source = $1
 		if source != @source
-		    raise ArgumentError, "current checkout found at #{package.srcdir} is from #{source}, was expecting #{@source}"
+		    raise ConfigException, "current checkout found at #{package.srcdir} is from #{source}, was expecting #{@source}"
 		end
                 Subprocess.run(package.name, :import, @program, 'up', *@options_up)
             }

data/lib/autobuild/packages/autotools.rb

@@ -3,6 +3,7 @@ require 'autobuild/timestamps'
 require 'autobuild/environment'
 require 'autobuild/package'
 require 'autobuild/subcommand'
+require 'shellwords'
 
 module Autobuild
     def self.autotools(opts, &proc)
@@ -89,7 +90,26 @@ module Autobuild
         end
 
         def prepare
-            file "#{builddir}/config.status" => regen do
+	    # Check if config.status has been generated with the
+	    # same options than the ones in configureflags
+	    config_status = "#{builddir}/config.status"
+
+	    force_reconfigure = false
+	    if File.exists?(config_status)
+		output = IO.popen("#{config_status} --version").readlines.grep(/with options/).first.chomp
+		raise "invalid output of config.status --version" unless output =~ /with options "(.*)"$/
+		options = Shellwords.shellwords($1)
+
+		# Add the --prefix option to the configureflags array
+		testflags = ["--prefix=#{prefix}"] + Array[*configureflags]
+		old_opt = options.find { |o| !testflags.include?(o) }
+		new_opt = testflags.find { |o| !options.include?(o) }
+		if old_opt || new_opt
+		    File.rm_f config_status # to force reconfiguration
+		end
+	    end
+
+            file config_status => regen do
                 ensure_dependencies_installed
                 configure
             end
@@ -109,13 +129,15 @@ module Autobuild
 
     private
         # Adds a target to rebuild the autotools environment
-        def regen
-            conffile = "#{srcdir}/configure"
-            if confext = %w{.ac .in}.find { |ext| File.exists?("#{conffile}#{ext}") }
-                file conffile => "#{conffile}#{confext}"
-            else
-                raise PackageException.new(name), "neither configure.ac nor configure.in present in #{srcdir}"
-            end
+        def regen(confsource = nil)
+	    conffile = "#{srcdir}/configure"
+	    if confsource
+		file conffile => confsource
+	    elsif confext = %w{.ac .in}.find { |ext| File.exists?("#{conffile}#{ext}") }
+		file conffile => "#{conffile}#{confext}"
+	    else
+		raise PackageException.new(name), "neither configure.ac nor configure.in present in #{srcdir}"
+	    end
 
             file conffile do
                 Dir.chdir(srcdir) {
@@ -162,7 +184,7 @@ module Autobuild
             FileUtils.mkdir_p builddir if !File.directory?(builddir)
             Dir.chdir(builddir) {
                 command = [ "#{srcdir}/configure", "--no-create", "--prefix=#{prefix}" ]
-                command |= Array[*configureflags]
+                command += Array[*configureflags]
                 
                 Subprocess.run(name, 'configure', *command)
             }

data/lib/autobuild/packages/genom.rb

@@ -17,13 +17,16 @@ module Autobuild
 	    use :autogen => 'autogen'
         end
 
+	def import
+	    super
+	    get_provides
+	end
+
         # Called before running the rake tasks and
         # after all imports have been made
         def prepare
-
             super
-            get_requires
-            get_provides
+	    get_requires
         end
 
         # The file touched by genom on successful generation
@@ -97,6 +100,19 @@ module Autobuild
         def regen
             cmdline = [ 'genom', "#{name}.gen", *genomflags ]
 
+	    # Check that the module has been generated with the same flags
+	    genom_mk = "#{srcdir}/autoconf/genom.mk"
+	    if File.exists?(genom_mk)
+		contents = File.open(genom_mk).readlines
+		old_file = contents.find { |l| l =~ /^GENFILE/ }.gsub('GENFILE=', '').strip
+		old_flags = Shellwords.shellwords(
+			    contents.find { |l| l =~ /^GENFLAGS/ }.gsub('GENFLAGS=', ''))
+
+		if old_file != "#{name}.gen" || !(old_flags - genomflags).empty? || !(genomflags - old_flags).empty?
+		    File.rm_f genomstamp
+		end
+	    end
+
             file buildstamp => genomstamp
 	    file genomstamp => genom_dependencies
             file genomstamp => srcdir do
@@ -112,6 +128,8 @@ module Autobuild
                 # if .gen has changed
                 Dir.chdir(srcdir) { Subprocess.run(name, 'genom', File.expand_path('autogen')) }
             end
+
+	    super("#{srcdir}/autoconf/configure.ac")
         end
     end
 end

data/lib/autobuild/reporting.rb

@@ -22,7 +22,6 @@ module Autobuild
             begin
                 yield
             rescue Autobuild::Exception => e
-                raise unless e.kind_of?(Autobuild::Exception)
                 error(e)
                 exit(1) if e.fatal?
             end

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
-date: 2006-10-15 00:00:00 +02:00
+  version: 0.6.3
+date: 2006-11-22 00:00:00 +01:00
 summary: Rake-based utility to build and install multiple packages with dependencies
 require_paths: 
 - lib
-- test
 email: sylvain.joyeux@m4x.org
-homepage: http://autobuild.rubyforge.org
+homepage: "    http://autobuild.rubyforge.org"
 rubyforge_project: autobuild
-description: Autobuild imports, configures, builds and installs various kinds of software packages. It can be used in software development to make sure that nothing is broken in the  build process of a set of packages, or can be used as an automated installation tool.
+description: == What's autobuild ? Autobuild imports, configures, builds and installs various kinds of software packages. It can be used in software development to make sure that nothing is broken in the  build process of a set of packages, or can be used as an automated installation tool.  Autobuild config files are Ruby scripts which configure rake to * import the package from a SCM or (optionnaly) updates it * configures it. This phase can handle code generation, configuration (for instance for autotools-based packages), ... * build * install  It takes the dependencies between packages into account in its build process, updates the needed environment variables (+PKG_CONFIG_PATH+, +PATH+, +LD_LIBRARY_PATH+, ...)
 autorequire: 
 default_executable: 
 bindir: bin
@@ -26,11 +25,12 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Sylvain Joyeux
 files: 
 - bin/autobuild
-- CHANGES
+- Changes.txt
 - lib/autobuild/config.rb
 - lib/autobuild/environment.rb
 - lib/autobuild/exceptions.rb
@@ -63,8 +63,11 @@ files:
 - test/test_subcommand.rb
 - test/tools.rb
 - TODO
-test_files: []
-
+test_files: 
+- test/test_import_tar.rb
+- test/test_subcommand.rb
+- test/test_import_svn.rb
+- test/test_import_cvs.rb
 rdoc_options: []
 
 extra_rdoc_files: []
@@ -76,15 +79,6 @@ extensions: []
 requirements: []
 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.1
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rake
   version_requirement: