bake-toolkit 2.62.0 → 2.64.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b32e4c31cf5d36f26b6f3287b4c31ec250b5f6ad49118d9b8823351fcccc7a63
-  data.tar.gz: d83e5c807aaa312b9ada14d0f330cf5b0177a7e78489ebd038f32c49c08caaf8
+  metadata.gz: dd55725b65ac6296092196df2fe85d8dead231341649db552cac76415643ba54
+  data.tar.gz: c8fc064f5c929e3968218bde7aee9b2548ee00bfcc9d55bc762f0e1ab917f0da
 SHA512:
-  metadata.gz: f3fcbdebee31ec340a3967c11df66e905355551d7a32daa2646573c1e1b004bfcb5aab944bda38fe36bf04fe15b7c91d91948dc4822beb972b7503af72d2f092
-  data.tar.gz: 5981dcc38b1dd5f0001b0fd4218d247499a9ae840619ed851a22f61ba940f0db3e1e840491c393079910f207262b9ceab6464403c9ae8b41aff4599ffb7ea0ee
+  metadata.gz: 8cad40c4ee60207533b867a29b53fb6efa8e0d5d12d1f9d929535fe5a682bc08a585ea0c64b5af3b3bcdcb80b920b3a924c460a2441ab33e1edda790bccd5b70
+  data.tar.gz: 577f622dc1d27c4abfa72b0ec484ffe2054f4bc75e67ae1afb4e48c598447d928ec463e6bd4cf3126fed0e9eeee743436852f1741cd54e7fa1d7809670256ccc

data/bin/bakery

@@ -24,6 +24,8 @@ require_relative "../lib/bakery/buildPattern"
 require_relative '../lib/common/ext/stdout'
 require_relative '../lib/common/cleanup'
 
+require 'json'
+
 module Bake
 
   @options = BakeryOptions.new(ARGV)
@@ -104,6 +106,7 @@ module Bake
 
   exitValue = 0
   abort = false
+  @ideps = {}
   @toBuild.each do |bp|
     currentRun += 1
     p = File.dirname(bp.proj)
@@ -135,6 +138,12 @@ module Bake
       puts e.message
     end
 
+    if Bake.options.dev_features.detect { |x| x.start_with?("dep-overview=") }
+      Bake::ToCxx.include_deps.each do |pdir, deps|
+        @ideps[pdir] = Set.new if !@ideps.has_key?(pdir)
+        @ideps[pdir].merge(deps)
+      end
+    end
     Bake::cleanup
     ExitHelper.reset_exit_code
 
@@ -148,6 +157,22 @@ module Bake
       end
     end
   end
+  
+  dep_json = Bake.options.dev_features.detect { |x| x.start_with?("dep-overview=") }
+  if dep_json
+    # remove duplicates
+    @ideps.each do |m,d| 
+      d.delete_if {|d_tbc| d_tbc.start_with?(m) }
+      d.delete_if {|d_tbc| d.any? {|any_d| d_tbc != any_d && d_tbc.start_with?(any_d + "/") } }
+    end
+    # generate format for output
+    ideps = []
+    @ideps.each do |m,d|
+      ideps << {"module" => m, "dependencies" => d.sort.to_a}
+    end
+    # output
+    File.write(dep_json[13..-1], JSON.pretty_generate(ideps))
+  end
 
   print "\n"
 

data/lib/adapt/config/loader.rb

@@ -1,4 +1,5 @@
 require_relative '../../bake/model/loader'
+require_relative '../../bake/config/loader'
 require_relative '../../bake/config/checks'
 
 module Bake
@@ -24,6 +25,10 @@ module Bake
         ExitHelper.exit(1)
       end
 
+      f.root_elements.each do |a|
+        Bake::Config::checkVer(a.requiredBakeVersion)
+      end
+
       configs = []
       f.root_elements.each { |re| configs.concat(re.getConfig) }
       AdaptConfig::checkSyntax(configs, filename)

data/lib/bake/cache.rb

@@ -31,7 +31,7 @@ module Bake
           @cacheFilename = Bake.options.main_dir+"/.bake/Project.meta." + sanitize_filename(Bake.options.build_config) + qacStr + ".cache"
         end
         if !Bake.options.dry
-          Utils.gitIgnore(File.dirname(@cacheFilename)) 
+          Utils.gitIgnore(File.dirname(@cacheFilename), :silent) 
         end
       end
 
