bake-toolkit 2.59.0 → 2.63.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f180513d1b93699bc796de737af3092d8f8fca946c4288f807f4457443249cd8
-  data.tar.gz: 3e9351c22a0b019c8898dd481d244111d8d57c58633375a23eacb14db437504d
+  metadata.gz: 225fc376c9b3409d01e708f2ec67bb2d80f9c081d26de339d5b4bb3451141e50
+  data.tar.gz: e3769b3550aee5ae45685d8445b0ea3bfec59eea4ffa885900a461c82269b16b
 SHA512:
-  metadata.gz: 0d219c7ac0087e19df782494589127baafd9b22978d20ebaadd1a58b12936cec2c1de1447a1620413fd73b84d1edcf7e64e177cec5774032e047dc9f9770b799
-  data.tar.gz: d2c9e76821363aa6eca4d973c4d0f550f5f62c4a7fb1d08f676c07b8f5ad03ad812c3dd73f60f689c5a76646fc7676ec4b6dd3d64b969451ef8e9b46125469bf
+  metadata.gz: 419125459eab7fb1ea49939389ff85c43ef6e7ddfd2fdc4bbd555e0a5b8d0e282d28e6e52da5ab3bac1d08d1b5cee4d163315d99bceab7700011aa5f3feda46f
+  data.tar.gz: 3e273c6f6a16f89ba30b1d40c8a787a9439693ba50dd33d4667328c91894b7302ae3c1f6e9f2c4d48078fdbba545270fb5c73ff0158f0e6766bc640774808896

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

@@ -15,6 +15,7 @@ module Bake
     def loadProjMeta(filename, filenum)
 
       Bake::Configs::Checks.symlinkCheck(filename)
+      Bake::Configs::Checks.sanityFolderName(filename)
 
       f = @loader.load(filename)
 

data/lib/bake/config/checks.rb

@@ -3,6 +3,12 @@ module Bake
 
     class Checks
 
+      @@warnedCase = []
+    
+      def self.cleanupWarnings
+        @@warnedCase.clear
+      end
+
       def self.symlinkCheck(filename)
         dirOfProjMeta = File.dirname(filename)
         Dir.chdir(dirOfProjMeta) do
@@ -19,6 +25,27 @@ module Bake
           end
         end
       end
+      
+      def self.sanityFolderName(dorg)
+        return if !Bake.options.caseSensitivityCheck
+        return if Bake.options.verbose < 1
+        d = dorg
+        while (d != File.dirname(d))
+          b = File.basename(d)
+          dnew = File.dirname(d)
+          Dir.chdir(dnew) do
+            files = Dir.glob("*")
+            if !files.include?(b)
+              possible = files.select{ |f| f.casecmp(b)==0 }
+              if possible.length > 0 && !@@warnedCase.include?(d)
+                @@warnedCase << d
+                Bake.formatter.printWarning("Warning: '#{b}' not found in '#{dnew}'. Alternatives: #{possible.map{|p| "'#{p}'"}.join(", ")}. Maybe a typo happened while entering a folder in the shell?")
+              end
+            end
+          end
+          d = dnew
+        end
+      end
 
       def self.commonMetamodelCheck(configs, filename, isAdapt = false)
 
@@ -76,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

@@ -70,6 +70,7 @@ module Bake
     end
 
     def getFullProject(projName, configs, configname, isMain)
+      
 
       configname = resolveConfigName(configs, configname)
 
@@ -83,6 +84,7 @@ module Bake
         @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
         @mainProjectName = config.parent.name
         @mainConfigName = config.name
+        @configHashMain = {}
       end
 
       # check if config has to be manipulated
@@ -113,7 +115,18 @@ module Bake
               configHash[s.name] = [] unless configHash.has_key?(s.name)
               configHash[s.name] += s.value.split(";")
             end
-        
+
+            if !isMain
+              @configHashMain.each do |k,v|
+                if configHash.has_key?(k)
+                  configHash[k] += v
+                  configHash[k].uniq!
+                else
+                  configHash[k] = v
+                end
+              end
+            end
+
             checkCondition = lambda {|name,value|
               return true if adaptHash[name].empty?
               if !configHash.has_key?(name)
@@ -137,25 +150,15 @@ module Bake
         end
       end
 
-      @fullProjects[projName + "," + configname] = [config, configname]
-      [config, configname]
-    end
-
-    def symlinkCheck(filename)
-      dirOfProjMeta = File.dirname(filename)
-      Dir.chdir(dirOfProjMeta) do
-        if Dir.pwd != dirOfProjMeta and File.dirname(Dir.pwd) != File.dirname(dirOfProjMeta)
-          isSym = false
-          begin
-            isSym = File.symlink?(dirOfProjMeta)
-          rescue
-          end
-          if isSym
-            Bake.formatter.printError("Symlinks only allowed with the same parent dir as the target: #{dirOfProjMeta} --> #{Dir.pwd}", filename)
-            ExitHelper.exit(1)
-          end
+      if isMain
+        config.scopes.each do |s|
+          @configHashMain[s.name] = [] unless @configHashMain.has_key?(s.name)
+          @configHashMain[s.name] += s.value.split(";")
         end
       end
+
+      @fullProjects[projName + "," + configname] = [config, configname]
+      [config, configname]
     end
 
     def checkVerFormat(ver)
@@ -200,6 +203,7 @@ module Bake
     def loadProjMeta(filename)
 
       Bake::Configs::Checks.symlinkCheck(filename)
+      Bake::Configs::Checks.sanityFolderName(filename)
 
       f = @loader.load(filename)
 

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/metamodel.rb

@@ -131,6 +131,10 @@ module Bake
         has_attr 'text', String, :defaultValueLiteral => ""
       end
 
+      class CompilationDB < ModelElement
+        has_attr 'name', String, :defaultValueLiteral => "$(WorkingDir)/compile_commands.json"
+      end
+
       class RequiredBakeVersion < ModelElement
         has_attr 'minimum', String, :defaultValueLiteral => ""
         has_attr 'maximum', String, :defaultValueLiteral => ""
@@ -143,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
@@ -299,6 +304,7 @@ module Bake
         contains_one 'toolchain', Toolchain, 'parent'
         contains_many 'set', Set, 'parent'
         contains_many 'prebuild', Prebuild, 'parent'
+        contains_one 'cdb', CompilationDB, 'parent'
 
         module ClassModule
           def ident

data/lib/bake/options/options.rb

@@ -11,16 +11,9 @@ 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
-    attr_reader :main_dir, :project, :filename, :main_project_name, :buildDirDelimiter, :dot, :dotFilename, :cc2j_filename # String
+    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
     attr_reader :include_filter, :exclude_filter, :adapt # String List
     attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :projectPaths, :qac, :dry, :syncedOutput, :debug_threads, :skipBuildingLine # Boolean
     attr_reader :linkOnly, :compileOnly, :no_autodir, :clobber, :docu, :debug, :prepro, :prebuild, :printTime, :json, :wparse, :caseSensitivityCheck, :fileCmd, :profiling # Boolean
@@ -193,6 +186,7 @@ module Bake
         Bake.formatter.printError("Error: Project.meta not found in #{searchDir} or upwards")
         ExitHelper.exit(1)
       end
+      set_working_dir()
 
       def_roots = Root.calc_roots_bake(@main_dir)
       @roots += def_roots
@@ -323,11 +317,19 @@ module Bake
       @main_project_name = File::basename(@main_dir)
     end
 
+    def set_working_dir()
+      @working_dir = File.expand_path(Dir.pwd.gsub(/[\\]/,'/'))
+    end
+
     def set_root(dir)
-      root = Root.extract_depth(dir)
-      check_valid_dir(root.dir)
-      root.dir  = File.expand_path(root.dir.gsub(/[\\]/,'/'))
-      @roots << root
+      if File.file?(dir)
+        @roots += Root.calc_roots_bake(dir)
+      else
+        root = Root.extract_depth(dir)
+        check_valid_dir(root.dir)
+        root.dir  = File.expand_path(root.dir.gsub(/[\\]/,'/'))
+        @roots << root
+      end
     end
 
     def set_adapt(name)
@@ -336,16 +338,21 @@ module Bake
       end
     end
 
-    def checkNum(num)
+    def checkNum(num, quite = false)
       if String === num && !/\A\d+\z/.match(num)
-        Bake.formatter.printError("Error: #{num} is not a positive number")
-        ExitHelper.exit(1)
+        if !quite
+          Bake.formatter.printError("Error: #{num} is not a positive number")
+          ExitHelper.exit(1)
+        else
+          return false
+        end
       end
+      return true
     end
 
     def set_threads(num)
       return if num == nil # -j without number shall behave the same as not set
-      checkNum(num)
+      return :ignore if !checkNum(num, true)
       @threads = String === num ? num.to_i : num
       if @threads <= 0
         Bake.formatter.printError("Error: number of threads must be > 0")
@@ -379,6 +386,14 @@ module Bake
 
   end
 
+  def self.options
+    @@options ||= Options.new([])
+  end
+
+  def self.options=(options)
+    @@options = options
+  end
+
 end
 
 

data/lib/bake/subst.rb

@@ -202,6 +202,8 @@ module Bake
           substStr << Bake.options.main_project_name
         elsif var == "MainProjectDir"
           substStr << Bake.options.main_dir
+        elsif var == "WorkingDir"
+          substStr << Bake.options.working_dir
         elsif var == "ConfigName"
          substStr << @@configName
         elsif var == "ToolchainName" and defined?@@toolchainName

data/lib/bakery/options/options.rb

@@ -91,10 +91,14 @@ module Bake
     end
 
     def set_root(dir)
-      root = Root.extract_depth(dir)
-      check_valid_dir(root.dir)
-      root.dir  = File.expand_path(root.dir.gsub(/[\\]/,'/'))
-      @roots << root
+      if File.file?(dir)
+        @roots += Root.calc_roots_bake(dir)
+      else
+        root = Root.extract_depth(dir)
+        check_valid_dir(root.dir)
+        root.dir  = File.expand_path(root.dir.gsub(/[\\]/,'/'))
+        @roots << root
+      end
     end
 
   end

data/lib/blocks/block.rb

@@ -22,8 +22,8 @@ module Bake
       @@delayed_result = true
       @@threads = []
 
-      attr_reader :lib_elements, :projectDir, :library, :config, :projectName, :configName, :prebuild, :output_dir, :tcs
-      attr_accessor :visited, :inDeps, :result, :bes
+      attr_reader :lib_elements, :projectDir, :library, :executable, :config, :projectName, :configName, :prebuild, :output_dir, :tcs
+      attr_accessor :visited, :inDeps, :result, :bes, :besDirect
 
       def startupSteps
         @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
@@ -82,6 +87,7 @@ module Bake
         @result = true
         @tcs = tcs
         @bes = []
+        @besDirect = []
         @lib_elements = []
 
         calcOutputDir
@@ -118,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)
@@ -125,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
 
@@ -278,9 +293,11 @@ module Bake
       end
 
       def callDeps(method)
+        return true if Bake.options.project
         depResult = true
-        dependencies.each do |dep|
-          depResult = (ALL_BLOCKS[dep].send(method) and depResult)
+        bes.each do |dep|
+          next if Metamodel::IncludeDir === dep
+          depResult = (ALL_BLOCKS[dep.name+","+dep.config].send(method) and depResult)
           break if (!depResult) && Bake.options.stopOnFirstError
         end
         return depResult
@@ -352,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) {
@@ -380,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)
@@ -401,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
@@ -442,8 +475,9 @@ module Bake
               SyncOut.discardStreams()
             end
           end
+          @allSteps = []
         end
-
+        
         return (depResult && @result)
       end
 

data/lib/blocks/blockBase.rb

@@ -131,7 +131,6 @@ module Bake
               if metadata_json = Bake.options.dev_features.include?("no-error-parser")
                 error_descs = []
                 console_output_full = x[0]
-                incList = []
               else
                 error_descs, console_output_full, incList = error_parser.scan_lines(x, @projectDir)
               end

data/lib/blocks/compile.rb

@@ -47,7 +47,7 @@ module Bake
 
     class Compile < BlockBase
 
-      attr_reader :objects, :include_list, :source_files_ignored_in_lib
+      attr_reader :objects, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib
 
       def mutex
         @mutex ||= Mutex.new
@@ -264,16 +264,17 @@ module Bake
           success = true
           consoleOutput = ""
           incList = nil
+
           if !Bake.options.diabCaseCheck
             success, consoleOutput = ProcessHelper.run(realCmd, false, false, nil, [0], @projectDir) if !Bake.options.dry
             incList = process_result(realCmd, consoleOutput, compiler[:ERROR_PARSER], nil, reason, success)
           end
 
-          if type != :ASM and not Bake.options.analyze and not Bake.options.prepro
+          if type != :ASM && !Bake.options.analyze && !Bake.options.prepro
             Dir.mutex.synchronize do
               if !Bake.options.diabCaseCheck
                 Dir.chdir(@projectDir) do
-                  incList = Compile.read_depfile(dep_filename, @projectDir, @block.tcs[:COMPILER][:DEP_FILE_SINGLE_LINE]) if incList.nil?
+                  incList = Compile.read_depfile(dep_filename, @projectDir, @block.tcs[:COMPILER][:DEP_FILE_SINGLE_LINE], compiler[:COMMAND]) if incList.nil?
                   Compile.write_depfile(source, incList, dep_filename_conv, @projectDir)
                 end
               end
@@ -291,7 +292,7 @@ module Bake
                       raise SystemCommandFailed.new
                     end
                     Dir.chdir(@projectDir) do
-                      incList = Compile.read_depfile(dep_filename, @projectDir, @block.tcs[:COMPILER][:DEP_FILE_SINGLE_LINE])
+                      incList = Compile.read_depfile(dep_filename, @projectDir, @block.tcs[:COMPILER][:DEP_FILE_SINGLE_LINE], compiler[:COMMAND])
                       Compile.write_depfile(source, incList, dep_filename_conv, @projectDir)
                     end
                     ergs = consoleOutput.scan(/# \d+ "([^"]+)" \d+/)
@@ -341,14 +342,12 @@ module Bake
             SyncOut.flushOutput()
           end
         end
-
-
-
       end
 
-      def self.read_depfile(dep_filename, projDir, lineType)
+      def self.read_depfile(dep_filename, projDir, lineType, command = "")
         deps = []
         begin
+          lineType = :single if command.include?("cafeCC")
           if lineType == :single
             File.readlines(dep_filename).each do |line|
               splitted = line.split(": ")
@@ -514,6 +513,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?
@@ -527,7 +527,13 @@ 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
@@ -536,6 +542,7 @@ module Bake
         return @source_files if @source_files and not @source_files.empty?
         @source_files = []
         @source_files_ignored_in_lib = []
+        @source_files_link_directly = []
         @fileTcs = {}
 
         exclude_files = Set.new
@@ -565,11 +572,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

@@ -1,4 +1,6 @@
 require_relative "../blocks/block"
+require_relative "ext/file"
+require_relative "../bake/config/checks"
 
 module Bake
 
@@ -9,6 +11,8 @@ module Bake
       Bake::IDEInterface.instance.set_abort(false)
       Blocks::Block.reset_block_counter
       Blocks::Block.reset_delayed_result
+      Configs::Checks.cleanupWarnings
+      ToCxx::reset_include_deps
     end
 
 end

data/lib/common/ext/file.rb

@@ -1,96 +1,115 @@
-require_relative '../utils'
-
-class File
-
-  SLASH = '/'
-
-  def self.is_absolute?(filename)
-    filename[0] == SLASH or filename[1] == ':'
-  end
-
-  def self.normalize(filename)
-    if filename.length > 1
-      toIsWindowsAbs = filename[1] == ':'
-      return filename[0].downcase + filename[1..-1] if toIsWindowsAbs
-    end
-    return filename
-  end
-
-  # seems both are rel or both are abs in all cases
-  def self.rel_from_to_project(from,to,endWithSlash = true)
-
-    return nil if from.nil? or to.nil?
-
-    toSplitted = to.split('/')
-    fromSplitted = from.split('/')
-
-    max = [toSplitted.length, fromSplitted.length].min
-
-
-    return nil if max < 1
-
-    i = 0
-
-    # path letter in windows may be case different
-    toIsWindowsAbs = false
-    if toSplitted[0].length > 1 and fromSplitted[0].length > 1
-      toIsWindowsAbs = toSplitted[0][1] == ':'
-      i = 1  if toIsWindowsAbs and fromSplitted[0][1] == ':' and toSplitted[0][0].downcase == fromSplitted[0][0].downcase
-    end
-
-    if (toIsWindowsAbs and i==0)
-      res = to
-      res += "/" if endWithSlash
-      return res
-    end
-
-    while i < max
-        break if toSplitted[i] != fromSplitted[i]
-      i += 1
-    end
-    j = i
-
-    res = []
-    while i < fromSplitted.length
-      res << ".."
-      i += 1
-    end
-
-    while j < toSplitted.length
-      res << toSplitted[j]
-      j += 1
-    end
-
-    if res.length == 0
-      return ""
-    end
-
-    res = res.join('/')
-    res += "/" if endWithSlash
-    res
-  end
-
-
-  def self.add_prefix(prefix, file)
-    if not prefix or is_absolute?(file)
-      file
-    else
-      prefix + file
-    end
-  end
-
-  def self.which(cmd)
-    return "" if not cmd
-    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-      exts.each { |ext|
-        exe = File.join(path, "#{cmd}#{ext}")
-        if File.executable?(exe) && !File.directory?(exe)
-          return File.dirname(exe.gsub(/[\\]/,'/'))
-        end
-      }
-    end
-    return ""
-  end
-
-end
+require_relative '../utils'
+
+class File
+
+  SLASH = '/'
+
+  @@warnedCase = []
+
+  def self.cleanupWarnings
+    @@warnedCase.clear
+  end
+
+  def self.is_absolute?(filename)
+    filename[0] == SLASH or filename[1] == ':'
+  end
+
+  def self.normalize(filename)
+    if filename.length > 1
+      toIsWindowsAbs = filename[1] == ':'
+      return filename[0].downcase + filename[1..-1] if toIsWindowsAbs
+    end
+    return filename
+  end
+
+  # seems both are rel or both are abs in all cases
+  def self.rel_from_to_project(from,to,endWithSlash = true)
+
+    return nil if from.nil? or to.nil?
+
+    toSplitted = to.split('/')
+    fromSplitted = from.split('/')
+
+    max = [toSplitted.length, fromSplitted.length].min
+
+
+    return nil if max < 1
+
+    i = 0
+
+    # path letter in windows may be case different
+    toIsWindowsAbs = false
+    if toSplitted[0].length > 1 and fromSplitted[0].length > 1
+      toIsWindowsAbs = toSplitted[0][1] == ':'
+      i = 1  if toIsWindowsAbs and fromSplitted[0][1] == ':' and toSplitted[0][0].downcase == fromSplitted[0][0].downcase
+    end
+
+    if (toIsWindowsAbs and i==0)
+      res = to
+      res += "/" if endWithSlash
+      return res
+    end
+
+    while i < max
+      if toSplitted[i] != fromSplitted[i]
+        if Bake.options.verbose >= 1 && Bake.options.caseSensitivityCheck
+          if toSplitted[i].casecmp(fromSplitted[i]) == 0
+            if !@@warnedCase.include?(fromSplitted[0..i].join("/"))
+              fromsj = fromSplitted[0..i].join("/")
+              tosj = toSplitted[0..i].join("/")
+              @@warnedCase << fromsj
+              @@warnedCase << tosj
+              Bake.formatter.printWarning("Warning: different cases for folders \"#{fromsj}\" and \"#{tosj}\" detected.")
+            end
+          end
+        end
+        break
+      end
+      i += 1
+    end
+    j = i
+
+    res = []
+    while i < fromSplitted.length
+      res << ".."
+      i += 1
+    end
+
+    while j < toSplitted.length
+      res << toSplitted[j]
+      j += 1
+    end
+
+    if res.length == 0
+      return ""
+    end
+
+    res = res.join('/')
+    res += "/" if endWithSlash
+    res
+  end
+
+
+  def self.add_prefix(prefix, file)
+    if not prefix or is_absolute?(file)
+      file
+    else
+      prefix + file
+    end
+  end
+
+  def self.which(cmd)
+    return "" if not cmd
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each { |ext|
+        exe = File.join(path, "#{cmd}#{ext}")
+        if File.executable?(exe) && !File.directory?(exe)
+          return File.dirname(exe.gsub(/[\\]/,'/'))
+        end
+      }
+    end
+    return ""
+  end
+
+end

data/lib/common/options/parser.rb

@@ -81,8 +81,8 @@ module Bake
                 if inPlaceArg
                   option.call(inPlaceArg, nil, nil)
                 else
-                  option.call(@argv[pos+1], nil, nil) # do not use inplace value
-                  pos = pos + 1
+                  ignore = option.call(@argv[pos+1], nil, nil) # do not use inplace value
+                  pos = pos + 1 if ignore != :ignore
                 end
               else
                 option.call(nil, nil, nil)

data/lib/common/root.rb

@@ -58,7 +58,7 @@ module Bake
 
     def self.calc_roots_bake(dir)
       def_roots = []
-      rootsFile = searchRootsFile(dir)
+      rootsFile = (File.file?(dir) ? dir : searchRootsFile(dir))
       if (rootsFile)
         File.open(rootsFile).each do |line|
           line = line.split("#")[0].strip.gsub(/[\\]/,'/')

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -45,10 +45,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 = {}
@@ -156,6 +165,7 @@ module Bake
       block.visited = true
 
       block.bes = []
+      block.besDirect = []
       block.config.depInc.each do |dep|
         if (Metamodel::Dependency === dep)
           @referencedConfigs[dep.name].each do |configRef|
@@ -175,6 +185,7 @@ module Bake
                 block.bes += subDeps
               end
               block.bes << dep
+              block.besDirect << dep
               break
             end
           end
@@ -230,6 +241,21 @@ 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
+    end
+    
     def makeIncs
       Blocks::ALL_BLOCKS.each do |name,block|
         bes2 = []
@@ -324,17 +350,12 @@ module Bake
 
           block.bes.each do |dep|
             next unless Metamodel::Dependency === dep
-            if dep.injected?
-              difr2 = difr.select{|d| Metamodel::IncludeDir === d }
-              diba2 = diba.select{|d| Metamodel::IncludeDir === d }
-            else
-              difr2 = difr
-              diba2 = diba
-            end
-          
+            difr2 = difr.select{|d| Metamodel::IncludeDir === d || d != dep}
+            diba2 = diba.select{|d| Metamodel::IncludeDir === d || d != dep}
             fde = Blocks::ALL_BLOCKS[dep.name+","+dep.config]
             l1 = fde.bes.length 
-            fde.bes = (difr2 + fde.bes + diba2).uniq # .select{|d| !(Metamodel::Dependency===d) || d.name != dep.name || d.config != dep.config }
+            fde.bes = (difr2 + fde.bes + diba2).uniq
+            fde.besDirect = (difr2 + fde.besDirect + diba2).uniq
             l2 = fde.bes.length
             counter += 1 if (l2 != l1)
           end
@@ -410,13 +431,15 @@ module Bake
           @referencedConfigs.each do |projName, configs|
             depsToProj = []
             configs.each do |config|
-              config.dependency.each do |d|
+              the_c = Blocks::ALL_BLOCKS[config.parent.name+","+config.name]
+              the_c.besDirect.each do |d|
+                next if Metamodel::IncludeDir === 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
+                    next if !leftSide && !rightSide
                   end
                 end
                 if Bake.options.dotShowProjOnly
@@ -693,6 +716,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
@@ -702,7 +727,17 @@ module Bake
             makeDot
           end
 
-          
+          if !Bake.options.cc2j_filename
+            if !@mainConfig.cdb.nil?
+              Bake.options.cc2j_filename = @mainConfig.cdb.name
+              if !File.is_absolute?(Bake.options.cc2j_filename)
+                Bake.options.cc2j_filename = File.join(
+                  File.rel_from_to_project(Dir.pwd, @mainConfig.parent.get_project_dir, false),
+                  Bake.options.cc2j_filename)
+              end
+            end
+          end
+
           metadata_json = Bake.options.dev_features.detect { |x| x.start_with?("metadata=") }
           if metadata_json
             metadata_file = metadata_json[9..-1]
@@ -731,7 +766,7 @@ module Bake
               puts "File #{metadata_file} written."
               ExitHelper.exit(0)
             else
-              Bake.formatter.printError("Error: dev-feature metadata is only for LibraryConfig for ExecutableConfig.")
+              Bake.formatter.printError("Error: dev-feature metadata is only for LibraryConfig or ExecutableConfig.")
               ExitHelper.exit(1)
             end
           end
@@ -786,7 +821,14 @@ module Bake
 
         if Bake.options.cc2j_filename
           require "json"
-          File.write(Bake.options.cc2j_filename, JSON.pretty_generate(Blocks::CC2J))
+          begin 
+            Bake.formatter.printInfo("Info: writing compilation database #{Bake.options.cc2j_filename}") if Bake.options.verbose >= 1
+            File.write(Bake.options.cc2j_filename, JSON.pretty_generate(Blocks::CC2J))
+          rescue Exception => ex
+            Bake.formatter.printError("Error: could not write compilation database: #{ex.message}")
+            puts ex.backtrace if Bake.options.debug
+            result = false
+          end
         end
 
         if Bake.options.filelist && !Bake.options.dry

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.59.0
+  version: 2.63.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext