autobuild 1.5.8 → 1.5.9

data/Changes.txt

@@ -1,3 +1,8 @@
+== Version 1.5.9
+* small fixes
+* fixed some corner-case problems with log files not being created in the right
+  folders
+
 == Version 1.5.8
 * fix major issue while setting up dependencies
 * small 1.8/1.9 compatibility fix in Autotools#use

data/lib/autobuild.rb

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

data/lib/autobuild/configurable.rb

@@ -56,12 +56,6 @@ module Autobuild
         # successfully built for the last time. The path is absolute
         def buildstamp; "#{builddir}/#{STAMPFILE}" end
 
-        def initialize(options)
-            super
-
-            Autobuild.update_environment(prefix)
-        end
-
         def prepare_for_forced_build
             FileUtils.rm_f buildstamp
             FileUtils.rm_f configurestamp
@@ -102,7 +96,6 @@ module Autobuild
             task "#{name}-build" => buildstamp
 
             file installstamp => buildstamp
-            Autobuild.update_environment(prefix)
         end
 
         # Configure the builddir directory before starting make
@@ -120,11 +113,6 @@ module Autobuild
         # Do the build in builddir
         def build
         end
-
-        def install
-            super
-            Autobuild.update_environment(prefix)
-        end
     end
 end
 

data/lib/autobuild/import/git.rb

@@ -193,6 +193,20 @@ module Autobuild
             Status.new(status, fetch_commit, head_commit, common_commit)
         end
 
+        # Returns a hash that represents the whole import configuration
+        #
+        # The returned hash is:
+        #
+        #   'type' => 'git'
+        #   'url' => the_package_url
+        #   'tag' => current_commit_id
+        #
+        def current_state
+            return_value = { 'type' => 'git', 'url' => repository }
+            return_value
+        end
+
+
         def update(package)
             validate_srcdir(package)
             Dir.chdir(package.srcdir) do

data/lib/autobuild/importer.rb

@@ -62,6 +62,7 @@ class Importer
 		package.progress "updating %s"
                 update(package)
                 patch(package)
+                package.updated = true
             else
 		if Autobuild.verbose
 		    puts "  not updating #{package.name}"
@@ -76,6 +77,7 @@ class Importer
 		package.progress "checking out %s"
                 checkout(package)
                 patch(package)
+                package.updated = true
             rescue Autobuild::Exception
                 FileUtils.rm_rf package.srcdir
                 raise

data/lib/autobuild/package.rb

@@ -72,7 +72,7 @@ module Autobuild
 	# Absolute path to the installation directory. See #prefix=
 	def prefix; File.expand_path(@prefix || '', Autobuild.prefix) end
         # Absolute path to the log directory for this package. See #logdir=
-        def logdir; File.expand_path(@logdir || File.join('log', File.dirname(@srcdir || name)), prefix) end
+        def logdir; File.expand_path(@logdir || 'log', prefix) end
 
 	# The file which marks when the last sucessful install
 	# has finished. The path is absolute
@@ -82,6 +82,13 @@ module Autobuild
             File.join(logdir, "#{name}-#{STAMPFILE}")
         end
 
+        attr_writer :updated
+
+        # Returns true if this package has already been updated. It will not be
+        # true if the importer has been called while Autobuild.do_update was
+        # false.
+        def updated?; !!@updated end
+
 	def initialize(spec)
 	    @dependencies   = Array.new
 	    @provides       = Array.new
@@ -155,6 +162,10 @@ module Autobuild
 
 	    # Add the dependencies declared in spec
 	    depends_on *@spec_dependencies if @spec_dependencies
+
+            if File.directory?(prefix)
+                Autobuild.update_environment prefix
+            end
         end
 
         # Create all the dependencies required to reconfigure and/or rebuild the
@@ -169,8 +180,6 @@ module Autobuild
                 install
 	    end
             task "#{name}-build" => installstamp
-
-            Autobuild.update_environment prefix
         end
 
         # Display a progress message. %s in the string is replaced by the
@@ -195,6 +204,7 @@ module Autobuild
                 Autobuild.apply_post_install(name, @post_install)
             end
             Autobuild.touch_stamp(installstamp)
+            Autobuild.update_environment prefix
         end
 
         def run(*args, &block)
@@ -315,13 +325,20 @@ module Autobuild
                 raise ConfigException, "#{p.inspect} should be a string" if !p.respond_to? :to_str
 		p = p.to_str
 		next if p == name
-		unless Package[p]
+		unless pkg = Package[p]
 		    raise ConfigException.new(name), "package #{p} not defined"
 		end
-		task "#{name}-import"  => "#{p}-import"
-		task "#{name}-prepare" => "#{p}-prepare"
-		task "#{name}-build"   => "#{p}-build"
-		@dependencies << p
+
+                next if @dependencies.include?(pkg.name)
+
+                if Autobuild.verbose
+                    STDERR.puts "  #{name} depends on #{pkg.name}"
+                end
+
+		task "#{name}-import"  => "#{pkg.name}-import"
+		task "#{name}-prepare" => "#{pkg.name}-prepare"
+		task "#{name}-build"   => "#{pkg.name}-build"
+		@dependencies << pkg.name
 	    end
 	end
 
@@ -332,7 +349,14 @@ module Autobuild
                 raise ConfigException, "#{p.inspect} should be a string" if !p.respond_to? :to_str
 		p = p.to_str
 		next if p == name
+                next if @provides.include?(name)
+
 		@@provides[p] = self 
+
+                if Autobuild.verbose
+                    STDERR.puts "  #{name} provides #{p}"
+                end
+
 		task p => name
 		task "#{p}-import" => "#{name}-import"
 		task "#{p}-prepare" => "#{name}-prepare"

data/lib/autobuild/packages/autotools.rb

@@ -215,7 +215,7 @@ module Autobuild
         # Do the build in builddir
         def build
             Dir.chdir(builddir) do
-                progress "building %s"
+                progress "building %s [progress not available]"
                 Subprocess.run(self, 'build', './config.status')
                 Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}")
             end

data/lib/autobuild/packages/cmake.rb

@@ -145,6 +145,10 @@ module Autobuild
         def configure
             super do
                 Dir.chdir(builddir) do
+                    if !File.file?(File.join(srcdir, 'CMakeLists.txt'))
+                        raise ConfigException, "#{srcdir} contains no CMakeLists.txt file"
+                    end
+
                     command = [ "cmake", "-DCMAKE_INSTALL_PREFIX=#{prefix}" ]
                     defines.each do |name, value|
                         command << "-D#{name}=#{value}"

data/lib/autobuild/subcommand.rb

@@ -206,7 +206,7 @@ module Autobuild::Subprocess
                         STDOUT.print line
                     end
                     logfile.puts line
-                    if block_given?
+                    if !Autobuild.verbose && block_given?
                         yield(line)
                     end
                 end

data/lib/autobuild/timestamps.rb

@@ -60,6 +60,12 @@ module Autobuild
 
     def self.touch_stamp(stampfile)
         puts "Touching #{stampfile}" if Autobuild.debug
+        dir = File.dirname(stampfile)
+        if File.exists?(dir) && !File.directory?(dir)
+            raise "#{dir} exists and is not a directory"
+        elsif !File.exists?(dir)
+            FileUtils.mkdir_p dir
+        end
         FileUtils.touch(stampfile)
 
         # File modification times on most Unix filesystems have a granularity of

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.5.8
+  prerelease: false
+  segments: 
+  - 1
+  - 5
+  - 9
+  version: 1.5.9
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,79 +14,91 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 +02:00
+date: 2010-05-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rmail
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: daemons
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
         version: "0.0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: utilrb
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 3
         version: 2.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
-    version: 
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id006
 description: |-
   This work is licensed under the GPLv2 license. See License.txt for details
   
@@ -164,18 +181,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rake-based utility to build and install multiple packages with dependencies