@@ -187,10 +187,16 @@ module Bake
         cache.adapt_filenames = AdaptConfig.filenames
         bbdump = Marshal.dump(cache)
         begin
-          File.delete(@cacheFilename)
-        rescue
+          File.open(@cacheFilename, 'wb') {|file| file.write(bbdump) }
+        rescue Exception=>e
+          if Bake.options.verbose >= 3
+            Bake.formatter.printWarning("Warning: Could not write cache file #{@cacheFilename}")
+            if Bake.options.debug
+              puts e.message
+              puts e.backtrace
+            end
+          end
         end
-        File.open(@cacheFilename, 'wb') {|file| file.write(bbdump) }
         Bake.options.nocache = false
       end
 

data/lib/bake/config/checks.rb

@@ -103,6 +103,10 @@ module Bake
               Bake.formatter.printError("IncludeDir must have inject OR infix (deprecated)", inc)
               ExitHelper.exit(1)
             end
+            if (inc.name.empty? || inc.name[0] == " ")
+              Bake.formatter.printError("IncludeDir must not be empty or start with a space", inc)
+              ExitHelper.exit(1)
+            end
           end if config.respond_to?("includeDir")
 
           if not ["", "yes", "no", "all"].include?config.mergeInc

data/lib/bake/config/loader.rb

@@ -161,7 +161,7 @@ module Bake
       [config, configname]
     end
 
-    def checkVerFormat(ver)
+    def self.checkVerFormat(ver)
       return true if ver.empty?
       return false if ver.length > 3
       ver.each do |v|
@@ -170,7 +170,7 @@ module Bake
       true
     end
 
-    def bailOutVer(reqVersion)
+    def self.bailOutVer(reqVersion)
       text1 = (reqVersion.minimum.empty? ? "" : "minimum = #{reqVersion.minimum}")
       text2 = ((reqVersion.minimum.empty? or reqVersion.maximum.empty?) ? "" : ", ")
       text3 = (reqVersion.maximum.empty? ? "" : "maximum = #{reqVersion.maximum}")
@@ -178,7 +178,7 @@ module Bake
       ExitHelper.exit(1)
     end
 
-    def checkVer(reqVersion)
+    def self.checkVer(reqVersion)
       return if reqVersion.nil?
       min = reqVersion.minimum.split(".")
       max = reqVersion.maximum.split(".")
@@ -217,7 +217,7 @@ module Bake
       proj = projRoots[0]
 
       reqVersion = proj.getRequiredBakeVersion
-      checkVer(reqVersion)
+      Bake::Config::checkVer(reqVersion)
 
       configs = proj.getConfig
       Bake::Configs::Checks::commonMetamodelCheck(configs, filename)
@@ -236,6 +236,7 @@ module Bake
       adaptRoots = f.root_elements.select { |re| Metamodel::Adapt === re }
       if adaptRoots.length > 0
         adaptRoots.each do |adapt|
+          Bake::Config::checkVer(adapt.requiredBakeVersion)
           adapt.mainProject = @mainProjectName if adapt.mainProject == "__THIS__"
           adaptConfigs = adapt.getConfig
           AdaptConfig.checkSyntax(adaptConfigs, filename, true)

data/lib/bake/libElement.rb

@@ -60,6 +60,19 @@ module Bake
           @@source_libraries << adaptedPath
         end
       end
+      le = block.library ? block.library : (block.executable ? block.executable : nil)
+      if le
+        cb = le.compileBlock
+        if !cb.nil? && !cb.object_files_ignored_in_lib.nil?
+          cb.object_files_ignored_in_lib.each do |ldirect|
+            adaptedPath, prefix = adaptPath(ldirect, block, prefix)
+            if (!block.prebuild or File.exist?adaptedPath)
+              @@linker_libs_array << adaptedPath
+              @@source_libraries << adaptedPath
+            end
+          end
+        end
+      end
     end
 
     def self.collect_recursive(block, levels = -1)

data/lib/bake/model/loader.rb

@@ -9,6 +9,7 @@ require 'rgen/util/file_cache_map'
 
 require 'rtext/default_loader'
 
+require_relative '../../common/ext/rgen'
 require_relative '../../common/exit_helper'
 require_relative '../toolchain/colorizing_formatter'
 require_relative '../options/options'

data/lib/bake/model/metamodel.rb

@@ -147,6 +147,7 @@ module Bake
       class Files < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'compileOnly', Boolean, :defaultValueLiteral => "false"
+        has_attr 'linkDirectly', Boolean, :defaultValueLiteral => "false"
         contains_many 'define', Define, 'parent'
         contains_many 'flags', Flags, 'parent'
       end
@@ -283,6 +284,12 @@ module Bake
         has_attr 'env', Boolean, :defaultValueLiteral => "false"
       end
 
+      class CompilationCheck < ModelElement
+        has_attr 'exclude', String, :defaultValueLiteral => ""
+        has_attr 'include', String, :defaultValueLiteral => ""
+        has_attr 'ignore', String, :defaultValueLiteral => ""
+      end
+
       class BaseConfig_INTERNAL < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'extends', String, :defaultValueLiteral => ""
@@ -304,6 +311,7 @@ module Bake
         contains_many 'set', Set, 'parent'
         contains_many 'prebuild', Prebuild, 'parent'
         contains_one 'cdb', CompilationDB, 'parent'
+        contains_many 'compilationCheck', CompilationCheck, 'parent'
 
         module ClassModule
           def ident
@@ -355,6 +363,7 @@ module Bake
         has_attr 'mainConfig', String, :defaultValueLiteral => ""
         contains_many 'config', BaseConfig_INTERNAL, 'parent'
         contains_many 'scopes', Scope, 'parent'
+        contains_one 'requiredBakeVersion', RequiredBakeVersion, 'parent'
       end
 
       class If < Adapt

data/lib/bake/options/options.rb

@@ -11,13 +11,6 @@ require_relative '../../common/crc32'
 
 module Bake
 
-  def self.options
-    @@options
-  end
-  def self.options=(options)
-    @@options = options
-  end
-
   class Options < Parser
     attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :showConfigs, :cc2j_filename
     attr_reader :main_dir, :working_dir, :project, :filename, :main_project_name, :buildDirDelimiter, :dot, :dotFilename # String
@@ -368,6 +361,10 @@ module Bake
     end
 
     def set_verbose(num)
+      if num.nil?
+        Bake.formatter.printError("Error: verbose must be between 0 and 3")
+        ExitHelper.exit(1)
+      end
       checkNum(num)
       @verbose = String === num ? num.to_i : num
       if @verbose < 0 || verbose > 3
@@ -393,6 +390,14 @@ module Bake
 
   end
 
+  def self.options
+    @@options ||= Options.new([])
+  end
+
+  def self.options=(options)
+    @@options = options
+  end
+
 end
 
 

data/lib/bakery/model/loader.rb

@@ -7,6 +7,7 @@ require 'rgen/fragment/fragmented_model'
 
 require 'rtext/default_loader'
 
+require_relative '../../common/ext/rgen'
 require_relative '../../common/exit_helper'
 require_relative '../../bake/toolchain/colorizing_formatter'
 

data/lib/bakery/toBake.rb

@@ -35,7 +35,7 @@ module Bake
           projs << root.dir + "/Project.meta"
         end
         if projs.length == 0
-          toBuildPattern << BuildPattern.new(nil, nil, p.args, p) # remember it for sorted info printout
+          Bake.formatter.printWarning("pattern does not match any project: #{p.name}", p)
         end
         projs.each do |f|
           toBuildPattern << BuildPattern.new(f, "^"+p.config.gsub("*","(\\w*)")+"$", p.args, p)
@@ -58,6 +58,10 @@ module Bake
       end
     end
 
+    toBuildPattern.select {|bp| !bp.coll_p.isFound}.map {|bp| bp.coll_p}.uniq.each do |p|
+      Bake.formatter.printWarning("pattern does not match any config: #{p.config}", p)
+    end
+
     col.exclude.each do |p|
       p.name = "/"+p.name.gsub("*","(\\w*)")+"/Project.meta"
       p.config = "^"+p.config.gsub("*","(\\w*)")+"$"

data/lib/blocks/block.rb

@@ -22,7 +22,7 @@ module Bake
       @@delayed_result = true
       @@threads = []
 
-      attr_reader :lib_elements, :projectDir, :library, :config, :projectName, :configName, :prebuild, :output_dir, :tcs
+      attr_reader :lib_elements, :projectDir, :library, :executable, :config, :projectName, :configName, :prebuild, :output_dir, :tcs
       attr_accessor :visited, :inDeps, :result, :bes, :besDirect
 
       def startupSteps
@@ -64,7 +64,11 @@ module Bake
       def set_library(library)
         @library = library
       end
-      
+
+      def set_executable(executable)
+        @executable = executable
+      end
+
       def qname()
         @projectName + "," + @configName
       end
@@ -74,6 +78,7 @@ module Bake
         @prebuild = prebuild
         @visited = false
         @library = nil
+        @executable = nil
         @config = config
         @referencedConfigs = referencedConfigs
         @projectName = config.parent.name
@@ -119,6 +124,13 @@ module Bake
           resPathMagic = inc[1..-1].join("/") # within self
           resPathMagic = "." if resPathMagic == ""
           res << resPathMagic
+          if warnIfLocal
+            if resPathMagic == "."
+              Bake.formatter.printInfo("\"#{d}\" uses path magic in IncludeDir, please use \".\" instead", elem)
+            else
+              Bake.formatter.printInfo("\"#{d}\" uses path magic in IncludeDir, please omit \"#{inc[0]}/\" or use \"./#{resPathMagic}\"", elem) if warnIfLocal
+            end
+          end
         elsif @referencedConfigs.include?(inc[0])
           dirOther = @referencedConfigs[inc[0]].first.parent.get_project_dir
           resPathMagic = File.rel_from_to_project(@projectDir, dirOther, false)
@@ -126,17 +138,19 @@ module Bake
           resPathMagic = resPathMagic + "/" + postfix if postfix != ""
           resPathMagic = "." if resPathMagic == ""
           res << resPathMagic
+          Bake.formatter.printInfo("\"#{d}\" uses path magic in IncludeDir, please use a Dependency to \"#{inc[0]}\" instead", elem) if warnIfLocal
         end
 
         if File.exists?(@projectDir + "/" + d) # prio 2: local, e.g. "include"
           res << d
         end
 
-        # prioo 3: check if dir exists without Project.meta entry
+        # prio 3: check if dir exists without Project.meta entry
         Bake.options.roots.each do |r|
           absIncDir = r.dir+"/"+d
           if File.exists?(absIncDir)
             res << File.rel_from_to_project(@projectDir,absIncDir,false)
+            Bake.formatter.printInfo("\"#{d}\" uses path magic in IncludeDir, please create a Project.meta in \"#{absIncDir}\" or upwards and use a Dependency instead", elem) if warnIfLocal && res.length == 1
           end
         end
 
@@ -355,14 +369,14 @@ module Bake
       def callSteps(method)
         @config.writeEnvVars()
         Thread.current[:lastCommand] = nil
-        allSteps = (preSteps + mainSteps + postSteps)
+        @allSteps = (preSteps + mainSteps + postSteps)
         # check if we have to delay the output (if the last step of this block is not in a thread)
         @outputStep = nil
-        allSteps.each { |step| @outputStep = independent?(method, step) ? step : nil }
-        while !allSteps.empty?
+        @allSteps.each { |step| @outputStep = independent?(method, step) ? step : nil }
+        while !@allSteps.empty?
           parallel = []
-          while allSteps.first && independent?(method, allSteps.first)
-            parallel << allSteps.shift
+          while @allSteps.first && independent?(method, @allSteps.first)
+            parallel << @allSteps.shift
           end
           if parallel.length > 0
             execute_in_thread(parallel) {
@@ -383,7 +397,7 @@ module Bake
                end
              }
           else
-            step = allSteps.shift
+            step = @allSteps.shift
             Blocks::Block::waitForAllThreads()
             @result = executeStep(step, method) if @result
             @outputStep = nil if !@result && blockAbort?(@result)
@@ -404,13 +418,29 @@ module Bake
           return true
         end
 
-        return true if (@visited)
-        @visited = true
+        SyncOut.mutex.synchronize do
+          if @visited
+            while !defined?(@allSteps) || !@allSteps.empty?
+              sleep(0.1)
+            end
+            return true # maybe to improve later (return false if step has a failed non-independent step)
+          end
+          @visited = true
+        end
 
         @inDeps = true
-        depResult = callDeps(:execute)
+        begin
+          depResult = callDeps(:execute)
+        rescue Exception => e
+          @allSteps = []
+          raise
+        end
+
         @inDeps = false
-        return @result && depResult if blockAbort?(depResult)
+        if blockAbort?(depResult)
+          @allSteps = []
+          return @result && depResult 
+        end
 
         Bake::IDEInterface.instance.set_build_info(@projectName, @configName)
         begin
@@ -445,8 +475,9 @@ module Bake
               SyncOut.discardStreams()
             end
           end
+          @allSteps = []
         end
-
+        
         return (depResult && @result)
       end
 

data/lib/blocks/compile.rb

@@ -7,47 +7,52 @@ require_relative '../common/utils'
 require_relative '../bake/toolchain/colorizing_formatter'
 require_relative '../bake/config/loader'
 
-
 begin
-require 'Win32API'
+  module Kernel32
+    require 'fiddle'
+    require 'fiddle/import'
+    require 'fiddle/types'
+    extend Fiddle::Importer
+    dlload 'kernel32'
+    include Fiddle::Win32Types
+    extern 'DWORD GetLongPathName(LPCSTR, LPSTR, DWORD)'
+    extern 'DWORD GetShortPathName(LPCSTR, LPSTR, DWORD)'
+  end
 
-def longname short_name
-  max_path = 1024
-  long_name = " " * max_path
-  lfn_size = Win32API.new("kernel32", "GetLongPathName", ['P','P','L'],'L').call(short_name, long_name, max_path)
-  return long_name[0..lfn_size-1]
-end
+  def longname short_name
+    max_path = 1024
+    long_name = " " * max_path
+    lfn_size = Kernel32.GetLongPathName(short_name, long_name, max_path)
+    return long_name[0..lfn_size-1]
+  end
 
-def shortname long_name
-  max_path = 1024
-  short_name = " " * max_path
-  lfn_size = Win32API.new("kernel32", "GetShortPathName", ['P','P','L'],'L').call(long_name, short_name, max_path)
-  return short_name[0..lfn_size-1]
-end
+  def shortname long_name
+    max_path = 1024
+    short_name = " " * max_path
+    lfn_size = Kernel32.GetShortPathName(long_name, short_name, max_path)
+    return short_name[0..lfn_size-1]
+  end
 
-def realname file
-    longname(shortname(file))
-end
+  def realname file
+    x = longname(shortname(file))
+  end
 
-rescue LoadError
+rescue Fiddle::DLError
 
-def realname file
+  def realname file
     file
-end
+  end
 
 end
 
 
-
-
-
 module Bake
 
   module Blocks
 
     class Compile < BlockBase
 
-      attr_reader :objects, :include_list, :source_files_ignored_in_lib
+      attr_reader :objects, :source_files, :source_files_compiled, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib
 
       def mutex
         @mutex ||= Mutex.new
@@ -421,6 +426,7 @@ module Bake
           Utils.gitIgnore(odir) if !Bake.options.dry
 
           fileListBlock = Set.new if Bake.options.filelist
+          @source_files_compiled = @source_files.dup
           compileJobs = Multithread::Jobs.new(@source_files) do |jobs|
             while source = jobs.get_next_or_nil do
 
@@ -513,6 +519,7 @@ module Bake
       end
 
       def calcObjects
+        @object_files_ignored_in_lib = []
         @source_files.each do |source|
           type = get_source_type(source)
           if not type.nil?
@@ -526,15 +533,22 @@ module Bake
               end
             end
             @object_files[source] = object
-            @objects << object unless @source_files_ignored_in_lib.include?(source)
+            if @source_files_ignored_in_lib.include?(source)
+              if @source_files_link_directly.include?(source)
+                @object_files_ignored_in_lib << object
+              end
+            else
+              @objects << object
+            end
           end
         end
       end
 
       def calcSources(cleaning = false, keep = false)
-        return @source_files if @source_files and not @source_files.empty?
+        return @source_files if @source_files && !@source_files.empty?
         @source_files = []
         @source_files_ignored_in_lib = []
+        @source_files_link_directly = []
         @fileTcs = {}
 
         exclude_files = Set.new
@@ -564,11 +578,17 @@ module Bake
             if ((!@fileTcs.has_key?(f)) || singleFile)
               @fileTcs[f] = icf
             end
-            next if exclude_files.include?(f)
-            next if source_files.include?(f)
+            if source_files.include?(f) || exclude_files.include?(f)
+              if (singleFile)
+                @source_files_ignored_in_lib << f if sources.compileOnly || sources.linkDirectly
+                @source_files_link_directly << f if sources.linkDirectly
+              end
+              next
+            end
             source_files << f
             @source_files << f
-            @source_files_ignored_in_lib << f if sources.compileOnly
+            @source_files_ignored_in_lib << f if sources.compileOnly || sources.linkDirectly
+            @source_files_link_directly << f if sources.linkDirectly
           end
         end
 

data/lib/blocks/executable.rb

@@ -6,10 +6,14 @@ module Bake
 
     class Executable < BlockBase
 
+      attr_reader :compileBlock
+
       def initialize(block, config, referencedConfigs, compileBlock)
         super(block, config, referencedConfigs)
         @compileBlock = compileBlock
 
+        block.set_executable(self)
+
         calcArtifactName
         calcMapFile
         calcLinkerScript

data/lib/common/cleanup.rb

@@ -12,7 +12,7 @@ module Bake
       Blocks::Block.reset_block_counter
       Blocks::Block.reset_delayed_result
       Configs::Checks.cleanupWarnings
-      
+      ToCxx::reset_include_deps
     end
 
 end

data/lib/common/ext/rgen.rb

@@ -0,0 +1,23 @@
+module RGen
+module Util
+
+  class FileCacheMap
+    alias_method :orig_store_data, :store_data
+    def store_data(key_path, value_data)
+      begin
+        orig_store_data(key_path, value_data)
+      rescue Exception=>e
+        if Bake.options.verbose >= 3
+          cf = cache_file(key_path)
+          Bake.formatter.printWarning("Warning: Could not write cache file #{cf}")
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+        end
+      end
+    end
+  end
+
+end
+end

data/lib/common/utils.rb

@@ -4,11 +4,21 @@ module Bake
 
   module Utils
     
-    def self.gitIgnore(folder)
-      FileUtils::mkdir_p(folder)
+    def self.gitIgnore(folder, mode = :report)
       gitignore = folder + "/.gitignore"
-      if !File.exist?(gitignore)
-        File.write(gitignore, ".\n")
+      begin
+        FileUtils::mkdir_p(folder)
+        if !File.exist?(gitignore)
+          File.write(gitignore, ".\n")
+        end
+      rescue Exception=>e
+        if mode != :silent && Bake.options.verbose >= 3
+          Bake.formatter.printWarning("Warning: Could not write file #{gitignore}")
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+        end
       end
     end
 

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.62.0"
+      "2.64.1"
     end
 
     def self.printBakeVersion(ry = "")

data/lib/tocxx.rb

@@ -36,6 +36,7 @@ require_relative 'common/abortException'
 
 require_relative 'adapt/config/loader'
 require "thwait"
+require 'pathname'
 
 module Bake
 
@@ -45,10 +46,19 @@ module Bake
   class ToCxx
 
     @@linkBlock = 0
+    @@include_deps = {}
 
     def self.linkBlock
       @@linkBlock = 1
     end
+    
+    def self.include_deps
+      @@include_deps
+    end
+
+    def self.reset_include_deps
+      @@include_deps = {}
+    end
 
     def initialize
       @configTcMap = {}
@@ -232,6 +242,22 @@ module Bake
       end
     end
     
+    def makeDepOverview
+      return if !Bake.options.dev_features.any? {|feature| feature.start_with?("dep-overview=") }
+      Blocks::ALL_BLOCKS.each do |name,block|
+        block.bes.each do |depInc|
+          @@include_deps[block.projectDir] = Set.new if !@@include_deps.has_key?(block.projectDir)
+          if (Metamodel::Dependency === depInc)
+            c = @referencedConfigs[depInc.name].detect { |configRef| configRef.name == depInc.config }
+            @@include_deps[block.projectDir] << Blocks::ALL_BLOCKS[c.qname].projectDir
+          else
+            @@include_deps[block.projectDir] << depInc.name
+          end
+        end
+      end
+      ExitHelper.exit(0)
+    end
+    
     def makeIncs
       Blocks::ALL_BLOCKS.each do |name,block|
         bes2 = []
