bake-toolkit 2.15.0 → 2.16.1

data/lib/blocks/executable.rb

@@ -104,8 +104,7 @@ module Bake
             cmdLineCheck = true
             reason = config_changed?(cmdLineFile)
           end
-          return true unless reason
-          
+            
           linker = @tcs[:LINKER]
     
           cmd = Utils.flagSplit(linker[:COMMAND], false) # g++
@@ -138,18 +137,23 @@ module Bake
           outPipe = (@mapfile and linker[:MAP_FILE_PIPE]) ? "#{@mapfile}" : nil
           cmdLinePrint << "> #{outPipe}" if outPipe
           
-          return true if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
-          
-          ToCxx.linkBlock
+          if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
+            success = true
+          else
+            ToCxx.linkBlock
+            
+            BlockBase.prepareOutput(@exe_name)
+            
+            printCmd(cmdLinePrint, "Linking #{@exe_name}", reason, false)
+            BlockBase.writeCmdLineFile(cmd, cmdLineFile)
+            success, consoleOutput = ProcessHelper.run(cmd, false, false, outPipe)
+            process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil, reason, success)
+      
+            check_config_file()
+          end
           
-          BlockBase.prepareOutput(@exe_name)
+          Bake::Bundle.instance.addBinary(@exe_name, @linker_script, isMainProject? ? @config : nil)
           
-          printCmd(cmdLinePrint, "Linking #{@exe_name}", reason, false)
-          BlockBase.writeCmdLineFile(cmd, cmdLineFile)
-          success, consoleOutput = ProcessHelper.run(cmd, false, false, outPipe)
-          process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil, reason, success)
-    
-          check_config_file()
           return success
         end
       end

data/lib/blocks/library.rb

@@ -66,7 +66,6 @@ module Bake
             cmdLineCheck = true
             reason = config_changed?(cmdLineFile)
           end
-          return true unless reason
           archiver = @tcs[:ARCHIVER]
        
           cmd = Utils.flagSplit(archiver[:COMMAND], false) # ar
@@ -81,15 +80,20 @@ module Bake
           
           cmd += @compileBlock.objects
         
-          return true if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
-        
-          BlockBase.prepareOutput(@archive_name)
+          if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
+            success = true
+          else
+            BlockBase.prepareOutput(@archive_name)
+            
+            BlockBase.writeCmdLineFile(cmd, cmdLineFile)
+            success, consoleOutput = ProcessHelper.run(cmd, false, false)
+            process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{@archive_name}", reason, success)
+           
+            check_config_file()
+          end
+          
+          Bake::Bundle.instance.addLib(@archive_name, isMainProject? ? @config : nil)
           
-          BlockBase.writeCmdLineFile(cmd, cmdLineFile)
-          success, consoleOutput = ProcessHelper.run(cmd, false, false)
-          process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{@archive_name}", reason, success)
-         
-          check_config_file()
           return success
         end
       end

data/lib/common/ext/rtext.rb

@@ -0,0 +1,11 @@
+require 'rtext/serializer'
+
+module RText
+  class Serializer
+    alias :old_serialize_values :serialize_values
+    def serialize_values(element, feature)
+      return nil unless element.eIsSet(feature.name)
+      old_serialize_values(element, feature)
+    end
+  end
+end

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.15.0"
+      "2.16.1"
     end
   end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.16.1
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -77,6 +77,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/adapt/config/loader.rb
+- lib/bake/bundle.rb
 - lib/bake/cache.rb
 - lib/bake/config/checks.rb
 - lib/bake/config/loader.rb
@@ -144,6 +145,7 @@ files:
 - lib/common/cleanup.rb
 - lib/common/exit_helper.rb
 - lib/common/ext/file.rb
+- lib/common/ext/rtext.rb
 - lib/common/ext/stdout.rb
 - lib/common/ide_interface.rb
 - lib/common/options/parser.rb
@@ -224,6 +226,7 @@ files:
 - documentation/_build/html/_sources/syntax/project_meta_syntax.txt
 - documentation/_build/html/_sources/syntax/syntax.txt
 - documentation/_build/html/_sources/syntax/variable_substitutions.txt
+- documentation/_build/html/_sources/tips_and_tricks/bundle.txt
 - documentation/_build/html/_sources/tips_and_tricks/how_to_use_bake_with_cygwin.txt
 - documentation/_build/html/_sources/tips_and_tricks/static_code_analysis.txt
 - documentation/_build/html/_sources/tips_and_tricks/the_bakery.txt
@@ -420,6 +423,7 @@ files:
 - documentation/_build/html/syntax/project_meta_syntax.html
 - documentation/_build/html/syntax/syntax.html
 - documentation/_build/html/syntax/variable_substitutions.html
+- documentation/_build/html/tips_and_tricks/bundle.html
 - documentation/_build/html/tips_and_tricks/how_to_use_bake_with_cygwin.html
 - documentation/_build/html/tips_and_tricks/static_code_analysis.html
 - documentation/_build/html/tips_and_tricks/the_bakery.html