autobuild 1.2.10 → 1.2.11

data/Changes.txt

@@ -1,3 +1,11 @@
+== Version 1.2.11
+* fix small issues with CMake
+  - CMake 2.6 can convert option values between what the user provides (for
+    instance YES) and what is written in the cache (ON). Take that into account
+  - if the first configuration fails, no Makefile is generated but
+    a CMakeCache.txt is there. Autobuild was failing in that situation and will
+    now handle it gracefully.
+
 == Version 1.2.10
 * small fix
   logs are sorted into subdirectories, following the structure of the

data/lib/autobuild.rb

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

data/lib/autobuild/packages/cmake.rb

@@ -45,23 +45,57 @@ module Autobuild
             end
         end
 
+        CMAKE_EQVS = {
+            'ON' => 'ON',
+            'YES' => 'ON',
+            'OFF' => 'OFF',
+            'NO' => 'OFF'
+        }
+        def equivalent_option_value?(old, new)
+            if old == new
+                true
+            else
+                old = CMAKE_EQVS[old]
+                new = CMAKE_EQVS[new]
+                if old && new
+                    old == new
+                else
+                    false
+                end
+            end
+        end
+
         def prepare
             super
 
             all_defines = defines.dup
             all_defines['CMAKE_INSTALL_PREFIX'] = prefix
 
+            if !File.exists?( File.join(builddir, 'Makefile') )
+                FileUtils.rm configurestamp
+            end
+
             if File.exists?(configurestamp)
                 cache = File.read(configurestamp)
                 did_change = all_defines.any? do |name, value|
                     cache_line = cache.find do |line|
                         line =~ /^#{name}:/
                     end
-                    if !cache_line || (cache_line.split("=")[1].chomp != value)
+
+                    value = value.to_s
+                    old_value = cache_line.split("=")[1].chomp if cache_line
+                    if !old_value || !equivalent_option_value?(old_value, value)
+                        if Autobuild.debug
+                            puts "option '#{name}' changed value: '#{old_value}' => '#{value}'"
+                        end
+                        
                         true
                     end
                 end
                 if did_change
+                    if Autobuild.debug
+                        puts "CMake configuration changed, forcing a reconfigure"
+                    end
                     FileUtils.rm configurestamp
                 end
             end
@@ -89,7 +123,7 @@ module Autobuild
         # Do the build in builddir
         def build
             Dir.chdir(builddir) do
-                if always_reconfigure
+                if always_reconfigure || !File.file?('Makefile')
                     Subprocess.run(name, 'build', Autobuild.tool(:cmake), '.')
                 end
                 Subprocess.run(name, 'build', Autobuild.tool(:make))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.2.10
+  version: 1.2.11
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-01 00:00:00 +02:00
+date: 2009-04-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.12.1
     version: 
 description: This work is licensed under the GPLv2 license. See License.txt for details  == 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 * imports 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+, ...)
 email: sylvain.joyeux@m4x.org