@@ -692,6 +718,8 @@ module Bake
           makeGraph
           puts "Profiling #{Time.now - $timeStart}: make includes..." if Bake.options.profiling
           makeIncs
+          puts "Profiling #{Time.now - $timeStart}: make dep overview..." if Bake.options.profiling
+          makeDepOverview
           puts "Profiling #{Time.now - $timeStart}: make uniq..." if Bake.options.profiling
           makeUniq
           puts "Profiling #{Time.now - $timeStart}: convert to building blocks..." if Bake.options.profiling
@@ -825,6 +853,84 @@ module Bake
           if Bake.options.linkOnly and @@linkBlock == 0
             Bake.formatter.printSuccess("\nNothing to link.")
           else
+            # CompilationCheck
+            if !Bake.options.project &&
+               !Bake.options.filename &&
+               !Bake.options.linkOnly &&
+               !Bake.options.prepro &&
+               !Bake.options.compileOnly &&
+               !Bake.options.clean
+
+              ccChecks = []
+              ccIncludes = Set.new
+              ccExcludes = Set.new
+              ccIgnores = Set.new
+              @referencedConfigs.each do |projName, configs|
+                configs.compilationCheck.each do |cc|
+                  ccChecks << cc
+                end
+              end
+              ccChecks.each do |cc|
+                Dir.chdir(cc.parent.parent.get_project_dir) do
+                  Dir.glob(cc.include).select {|f| File.file?(f)}.each {|f| ccIncludes << File.expand_path(f)}
+                  Dir.glob(cc.exclude).select {|f| File.file?(f)}.each {|f| ccExcludes << File.expand_path(f)}
+                  Dir.glob(cc.ignore). select {|f| File.file?(f)}.each {|f| ccIgnores  << File.expand_path(f)}
+                end
+              end
+              ccIncludes -= ccIgnores
+              ccExcludes -= ccIgnores
+              ccIncludes -= ccExcludes
+
+              if !ccIncludes.empty? || !ccExcludes.empty?
+                inCompilation = Set.new
+                Blocks::ALL_BLOCKS.each do |name,block|
+                  block.mainSteps.each do |b|
+                    if Blocks::Compile === b && !b.source_files_compiled.nil?
+                      b.source_files_compiled.each do |s|
+                        inCompilation << File.expand_path(s, b.projectDir)
+                        type = b.get_source_type(s)
+                        if type != :ASM
+                          b.objects.each do |o|
+                            dep_filename = b.calcDepFile(o, type)
+                            dep_filename_conv = b.calcDepFileConv(dep_filename)
+                            File.readlines(File.expand_path(dep_filename_conv, b.projectDir)).map{|line| line.strip}.each do |dep|
+                              header = File.expand_path(dep, b.projectDir)
+                              if File.exist?(header)
+                                inCompilation << header
+                              end
+                            end
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+                pnPwd = Pathname.new(Dir.pwd)
+                ccNotIncluded = (ccIncludes - inCompilation).to_a
+                ccNotExcluded = inCompilation.select {|i| ccExcludes.include?(i) }
+                ccNotIncluded.each do |cc|
+                  cc = Pathname.new(cc).relative_path_from(pnPwd)
+                  Bake.formatter.printWarning("Warning: file not included in build: #{cc}")
+                end
+                ccNotExcluded.each do |cc|
+                  cc = Pathname.new(cc).relative_path_from(pnPwd)
+                  Bake.formatter.printWarning("Warning: file not excluded from build: #{cc}")
+                end
+
+                if Bake.options.verbose >= 3
+                  if ccNotIncluded.empty? && ccNotExcluded.empty?
+                    Bake.formatter.printInfo("Info: CompilationCheck passed")
+                  end
+                end
+
+              elsif !ccChecks.empty?
+                if Bake.options.verbose >= 3
+                  Bake.formatter.printInfo("Info: CompilationCheck passed")
+                end
+              end
+            end
+            
+            
             Bake.formatter.printSuccess("\n#{taskType} done.")
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.62.0
+  version: 2.64.1
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -112,16 +112,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.2.1
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.2.1
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,7 @@ files:
 - lib/common/exit_helper.rb
 - lib/common/ext/dir.rb
 - lib/common/ext/file.rb
+- lib/common/ext/rgen.rb
 - lib/common/ext/rtext.rb
 - lib/common/ext/stdout.rb
 - lib/common/ide_interface.rb