autobuild 1.2.5 → 1.2.6

data/Changes.txt

@@ -1,3 +1,7 @@
+== Version 1.2.6
+* really fix the dependency problem
+* add documentation support in autotools
+
 == Version 1.2.5
 * really fix the git fetch phase
 * fix a dependency issue between code generation and CMake configuration

data/bin/autobuild

@@ -40,8 +40,8 @@ begin
             targets  = ['doc']
         else
             targets  = ['import']
-            targets << 'doc' if Autobuild.do_doc
             targets += ['prepare', 'build'] if Autobuild.do_build
+            targets << 'doc' if Autobuild.do_doc
         end
         targets.each do |phase|
 	    packages = Autobuild.packages

data/lib/autobuild.rb

@@ -3,6 +3,6 @@ require 'autobuild/reporting'
 require 'autobuild/package'
 
 module Autobuild
-    VERSION = "1.2.5" unless defined? Autobuild::VERSION
+    VERSION = "1.2.6" unless defined? Autobuild::VERSION
 end
 

data/lib/autobuild/configurable.rb

@@ -47,6 +47,22 @@ module Autobuild
         def initialize(options)
             super
 
+            Autobuild.update_environment(prefix)
+        end
+
+        def depends_on(*packages)
+            super
+            stamps = packages.collect { |p| Package[p.to_s].installstamp }
+            file configurestamp => stamps
+        end
+
+        def ensure_dependencies_installed
+            dependencies.each do |pkg|
+                Rake::Task[Package[pkg].installstamp].invoke
+            end
+        end
+
+        def prepare
             file configurestamp do
                 ensure_dependencies_installed
                 configure
@@ -67,23 +83,6 @@ module Autobuild
                 install
                 Autobuild.update_environment(prefix)
             end
-
-            Autobuild.update_environment(prefix)
-        end
-
-        def depends_on(*packages)
-            super
-            stamps = packages.collect { |p| Package[p.to_s].installstamp }
-            file configurestamp => stamps
-        end
-
-        def ensure_dependencies_installed
-            dependencies.each do |pkg|
-                Rake::Task[Package[pkg].installstamp].invoke
-            end
-        end
-
-        def prepare
         end
 
         # Configure the builddir directory before starting make

data/lib/autobuild/package.rb

@@ -73,9 +73,6 @@ module Autobuild
 		    Autobuild.apply_post_install(name, @post_install)
 		end
 	    end
-	    task "#{name}-build" => installstamp
-	    task :build => "#{name}-build"
-
 	    # Add dependencies declared in spec
 	    depends_on *depends if depends
 
@@ -84,9 +81,12 @@ module Autobuild
 	    task :import => "#{name}-import"
 
 	    # Define the prepare task
-	    task "#{name}-prepare" do prepare end
+	    task "#{name}-prepare" => "#{name}-import" do prepare end
 	    task :prepare => "#{name}-prepare"
 
+	    task "#{name}-build" => ["#{name}-prepare", installstamp]
+	    task :build => "#{name}-build"
+
 	    task(name) do
 		Rake::Task["#{name}-import"].invoke
 		Rake::Task["#{name}-prepare"].invoke

data/lib/autobuild/packages/autotools.rb

@@ -44,7 +44,7 @@ module Autobuild
         # Build stamp
         # This returns the name of the file which marks when the package has been
         # successfully built for the last time. The path is absolute
-        def buildstamp; "#{builddir}/#{name}-#{STAMPFILE}" end
+        def buildstamp; "#{builddir}/#{STAMPFILE}" end
 
         def initialize(options)
             @using = Hash.new
@@ -54,6 +54,20 @@ module Autobuild
 
             Autobuild.update_environment(prefix)
         end
+        
+        def install_doc(relative_to = builddir)
+            super(relative_to)
+        end
+
+        # Declare that the given target can be used to generate documentation
+        def with_doc(target = 'doc')
+            doc_task do
+                Dir.chdir(builddir) do
+                    Subprocess.run(name, 'doc', Autobuild.tool(:make), target)
+                    yield if block_given?
+                end
+            end
+        end
 
 	# Overrides the default behaviour w.r.t. autotools script generation
 	#
@@ -139,6 +153,7 @@ module Autobuild
                 ensure_dependencies_installed
                 build
             end
+            task "#{name}-build" => installstamp
 
             file installstamp => buildstamp do 
                 install

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-16 00:00:00 +02:00
+date: 2008-10-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency