bake-toolkit 2.54.2 → 2.54.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1f28f604eabf9369d88baeca22ca3197b795869d2e63abf5abad688e4bcd029
-  data.tar.gz: 4013fa730dd7932df41e7b1600d9a6be5ca9532778371944d54490fbfa5b3249
+  metadata.gz: b660cd9c40c8aac3678294bc00bf7f797b2c4fdd024bcf329db5ea640da69223
+  data.tar.gz: 45c476b4b32fa4990f2502f6e5f4dedc0386a3177f870fee6b25ef72cff4a437
 SHA512:
-  metadata.gz: a5714a0943746ec267597eb12de35b821a6fd57ca69be8d93c61a851706662f962ae2571a4d1f3a9414f6bcc9a4273943a45c52bac483ca0c86387b182824a7e
-  data.tar.gz: 8eb1da4a19aab634a3576225594f4e4318be9bc7bf4b71f91c464fb3c7e8b4a3ba3cd8948a24fc9b0ed37b7079c381f82e669e339fef6bb3e0ceb9929e3b4705
+  metadata.gz: 36a9dbdae13d2985641b0d16a213c5daaa42279e41232dc6830aa3e07eac3df51ba8050c92a6f0febf2923f47f5e79dff3ccff748b2fd90b8e3a46501cc3db71
+  data.tar.gz: 368185045fe98fa0801f45fd268410adcf86651ac300f26015e51060196b7f7d784c17cb119219e7e6a3354ab870f36d82d66e0dfc8f5b2d8321686d030d255e

data/bin/bakeqac

@@ -66,8 +66,8 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
   processTimeout = false
 
   loop do
-    FileUtils.rm_rf @options.qacdata if adminStepAndImmediateOutput
-    FileUtils::mkdir_p @options.qacdata
+    FileUtils.rm_rf(@options.qacdata) if adminStepAndImmediateOutput
+    Utils.gitIgnore(@options.qacdata)
 
     cmdDupped = cmd.dup
     cmdDupped << @options.qacdata
@@ -226,7 +226,7 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
 ###### STEP 2: BUILD ######
 
   if success and (@options.qacstep.nil? or @options.qacstep.include?"analyze")
-    FileUtils::mkdir_p @options.qacdata
+    Utils.gitIgnore(@options.qacdata)
 
     cmd = qaExe + ["analyze", "-b"]
 
@@ -287,7 +287,7 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
 ###### STEP 3: RESULT ######
 
   if success and (@options.qacstep.nil? or @options.qacstep.include?"view")
-    FileUtils::mkdir_p @options.qacdata
+    Utils.gitIgnore(@options.qacdata)
 
     puts "bakeqac: printing results..."
 
@@ -453,7 +453,7 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
 ###### STEP 4b: REPORT SUR (OPTIONAL) ######
 
   if success and !@options.qacstep.nil? and @options.qacstep.include?("report")
-    FileUtils::mkdir_p @options.qacdata
+    Utils.gitIgnore(@options.qacdata)
 
     puts "bakeqac: generating SUR report..."
 
@@ -467,7 +467,7 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
 ###### STEP 4c: REPORT RCR (OPTIONAL) ######
 
   if success and !@options.qacstep.nil? and @options.qacstep.include?("report")
-    FileUtils::mkdir_p @options.qacdata
+    Utils.gitIgnore(@options.qacdata)
 
     puts "bakeqac: generating RCR report..."
 
@@ -481,7 +481,7 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
 ###### STEP 5: REPORT MDR (OPTIONAL) ######
 
   if success and !@options.qacstep.nil? and @options.qacstep.include?("mdr")
-    FileUtils::mkdir_p @options.qacdata
+    Utils.gitIgnore(@options.qacdata)
 
     puts "bakeqac: generating MDR report..."
 

data/lib/bake/cache.rb

@@ -30,7 +30,9 @@ module Bake
         else
           @cacheFilename = Bake.options.main_dir+"/.bake/Project.meta." + sanitize_filename(Bake.options.build_config) + qacStr + ".cache"
         end
-        FileUtils.mkdir_p(File.dirname(@cacheFilename)) if !Bake.options.dry
+        if !Bake.options.dry
+          Utils.gitIgnore(File.dirname(@cacheFilename)) 
+        end
       end
 
       def load_cache

data/lib/bake/model/loader.rb

@@ -71,6 +71,10 @@ module Bake
         end
       })
 
+      if !Bake.options.dry
+        Utils.gitIgnore(File.dirname(filename)+"/.bake")
+      end
+
       frag = @model.fragments[0]
       @model.remove_fragment(frag)
       frag

data/lib/bake/options/usage.rb

@@ -18,7 +18,7 @@ module Bake
       puts " -p <dir>                 Project to build/clean (default is main project)"
       puts " -f <name>                Build/Clean this file only."
       puts " -c                       Clean the file/project."
-      puts " -a <scheme>              Use ansi color sequences (console must-- support it). Possible values are 'white' and 'black'."
+      puts " -a <scheme>              Use ansi color sequences (console must support it). Possible values are 'white', 'black' and 'none' (default)."
       puts " -v<level>                Verbose level from 0 to 3, whereas -v0 is less, -v1 is normal (default) and -v2 and -v3 are more verbose."
       puts " -r                       Stop on first error."
       puts " -w <root>[,<depth>]      Add a workspace root (can be used multiple times). Additionally the search depth can be specified (>=0)."

data/lib/bake/subst.rb

@@ -41,7 +41,7 @@ module Bake
 
     def self.resolveOutputDir()
       @@outputDirUnresolved.each do |elem|
-        subst(elem)
+        subst(elem) if elem
      end
     end
 
@@ -156,7 +156,7 @@ module Bake
 
     end
 
-    def self.substString(str, elem=nil)
+    def self.substString(str, elem=nil, attrName=nil)
       substStr = ""
       posSubst = 0
       while (true)
@@ -256,7 +256,7 @@ module Bake
             configs = @@referencedConfigs[out_proj_name]
             config = configs.select {|c| c.name == out_conf_name }.first
             if config
-               out_dir = nil
+              out_dir = nil
               if (config.toolchain and config.toolchain.outputDir and config.toolchain.outputDir != "")
                 out_dir = config.toolchain.outputDir
               else
@@ -272,6 +272,10 @@ module Bake
               end
 
               if (out_dir.include?"$(")
+                if !elem
+                  Bake.formatter.printError("Variable OutputDir not used correctly in this config", @@config)
+                  ExitHelper.exit(1)
+                end
                 substStr << str[posStart..posEnd]
                 @@outputDirUnresolved << elem
               else
@@ -368,7 +372,7 @@ module Bake
         return if Metamodel::DefaultToolchain === elem
         return if Metamodel::Toolchain === elem.class
         next if a.eType.name != "EString"
-        substStr = substString(elem.getGeneric(a.name), elem)
+        substStr = substString(elem.getGeneric(a.name), elem, a.name)
         elem.setGeneric(a.name, substStr)
       end
 

data/lib/bake/toolchain/colorizing_formatter.rb

@@ -12,7 +12,7 @@ module Bake
     def setColorScheme(scheme)
 
       if (scheme != :black and scheme != :white and scheme != :none)
-        Bake.formatter.printError("Error: color scheme must be 'black' or 'white'")
+        Bake.formatter.printError("Error: color scheme must be 'black', 'white' or 'none'")
         ExitHelper.exit(1)
       end
       @scheme = scheme

data/lib/bake/toolchain/errorparser/tasking_compiler_error_parser.rb

@@ -4,7 +4,8 @@ module Bake
   class TaskingCompilerErrorParser < ErrorParser
 
     def initialize()
-      @error_expression = /.* (.+): \[\"(.+)\" ([0-9]+)\] (.*)/
+      @error_expression  = /.* (.+): \[\"(.+)\" ([0-9]+)\/*[0-9]*\] (.*)/
+      @error_expression2 = /.* (.+): (.+) “(.*)”/
     end
 
     def scan_lines(consoleOutput, proj_dir)
@@ -19,7 +20,15 @@ module Bake
           d.line_number = scan_res[0][2].to_i
           d.message = scan_res[0][3]
           d.severity = get_tasking_severity(scan_res[0][0])
-          l.gsub!(scan_res[0][0],d.file_name)
+          l.gsub!(scan_res[0][1],d.file_name)
+        end
+        scan_res = lstripped.scan(@error_expression2)
+        if scan_res.length > 0
+          d.file_name = File.expand_path(scan_res[0][2], proj_dir)
+          d.line_number = 0
+          d.message = scan_res[0][1]
+          d.severity = get_tasking_severity(scan_res[0][0])
+          l.gsub!(scan_res[0][2],d.file_name)
         end
         res << d
         consoleOutputFullnames << l

data/lib/bakery/options/options.rb

@@ -35,7 +35,7 @@ module Bake
       puts " [-b] <name>           Name of the collection to build."
       puts " -m <dir>              Directory containing the collection file (default is current directory)."
       puts " -r                    Stop on first error."
-      puts " -a <scheme>           Use ansi color sequences (console must support it). Possible values are 'white' and 'black'."
+      puts " -a <scheme>           Use ansi color sequences (console must support it). Possible values are 'white', 'black' and 'none' (default)."
       puts " -h, --help            Print this help."
       puts " -w <root>[,<depth>]   Add a workspace root (can be used multiple times). Additionally the search depth can be specified (>=0)."
       puts "                       If no root is specified, the parent directory of Collection.meta is added automatically."

data/lib/blocks/blockBase.rb

@@ -26,15 +26,16 @@ module Bake
         end
       end
 
-      def self.prepareOutput(filename)
+      def self.prepareOutput(filename, block = nil)
         return if Bake.options.dry
         filename = File.expand_path(filename, @projectDir)
         begin
           if File.exists?(filename)
             FileUtils.rm(filename)
           else
-            FileUtils.mkdir_p(File.dirname(filename))
+            FileUtils::mkdir_p(File.dirname(filename))
           end
+          Utils.gitIgnore(File.expand_path(block.output_dir, @projectDir)) if block
         rescue Exception => e
           if Bake.options.debug
             puts e.message
@@ -217,7 +218,7 @@ module Bake
 
         cmdFile = orgOut + ".file" + postfix
         cmdFileLong = File.expand_path(cmdFile, @projectDir)
-        FileUtils.mkdir_p(File.dirname(cmdFileLong))
+        Utils.gitIgnore(File.dirname(cmdFileLong))
         File.open(cmdFileLong, "w") { |f| f.puts argsFlat }
         return onlyCmd + ["#{tcs[:FILE_COMMAND]}#{cmdFile}"]
       end

data/lib/blocks/compile.rb

@@ -419,6 +419,9 @@ module Bake
             puts "Profiling #{Time.now - $timeStart}: prepareIncludes (#{@projectName+","+@config.name}) stop..." if Bake.options.profiling
           end
 
+          odir = File.expand_path(@block.output_dir, @projectDir)
+          Utils.gitIgnore(odir) if !Bake.options.dry
+
           fileListBlock = Set.new if Bake.options.filelist
           compileJobs = Multithread::Jobs.new(@source_files) do |jobs|
             while source = jobs.get_next_or_nil do
@@ -460,8 +463,6 @@ module Bake
           if Bake.options.filelist && !Bake.options.dry
             Bake.options.filelist.merge(fileListBlock.merge(fileListBlock))
 
-            odir = File.expand_path(@block.output_dir, @projectDir)
-            FileUtils.mkdir_p(odir)
             File.open(odir + "/" + "file-list.txt", 'wb') do |f|
               fileListBlock.sort.each do |entry|
                 f.puts(entry)
@@ -676,7 +677,7 @@ module Bake
               mergeCounter += 1
               mdir = File.expand_path(@block.output_dir+"/mergedIncludes#{mergeCounter}", @projectDir)
               FileUtils.rm_rf(mdir)
-              FileUtils.mkdir_p(mdir)
+              Utils.gitIgnore(mdir)
               inmerge = true
             end
             if !merging
@@ -712,7 +713,7 @@ module Bake
             sum + si
           end
           puts "Profiling #{Time.now - $timeStart}: copy #{sum} byte in #{filesToCopy.length} files..." if Bake.options.profiling
-          destDirs.each {|d| FileUtils.mkdir_p(d)}
+          destDirs.each {|d| Utils.gitIgnore(d) }
           filesToCopy.each do |t, dest|
             dest.each do |d|
               FileUtils.cp_r(t, d, :preserve => true)

data/lib/blocks/executable.rb

@@ -17,7 +17,11 @@ module Bake
       end
 
       def calcLinkerScript
-        @linker_script = @config.linkerScript.nil? ? nil : @block.convPath(@config.linkerScript)
+        if Metamodel::LibraryConfig === @config
+          @linker_script = nil
+        else
+          @linker_script = @config.linkerScript.nil? ? nil : @block.convPath(@config.linkerScript)
+        end
       end
 
       def calcArtifactName
@@ -43,6 +47,11 @@ module Bake
 
       def calcMapFile
         @mapfile = nil
+        if Metamodel::LibraryConfig === @config
+          def @config.mapFile
+            Metamodel::MapFile.new
+          end
+        end
         if (not Bake.options.docu) and (not @config.mapFile.nil?)
           if @config.mapFile.name == ""
             @mapfile = @exe_name.chomp(File.extname(@exe_name)) + ".map"
@@ -171,7 +180,7 @@ module Bake
           else
             ToCxx.linkBlock
 
-            BlockBase.prepareOutput(@exe_name)
+            BlockBase.prepareOutput(@exe_name, @block)
 
             printCmd(cmdLinePrint, "Linking   #{@projectName} (#{@config.name}): #{@exe_name}", reason, false)
             BlockBase.writeCmdLineFile(cmd, cmdLineFile)

data/lib/blocks/library.rb

@@ -121,7 +121,7 @@ module Bake
 
             begin
               success = true
-              BlockBase.prepareOutput(File.expand_path(@archive_name, @projectDir))
+              BlockBase.prepareOutput(File.expand_path(@archive_name, @projectDir), @block)
               BlockBase.writeCmdLineFile(cmd, cmdLineFile)
               consoleOutput = ""
 

data/lib/common/root.rb

@@ -64,6 +64,7 @@ module Bake
           line = line.split("#")[0].strip.gsub(/[\\]/,'/')
           if line != ""
             root = Root.extract_depth(line)
+            root.dir = root.dir[0..-2] if root.dir.end_with?("/")
             if !File.is_absolute?(root.dir)
               root.dir = File.expand_path(File.dirname(rootsFile) + "/" + root.dir)
             end

data/lib/common/utils.rb

@@ -3,6 +3,14 @@ require 'rbconfig'
 module Bake
 
   module Utils
+    
+    def self.gitIgnore(folder)
+      FileUtils::mkdir_p(folder)
+      gitignore = folder + "/.gitignore"
+      if !File.exist?(gitignore)
+        File.write(gitignore, ".\n")
+      end
+    end
 
     def self.flagSplit(str, removeQuotes)
       return [] if str == ""

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -505,16 +505,14 @@ module Bake
               block.mainSteps << compile
             end
             if not Bake.options.filename and not Bake.options.analyze
-              if Metamodel::LibraryConfig === config
-                block.mainSteps << Blocks::Library.new(block, config, @referencedConfigs, compile)
-              else
+              if Metamodel::ExecutableConfig === config || (Bake.options.dev_features.include?("enforce-executable-config") && config == @mainConfig)
                 block.mainSteps << Blocks::Executable.new(block, config, @referencedConfigs, compile) unless block.prebuild
+              else
+                block.mainSteps << Blocks::Library.new(block, config, @referencedConfigs, compile)
               end
             end
           end
 
-
-
         end
       end
     end
@@ -716,7 +714,12 @@ module Bake
                 f.puts "  \"module_path\":  \"#{mainBlock.projectDir}\","
                 f.puts "  \"config_name\":  \"#{@mainConfig.name}\","
                 Dir.chdir(mainBlock.projectDir) do
-                  f.puts "  \"artifact\":     \"#{File.expand_path(mainBlock.mainSteps.last.calcArtifactName)}\","
+                  if Blocks::Library === mainBlock.mainSteps.last || Blocks::Executable === mainBlock.mainSteps.last
+                    aName = File.expand_path(mainBlock.mainSteps.last.calcArtifactName)
+                  else
+                    aName = ""
+                  end
+                  f.puts "  \"artifact\":     \"#{aName}\","
                 end
                 f.puts "  \"compiler_c\":   \"#{@defaultToolchain[:COMPILER][:C][:COMMAND]}\","
                 f.puts "  \"compiler_cxx\": \"#{@defaultToolchain[:COMPILER][:CPP][:COMMAND]}\","
@@ -789,7 +792,7 @@ module Bake
         if Bake.options.filelist && !Bake.options.dry
           mainBlock = Blocks::ALL_BLOCKS[Bake.options.main_project_name+","+Bake.options.build_config]
           Dir.chdir(mainBlock.projectDir) do
-            FileUtils.mkdir_p(mainBlock.output_dir)
+            Utils.gitIgnore(mainBlock.output_dir)
             File.open(mainBlock.output_dir + "/" + "global-file-list.txt", 'wb') do |f|
               Bake.options.filelist.sort.each do |entry|
                 f.puts(entry)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.54.2
+  version: 2.54.3
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Build tool to compile C/C++ projects fast and easy.