bake-toolkit 2.19.2 → 2.20.1

data/lib/blocks/executable.rb

@@ -1,11 +1,11 @@
 require 'blocks/blockBase'
 
 module Bake
-  
+
   module Blocks
-    
+
     class Executable < BlockBase
-      
+
       def initialize(block, config, referencedConfigs, tcs, compileBlock)
         super(block, config, referencedConfigs, tcs)
         @compileBlock = compileBlock
@@ -15,59 +15,59 @@ module Bake
         calcLinkerScript
 
       end
-      
+
       def calcLinkerScript
-        @linker_script = @config.linkerScript.nil? ? nil : @block.convPath(@config.linkerScript) 
+        @linker_script = @config.linkerScript.nil? ? nil : @block.convPath(@config.linkerScript)
       end
-      
+
       def calcArtifactName
-        if not @config.artifactName.nil? and @config.artifactName.name != "" 
+        if not @config.artifactName.nil? and @config.artifactName.name != ""
           baseFilename = @config.artifactName.name
         else
           baseFilename = "#{@projectName}#{@tcs[:LINKER][:OUTPUT_ENDING]}"
         end
         @exe_name ||= File.join([@output_dir, baseFilename])
       end
-      
+
       def calcCmdlineFile()
         @exe_name + ".cmdline"
       end
-      
+
       def calcMapFile
         @mapfile = nil
         if (not Bake.options.docu) and (not Bake.options.lint) and (not @config.mapFile.nil?)
           if @config.mapFile.name == ""
             @mapfile = @exe_name.chomp(File.extname(@exe_name)) + ".map"
           else
-            @mapfile = @config.mapFile.name 
+            @mapfile = @config.mapFile.name
           end
         end
       end
-      
+
       def ignore?
         Bake.options.prepro
       end
-      
+
       def needed?(libs)
         return "because linkOnly was specified" if Bake.options.linkOnly
-        
+
         # exe
         return "because executable does not exist" if not File.exists?(@exe_name)
 
         eTime = File.mtime(@exe_name)
-        
+
         # linkerscript
         if @linker_script
           return "because linker script does not exist - will most probably result in an error" if not File.exists?(@linker_script)
           return "because linker script is newer than executable" if eTime < File.mtime(@linker_script)
         end
-        
+
         # sources
         @compileBlock.objects.each do |obj|
           return "because object #{obj} does not exist" if not File.exists?(obj)
           return "because object #{obj} is newer than executable" if eTime < File.mtime(obj)
         end
-        
+
         # libs
         libs.each do |lib|
           return "because library #{lib} does not exist" if not File.exists?(lib)
@@ -75,12 +75,12 @@ module Bake
         end
         false
       end
-            
+
       def execute
         Dir.chdir(@projectDir) do
-          childs = getBlocks(:childs)
+          childs = @block.getBlocks(:childs)
           return false if childs.any? { |b| b.result == false }
-            
+
           allSources = []
           (childs + [@block]).each do |b|
             Dir.chdir(b.projectDir) do
@@ -91,28 +91,28 @@ module Bake
           end
           duplicateSources = allSources.group_by{ |e| e }.select { |k, v| v.size > 1 }.map(&:first)
           duplicateSources.each do |d|
-            Bake.formatter.printWarning("Source compiled more than once: #{d}") 
+            Bake.formatter.printWarning("Source compiled more than once: #{d}")
           end
-                    
+
           libs, linker_libs_array = LibElements.calc_linker_lib_string(@block, @tcs)
-          
+
           cmdLineCheck = false
           cmdLineFile = calcCmdlineFile()
-          
+
           return true if ignore?
           reason = needed?(libs)
           if not reason
             cmdLineCheck = true
             reason = config_changed?(cmdLineFile)
           end
-            
+
           linker = @tcs[:LINKER]
-    
+
           cmd = Utils.flagSplit(linker[:COMMAND], false) # g++
           cmd += linker[:MUST_FLAGS].split(" ")
           cmd += Bake::Utils::flagSplit(linker[:FLAGS],true)
-          
-            
+
+
           cmd << linker[:EXE_FLAG]
           if linker[:EXE_FLAG_SPACE]
             cmd << @exe_name
@@ -124,52 +124,52 @@ module Bake
           cmd << linker[:SCRIPT] if @linker_script # -T
           cmd << @linker_script if @linker_script # xy/xy.dld
           cmd += linker[:MAP_FILE_FLAG].split(" ") if @mapfile # -Wl,-m6
-          if not linker[:MAP_FILE_PIPE] and @mapfile 
-            cmd[cmd.length-1] << @mapfile 
+          if not linker[:MAP_FILE_PIPE] and @mapfile
+            cmd[cmd.length-1] << @mapfile
           end
           cmd += Bake::Utils::flagSplit(linker[:LIB_PREFIX_FLAGS],true) # "-Wl,--whole-archive "
           cmd += linker_libs_array
           cmd += Bake::Utils::flagSplit(linker[:LIB_POSTFIX_FLAGS],true) # "-Wl,--no-whole-archive "
-    
+
           mapfileStr = (@mapfile and linker[:MAP_FILE_PIPE]) ? " >#{@mapfile}" : ""
-    
+
           # pre print because linking can take much time
           cmdLinePrint = cmd.dup
           outPipe = (@mapfile and linker[:MAP_FILE_PIPE]) ? "#{@mapfile}" : nil
           cmdLinePrint << "> #{outPipe}" if outPipe
-          
+
           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
-          
+
           Bake::Bundle.instance.addBinary(@exe_name, @linker_script, isMainProject? ? @config : nil)
-          
+
           return success
         end
       end
-      
+
       def clean
         Dir.chdir(@projectDir) do
-          if File.exist?@output_dir 
+          if File.exist?@output_dir
             puts "Deleting folder #{@output_dir}" if Bake.options.verbose >= 2
             FileUtils.rm_rf(@output_dir)
           end
         end unless Bake.options.filename
         return true
       end
-      
+
     end
-    
+
   end
 end

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -40,15 +40,15 @@ module Bake
 
   class SystemCommandFailed < Exception
   end
-  
+
   class ToCxx
-    
+
     @@linkBlock = 0
 
     def self.linkBlock
       @@linkBlock = 1
     end
-    
+
     def initialize
       @configTcMap = {}
     end
@@ -58,7 +58,7 @@ module Bake
         configs.each do |config|
           tcs = Utils.deep_copy(@defaultToolchain)
           @configTcMap[config] = tcs
-        end  
+        end
       end
     end
 
@@ -66,23 +66,23 @@ module Bake
       @loadedConfig.referencedConfigs.each do |projName, configs|
         configs.each do |config|
           integrateToolchain(@configTcMap[config], config.toolchain)
-        end  
+        end
       end
     end
-        
+
     def substVars
       Subst.itute(@mainConfig, Bake.options.main_project_name, true, @configTcMap[@mainConfig], @loadedConfig, @configTcMap)
       @loadedConfig.referencedConfigs.each do |projName, configs|
         configs.each do |config|
-          if config != @mainConfig 
+          if config != @mainConfig
             Subst.itute(config, projName, false, @configTcMap[config], @loadedConfig, @configTcMap)
-          end 
-        end  
+          end
+        end
       end
     end
-    
 
-    
+
+
     def addSteps(block, blockSteps, configSteps)
       Array(configSteps.step).each do |step|
         if Bake::Metamodel::Makefile === step
@@ -102,53 +102,205 @@ module Bake
             block.childs << blockRef
             blockRef.parents << block
             break
-          end  
+          end
+        end
+      end
+    end
+
+    def calcPrebuildBlocks
+      @loadedConfig.referencedConfigs.each do |projName, configs|
+        configs.each do |config|
+          if config.prebuild
+            @prebuild ||= {}
+            config.prebuild.except.each do |except|
+              pName = projName
+              if not except.name.empty?
+                if not @loadedConfig.referencedConfigs.keys.include? except.name
+                  Bake.formatter.printWarning("Warning: prebuild project #{except.name} not found")
+                  next
+                end
+                pName = except.name
+              end
+              if except.config != "" && !@loadedConfig.referencedConfigs[pName].any? {|config| config.name == except.config}
+                Bake.formatter.printWarning("Warning: prebuild config #{except.config} of project #{pName} not found")
+                next
+              end
+
+              if not @prebuild.include?pName
+                @prebuild[pName] = [except.config]
+              else
+                @prebuild[pName] << except.config
+              end
+            end
+          end
         end
       end
-    end    
+    end
 
     def makeBlocks
       @loadedConfig.referencedConfigs.each do |projName, configs|
         configs.each do |config|
-          block = Blocks::Block.new(config, @loadedConfig.referencedConfigs)
+
+          prebuild = !@prebuild.nil?
+          if @prebuild and @prebuild.has_key?projName
+            prebuild = false if (@prebuild[projName].include?"" or @prebuild[projName].include?config.name)
+          end
+
+          block = Blocks::Block.new(config, @loadedConfig.referencedConfigs, prebuild)
           Blocks::ALL_BLOCKS[config.qname] = block
         end
       end
     end
-    
+
     def makeGraph
-        @loadedConfig.referencedConfigs.each do |projName, configs|
-          configs.each do |config|
-            block = Blocks::ALL_BLOCKS[config.qname]
-              addDependencies(block, config)
+      @loadedConfig.referencedConfigs.each do |projName, configs|
+        configs.each do |config|
+          block = Blocks::ALL_BLOCKS[config.qname]
+            addDependencies(block, config)
+        end
+      end
+      Blocks::ALL_BLOCKS.each do |name,block|
+        block.dependencies.uniq!
+        block.childs.uniq!
+        block.parents.uniq!
+      end
+
+      # inject dependencies
+      num_interations = 0
+      begin
+        if (num_interations > 0) and Bake.options.debug and Bake.options.verbose >= 3
+          puts "Inject dependencies, iteration #{num_interations}:"
+          Blocks::ALL_BLOCKS.each do |name,block|
+            puts block.config.qname
+            block.dependencies.each { |d| puts "- #{d}" }
           end
         end
+
+        counter = 0
         Blocks::ALL_BLOCKS.each do |name,block|
-          block.dependencies.uniq!
-          block.childs.uniq!
-          block.parents.uniq!
+          block.getBlocks(:parents).each do |b|
+            b.config.dependency.each do |d|
+              next if d.inject == ""
+
+              dqname = "#{d.name},#{d.config}"
+              next if name == dqname
+              next if block.dependencies.include? dqname
+              dblock = Blocks::ALL_BLOCKS[dqname]
+              counter += 1
+              newD = MergeConfig::cloneModelElement(d)
+              newD.setInject("")
+              ls = block.config.getLibStuff
+              dblock.parents << block
+
+              if d.inject == "front"
+                block.config.setLibStuff(ls.unshift(newD))
+                block.childs.unshift dblock
+                block.dependencies.unshift dqname
+              else
+                block.config.setLibStuff(ls + [newD])
+                block.childs << dblock
+                block.dependencies << dqname
+              end
+            end
+          end
+        end
+        num_interations += 1
+      end while counter > 0
+    end
+
+    def makeDot
+
+        File.open(Bake.options.dot, 'w') do |file|
+          puts "Creating #{Bake.options.dot}"
+
+          file.write "# Generated by bake\n"
+          file.write "# Example to show the graph: dot #{Bake.options.dot} -Tpng -o out.png\n"
+          file.write "# Example to reduce the graph: tred #{Bake.options.dot} | dot -Tpng -o out.png\n\n"
+
+          file.write "digraph #{Bake.options.main_project_name}_#{Bake.options.build_config} {\n\n"
+
+          file.write "  concentrate = true\n\n"
+
+          onlyProjectName = nil
+          onlyConfigName = nil
+          if Bake.options.project
+            splitted = Bake.options.project.split(',')
+            onlyProjectName = splitted[0]
+            onlyConfigName = splitted[1] if splitted.length == 2
+          end
+
+          if onlyProjectName
+            if not @loadedConfig.referencedConfigs.include? onlyProjectName
+              Bake.formatter.printError("Error: project #{onlyProjectName} not found")
+              ExitHelper.exit(1)
+            end
+            if onlyConfigName
+              if not @loadedConfig.referencedConfigs[onlyProjectName].any? {|c| c.name == onlyConfigName}
+                Bake.formatter.printError("Error: project #{onlyProjectName} with config #{onlyConfigName} not found")
+                ExitHelper.exit(1)
+              end
+            end
+          end
+
+          foundProjs = {}
+          @loadedConfig.referencedConfigs.each do |projName, configs|
+            configs.each do |config|
+              config.dependency.each do |d|
+                if onlyProjectName
+                  next if config.parent.name != onlyProjectName && d.name != onlyProjectName
+                  if onlyConfigName
+                    leftSide  = config.name        == onlyConfigName && config.parent.name == onlyProjectName
+                    rightSide = d.config           == onlyConfigName && d.name             == onlyProjectName
+                    next if not leftSide and not rightSide
+                  end
+                end
+                file.write "  \"#{config.qname}\" -> \"#{d.name},#{d.config}\"\n"
+
+                foundProjs[config.parent.name] = []           if not foundProjs.include? config.parent.name
+                foundProjs[config.parent.name] << config.name if not foundProjs[config.parent.name].include? config.name
+                foundProjs[d.name] = []        if not foundProjs.include? d.name
+                foundProjs[d.name] << d.config if not foundProjs[config.parent.name].include? d.config
+              end
+            end
+          end
+          file.write "\n"
+
+          @loadedConfig.referencedConfigs.each do |projName, configs|
+            next if Bake.options.project and not foundProjs.include?projName
+            file.write "  subgraph cluster_#{projName} {\n"
+            file.write "    label =\"#{projName}\"\n"
+            configs.each do |config|
+              next if Bake.options.project and not foundProjs[projName].include? config.name
+              file.write "    \"#{projName},#{config.name}\" [label = #{config.name}, style =  filled, fillcolor = #{config.color}]\n"
+            end
+            file.write "  }\n\n"
+          end
+
+          file.write "}\n"
         end
+
+        ExitHelper.exit(0)
     end
-    
+
     def convert2bb
       @loadedConfig.referencedConfigs.each do |projName, configs|
         configs.each do |config|
           block = Blocks::ALL_BLOCKS[config.qname]
-          
+
           addSteps(block, block.startupSteps,  config.startupSteps)
           addSteps(block, block.exitSteps,  config.exitSteps)
-          
+
           if not Bake.options.prepro and not Bake.options.lint and not Bake.options.conversion_info and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
             addSteps(block, block.preSteps,  config.preSteps)
             addSteps(block, block.postSteps, config.postSteps)
           end
-          
+
           if Bake.options.docu
             block.mainSteps << Blocks::Docu.new(config, @configTcMap[config])
           elsif Metamodel::CustomConfig === config
             if not Bake.options.prepro and not Bake.options.lint and not Bake.options.conversion_info and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
               addSteps(block, block.mainSteps, config) if config.step
-            end 
+            end
           elsif Bake.options.conversion_info
             block.mainSteps << Blocks::Convert.new(block, config, @loadedConfig.referencedConfigs, @configTcMap[config])
           elsif Bake.options.lint
@@ -167,7 +319,7 @@ module Bake
           end
 
 
-                    
+
         end
       end
     end
@@ -181,11 +333,11 @@ module Bake
         if Bake.options.debug
           puts ex.message
           puts ex.backtrace
-        end 
+        end
         return false
       end
     end
-    
+
     def callBlocks(startBlocks, method, ignoreStopOnFirstError = false)
       Blocks::ALL_BLOCKS.each {|name,block| block.visited = false; block.result = true;  block.inDeps = false }
       Blocks::Block.reset_block_counter
@@ -198,7 +350,7 @@ module Bake
       end
       return result
     end
-    
+
     def calcStartBlocks
       startProjectName = nil
       startConfigName = nil
@@ -233,9 +385,9 @@ module Bake
         startBlocks = [Blocks::ALL_BLOCKS[Bake.options.main_project_name+","+Bake.options.build_config]]
         Blocks::Block.set_num_projects(Blocks::ALL_BLOCKS.length)
       end
-     return startBlocks       
+     return startBlocks
     end
-    
+
     def doit()
 
       taskType = "Building"
@@ -253,19 +405,19 @@ module Bake
         taskType = "Rebuilding"
       elsif Bake.options.clean
         taskType = "Cleaning"
-      end      
-      
-      begin      
+      end
+
+      begin
         al = AdaptConfig.new
         adaptConfigs = al.load()
-        
+
         @loadedConfig = Config.new
         @loadedConfig.load(adaptConfigs)
-        
+
         taskType = "Analyzing" if Bake.options.analyze
-                  
+
         @mainConfig = @loadedConfig.referencedConfigs[Bake.options.main_project_name].select { |c| c.name == Bake.options.build_config }.first
-  
+
         if Bake.options.lint
           @defaultToolchain = Utils.deep_copy(Bake::Toolchain::Provider["Lint"])
         else
@@ -276,7 +428,7 @@ module Bake
             ExitHelper.exit(1)
           end
 
-          # The flag "-FS" must only be set for VS2013 and above          
+          # The flag "-FS" must only be set for VS2013 and above
           ENV["MSVC_FORCE_SYNC_PDB_WRITES"] = ""
           if basedOn == "MSVC"
             begin
@@ -296,33 +448,38 @@ module Bake
               ExitHelper.exit(1)
             end
           end
-          
+
           @defaultToolchain = Utils.deep_copy(basedOnToolchain)
           Bake.options.envToolchain = true if (basedOn.include?"_ENV")
         end
         integrateToolchain(@defaultToolchain, @mainConfig.defaultToolchain)
-          
+
         # todo: cleanup this hack
         Bake.options.analyze = @defaultToolchain[:COMPILER][:CPP][:COMPILE_FLAGS].include?"analyze"
         Bake.options.eclipseOrder = @mainConfig.defaultToolchain.eclipseOrder
-        
+
         createBaseTcsForConfig
         substVars
         createTcsForConfig
-        
+
         @@linkBlock = 0
-        
+
+        @prebuild = nil
+        calcPrebuildBlocks if Bake.options.prebuild
+
         makeBlocks
         makeGraph
+        makeDot if Bake.options.dot
+
         convert2bb
-        
+
         Blocks::Show.includes if Bake.options.show_includes
         Blocks::Show.includesAndDefines(@mainConfig, @configTcMap[@mainConfig]) if Bake.options.show_includes_and_defines
-        
+
         startBlocks = calcStartBlocks
 
         Bake::IDEInterface.instance.set_build_info(@mainConfig.parent.name, @mainConfig.name, Blocks::ALL_BLOCKS.length)
-        
+
         ideAbort = false
         begin
           result = callBlocks(startBlocks, :startup, true)
@@ -335,21 +492,21 @@ module Bake
             if not Bake.options.stopOnFirstError or result
               result = callBlocks(startBlocks, :execute) && result
             end
-          end      
+          end
         rescue AbortException
           ideAbort = true
         end
         result = callBlocks(startBlocks, :exits, true) && result
-        
+
         if ideAbort
           Bake.formatter.printError("\n#{taskType} aborted.")
           ExitHelper.set_exit_code(1)
           return
         end
-        
+
         if Bake.options.cc2j_filename
           Blocks::BlockBase.prepareOutput(Bake.options.cc2j_filename)
-          File.open(Bake.options.cc2j_filename, 'w') do |f|  
+          File.open(Bake.options.cc2j_filename, 'w') do |f|
             f.puts "["
             noComma = Blocks::CC2J.length - 1
             Blocks::CC2J.each_with_index do |c, index|
@@ -361,7 +518,7 @@ module Bake
             f.puts "]"
           end
         end
-              
+
         if result == false
           Bake.formatter.printError("\n#{taskType} failed.")
           ExitHelper.set_exit_code(1)
@@ -376,7 +533,7 @@ module Bake
       rescue SystemExit
         Bake.formatter.printError("\n#{taskType} failed.") if ExitHelper.exit_code != 0
       end
-      
+
     end
 
     def connect()