build-tool 0.6.5 → 0.6.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    build-tool (0.6.4)
+    build-tool (0.6.6)
       activerecord (>= 3.2.1)
       ansi (>= 1.4.2)
       grit (>= 2.4.1)
@@ -12,41 +12,42 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.3)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    ansi (1.4.2)
+    ansi (1.4.3)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.4)
     diff-lcs (1.1.3)
     grit (2.5.0)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
       posix-spawn (~> 0.3.6)
-    i18n (0.6.0)
-    inifile (1.1.0)
+    i18n (0.6.1)
+    inifile (2.0.2)
     little-plugger (1.1.3)
-    logging (1.7.2)
+    logging (1.8.0)
       little-plugger (>= 1.1.3)
-    mime-types (1.18)
-    multi_json (1.3.6)
+      multi_json (>= 1.3.6)
+    mime-types (1.19)
+    multi_json (1.4.0)
     posix-spawn (0.3.6)
-    racc (1.4.7)
-    rake (0.9.2.2)
+    racc (1.4.9)
+    rake (10.0.2)
     rexical (1.0.5)
     sqlite3 (1.3.6)
-    turn (0.9.3)
+    turn (0.9.6)
       ansi
-    tzinfo (0.3.33)
-    yard (0.7.5)
+    tzinfo (0.3.35)
+    yard (0.8.3)
 
 PLATFORMS
   ruby

data/History.rdoc

@@ -1,3 +1,9 @@
+== Version 0.6.6
+=== Enhancements
+- cmake: Make it possible to set option not starting with -D
+         ATTENTION: Requires changes to the recipe
+- build-systems: Make it possible to unset options.
+
 == Version 0.6.5
 === Enhancements
 - Archive Buildsystem now supports bzip2 compressed archives.

data/KNOWN_PROBLEMS

@@ -1,2 +1,12 @@
 cmd files <doesnotexist>
     > Unhandled exception
+
+archive: tar.bz2 not supported
+
+use environment not_existing gives no error, warning
+
+custom build-system: reconfigure not supported
+
+
+<sreich> mjansen: only thing i ran into that i'd like would be a way to force a cmake switch for one module temporarily
+<sreich> e.g. kde-build build something -DCMAKE_CXX_COMPILER

data/lib/build-tool/build-system/base.rb

@@ -69,26 +69,28 @@ def option_hash
             end
             # If this build-system declaration is not active we are done
             if active?
-                return parent_option_hash.merge( @options )
+                rc = parent_option_hash.merge( @options )
             else
-                return parent_option_hash
+                rc = parent_option_hash
             end
+            rc.delete_if { |k, v| v.nil? }
         end
 
         def option_names
             # Check the parents names (if any)
             par = parent
             if par
-                parent_option_names = par.option_names
+                parent_option_hash = par.option_hash
             else
-                parent_option_names = []
+                parent_option_hash = {}
             end
             # If this build-system declaration is not active we are done
             if active?
-                return  ( @options.keys + parent_option_names ).uniq
+                rc = parent_option_hash.merge( @options )
             else
-                return parent_option_names
+                rc = parent_option_hash
             end
+            return rc.keys
         end
 
         def to_s
@@ -104,6 +106,10 @@ def active?
         end
 
         def []( var )
+            # Check if the value is explicitly set to None
+            if @options.has_key?( var ) and @options[ var ].nil?
+                return "<unset>"
+            end
             # Get the parents value (if any)
             par = parent
             if par and par.option_set?( var )

data/lib/build-tool/build-system/cmake.rb

@@ -102,7 +102,11 @@ def option_string
             arr = []
             option_names.each do |var|
                 val = self[var]
-                arr << "-D#{var}='#{val}'"
+                if var.start_with? 'D'
+                    arr << "-#{var}='#{val}'"
+                else
+                    arr << "-#{var}'#{val}'"
+                end
             end
             arr.join(" ")
         end

data/lib/build-tool/build-system/qmake.rb

@@ -72,8 +72,7 @@ def make( target = nil )
 
         def option_string
             arr = []
-            option_names.each do |var|
-                val = self[var]
+            option_hash.each do |var, val|
                 arr << "#{var}='#{val}'"
             end
             arr.join(" ")

data/lib/build-tool/cfg/lexer.rex

@@ -116,6 +116,7 @@ rule
     :BUILD_SYSTEM prepend { [:PREPEND, text]; }
     :BUILD_SYSTEM append  { [:APPEND,  text]; }
     :BUILD_SYSTEM set     { [:SET,     text]; }
+    :BUILD_SYSTEM unset   { [:UNSET,   text]; }
     :BUILD_SYSTEM inplace { [:INPLACE, text]; }
     :BUILD_SYSTEM end\b   { @state = @states.pop; [ :END, text ]; }
     # COMMON

data/lib/build-tool/cfg/parser.y

@@ -48,6 +48,7 @@ class BuildTool::Cfg::Parser < BuildTool::Cfg::Lexer
     token TEXT
     token TOKEN
     token TRACK
+    token UNSET
     token URL
     token USE
     token USER
@@ -162,7 +163,8 @@ rule
         ;
 
     build_system_statement
-        : OPTION identifier         STRING { result = BuildSystemOptionNode.new( val[1..-1] ); }
+        : OPTION identifier UNSET          { result = BuildSystemOptionNode.new( val[1..-1] ); }
+        | OPTION identifier         STRING { result = BuildSystemOptionNode.new( val[1..-1] ); }
         | OPTION identifier SET     STRING { result = BuildSystemOptionNode.new( val[1..-1] ); }
         | OPTION identifier PREPEND STRING { result = BuildSystemOptionNode.new( val[1..-1] ); }
         | OPTION identifier APPEND  STRING { result = BuildSystemOptionNode.new( val[1..-1] ); }

data/lib/build-tool/cfg/visitor.rb

@@ -65,7 +65,11 @@ def visit_BuildSystemOptionNode( node )
                 else raise StandardError, "Unexpected token #{node.values[1]}!"
                 end
             when 2
-                @build_system.set( node.values[0], node.values[1] )
+                case node.values[1]
+                when 'unset';   @build_system.set( node.values[0], nil )
+                else
+                    @build_system.set( node.values[0], node.values[1] )
+                end
             else
                 raise StandardError, "Unexpected number of tokens #{node.values.length} #{node.values.join(', ')}"
             end

data/lib/build-tool/model/module.rb

@@ -288,11 +288,15 @@ def state_char
         def last_success
             return @last_success if @last_success
             lastlog = BuildTool::History::CommandLog.last_success_by_module( name )
-            if lastlog.nil?
-                @last_success = DateTime.new
-            else
+
+            if not lastlog.nil?
                 @last_success = lastlog[:finished_at]
             end
+
+            if @last_success.nil?
+                @last_success = DateTime.new
+            end
+
             return @last_success
         end
 

data/lib/build-tool/version.rb

@@ -26,5 +26,5 @@ def recipe_version()
 
     end
 
-    VERSION = Version.new( 0, 6, 5 )
+    VERSION = Version.new( 0, 6, 6 )
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: build-tool
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Michael Jansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-03 00:00:00 +02:00
+date: 2012-12-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency