bake-toolkit 2.60.2 → 2.61.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 196c55cc08919bff9381fc2c148d1cd4ec295667eb6fa90f4af8ae3080c3b9cc
-  data.tar.gz: 271409c11aeb347eaf6a3d6110a9e3d4aca6ce9f45cc144324f7bbaf63e3162f
+  metadata.gz: 3b7e3e8cf8a2ce67781a4f5701c0c7a3323ebe2d6b3a3b026bfd496655b3c545
+  data.tar.gz: 148d025bfbf226d78986655c586c6291c1f18c5f4925cc5c700324483db1ed58
 SHA512:
-  metadata.gz: 3902c531628b8cdaf2ce297b9be23b5bd1daaa7009e451797f28df16ff074624ff9c78a2599ae66590ca5fcff7d992e06ffe3e52daa4e937650134c33c2fb3dc
-  data.tar.gz: efb3178b80e2c48a164f1b5d8f6d16661ccffb3a795bb451afe3c64956b5f08315a38798dc7267575cda11633779875ae8f353c741bcee73e0c3234341ba0dcf
+  metadata.gz: 0b9fe89d71c63358256e78d1d5aa196a7d6606361fe833dfd01169dbb520c327f62ba7cd4033505b84af3c9c7430f4f64d49fc2e677b9c0836b229d300246860
+  data.tar.gz: a4b40affee87172e2b69cbb03896b112999ff578bf49cc48f53e010f181e123aa0e301e4c0f0ae35529f1abce1f200d0593c519da69cc9e8a14ef92390855bc1

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)
 

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/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 => ""
@@ -299,6 +303,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

@@ -19,8 +19,8 @@ module Bake
   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 +193,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 +324,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 +345,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")

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/common/cleanup.rb

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

data/lib/common/ext/file.rb

@@ -52,7 +52,7 @@ class File
 
     while i < max
       if toSplitted[i] != fromSplitted[i]
-        if Bake.options.verbose >= 1
+        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("/")

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.60.2"
+      "2.61.0"
     end
 
     def self.printBakeVersion(ry = "")

data/lib/tocxx.rb

@@ -701,7 +701,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]
@@ -730,7 +740,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
@@ -785,7 +795,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.60.2
+  version: 2.61.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext