bake-toolkit 2.37.14 → 2.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3aaec6d38662152abd693f17c8b44a47e483c15
-  data.tar.gz: 44a27f6a3baf79d46599e827d03ce024595f9493
+  metadata.gz: 8fe8160f5c00bfbdb0b8f53dd51f34de03c113da
+  data.tar.gz: 19b60b81d616cb347710c196b0a35cfd49a843b1
 SHA512:
-  metadata.gz: 73685aa42e576c8551e70b965a65059446b76e27f493233a2a55e8c20f48ffd154871a97b39ab00e00b47a60f60ac5bf65609933753cf6af7b2b71cb00f5cfe7
-  data.tar.gz: c82d5f60e374ad58176d13a860aa3d1e23b0f71ce7835c27b9d7dcf1386537a06cc87717aed186547f8f3e15a3986f80aa24842e37acf1fc188ac1e2bb326a11
+  metadata.gz: a85cee46490cb6e671fd30d4b8f0d8eb25a5bede3ddd81b9de2fe7e4aff56f4cfd2538c4d52939d5a2b71ea7b4bc75682971a9c688e8ebd0866fe58a655036d5
+  data.tar.gz: eedd45fbd7f9adf294290ff7de81f830377cbeab8d464735f39e6291430321633d14462cb9a7e634eda91738d887d3a60547927312fe2b35cb5c0ae5fe292a61

data/bin/bakeqac

@@ -123,7 +123,7 @@ end
   excludeParam = false
   wasMinus = false
   ARGV.each do |x|
-    if ["--c++11", "--c++14", "--qacnofilter", "--qacnoformat", "--qacrawformat", "--qacunittest", "--qacdoc", "--qaccctpatch"].include?x
+    if ["--c++11", "--c++14", "--qacnofilefilter", "--qacnomsgfilter", "--qacnofilter", "--qacnoformat", "--qacrawformat", "--qacunittest", "--qacdoc", "--qaccctpatch"].include?x
       excludeParam = false
       next
     elsif ["--cct", "--rcf", "--acf", "--qacdata", "--qacstep", "--qacretry"].include?x
@@ -235,10 +235,13 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
       end
     end
 
-    if @options.qacfilter
+    if success
+      ProjectFilter.writeFilter(filter)
+    end
+
+    if @options.qacmsgfilter
       if success
         puts filterOutput
-        ProjectFilter.writeFilter(filter)
       else
         puts consoleOutput # error
       end
@@ -277,11 +280,15 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
             converted_line = (scan_res[0][0].downcase + scan_res[0][1] + scan_res[0][2].gsub(/\\/,"/"))
             foundFile = ProjectFilter.localFile(converted_line)
           end
-          if foundFile && !line.include?("QAC++ Deep Flow Static Analyser")
+          if foundFile && (!line.include?("QAC++ Deep Flow Static Analyser") || !@options.qacmsgfilter)
             filteredLines << line
-          elsif !success # HACK, see above
-            filteredLines << line if ["MSG: ", "trc: ", "// ======= Results for"].none? { |pattern| line.include?(pattern) }
+          else
+            misraLine = ["MSG: ", "trc: ", "// ======= Results for"].none? { |pattern| line.include?(pattern) }
+            if !success || (misraLine && !@options.qacmsgfilter) # HACK, see above
+              filteredLines << line
+            end
           end
+
         end
 
         # 2. sort

data/lib/bakeqac/filter.rb

@@ -19,7 +19,7 @@ module Bake
     end
 
     def self.localFile(str)
-      return true if not is_valid?
+      return true if (not is_valid?) || (not @@options.qacfilefilter)
       projects.any? { |fil| str.include?(fil+"/") and not str.include?(fil+"/test/") and not str.include?(fil+"/mock/") and not str.include?(fil+"/.qacdata/") }
     end
 
@@ -35,7 +35,7 @@ module Bake
     def self.calcFilter_internal
       @@filterList = []
       filter_filename = "#{@@options.qacdata}/filter.txt"
-      @@valid = File.exist?(filter_filename) && @@options.qacfilter
+      @@valid = File.exist?(filter_filename)
       if @@valid
         File.open(filter_filename, "r") do |f|
           f.each_line { |line| @@filterList << line.strip }

data/lib/bakeqac/options/options.rb

@@ -7,7 +7,7 @@ module Bake
 
   class BakeqacOptions < Parser
     attr_reader :rcf, :acf, :qacstep, :qac_home, :cct_append  # String
-    attr_reader :c11, :c14, :qacfilter, :qacnoformat, :qacunittest, :qacdoc, :cct_patch # Boolean
+    attr_reader :c11, :c14, :qacmsgfilter, :qacfilefilter, :qacnoformat, :qacunittest, :qacdoc, :cct_patch # Boolean
     attr_reader :cct # Array
     attr_reader :qacretry # int
     attr_accessor :qacdata # String
@@ -26,7 +26,8 @@ module Bake
       @default = nil
       @qacdata = nil
       @qacstep = nil
-      @qacfilter = true
+      @qacmsgfilter = true
+      @qacfilefilter = true
       @qacnoformat = false
       @qacunittest = false
       @qacretry = 0
@@ -45,7 +46,9 @@ module Bake
       add_option(["--qaccctpatch"                  ], lambda { @cct_patch = true                })
       add_option(["--qacdata"                      ], lambda { |x| @qacdata = x.gsub(/\\/,"/")  })
       add_option(["--qacstep"                      ], lambda { |x| @qacstep = x                 })
-      add_option(["--qacnofilter"                  ], lambda { @qacfilter = false               })
+      add_option(["--qacnofilter"                  ], lambda { @qacfilefilter = false; @qacmsgfilter = false }) # backward compatibility
+      add_option(["--qacnofilefilter"              ], lambda { @qacfilefilter = false           })
+      add_option(["--qacnomsgfilter"               ], lambda { @qacmsgfilter = false            })
       add_option(["--qacretry"                     ], lambda { |x| @qacretry = x.to_i           })
       add_option(["--qacnoformat", "--qacrawformat"], lambda { @qacnoformat = true              })
       add_option(["--qacunittest"                  ], lambda { @qacunittest = true              })
@@ -67,7 +70,8 @@ module Bake
       puts " --qaccctpatch    If specified, some adaptions to cct are made. Might improve the result - no guarantee."
       puts " --qacdata <dir>  QAC writes data into this folder. Default is <working directory>/.qacdata."
       puts " --qacstep admin|analyze|view|report|mdr   Steps can be ORed. Per default admin|analyze|view will be executed."
-      puts " --qacnofilter    Output will be printed immediately and unfiltered. Per default filters are used to reduce noise."
+      puts " --qacnofilefilter Some files will be filtered per default, like /test/."
+      puts " --qacnomsgfilter  Some messages will be filter per default filters to reduce noise."
       puts " --qacrawformat   Raw QAC output (with incomplete MISRA rules!)."
       puts " --qacretry <seconds>   If build or result step fail due to refused license, the step will be retried until timeout."
       puts " --qacdoc         Print link to HTML help page for every warning if found."

data/lib/bakery/toBake.rb

@@ -55,12 +55,6 @@ module Bake
       end
     end
 
-    toBuildPattern.each do |bp|
-      if not bp.coll_p.isFound
-        Bake.formatter.printInfo("No match for project #{bp.coll_p.name} with config #{bp.coll_p.config}", @options.collection_dir+"/Collection.meta", bp.coll_p.line_number)
-      end
-    end
-
     col.exclude.each do |p|
       p.name = "/"+p.name.gsub("*","(\\w*)")+"/Project.meta"
       p.config = "^"+p.config.gsub("*","(\\w*)")+"$"

data/lib/blocks/compile.rb

@@ -159,8 +159,8 @@ module Bake
           raise SystemCommandFailed.new
         end
 
-        cmd = Utils.flagSplit(compiler[:PREFIX], false)
-        cmd += Utils.flagSplit(compiler[:COMMAND], false)
+        cmd = Utils.flagSplit(compiler[:PREFIX], true)
+        cmd += Utils.flagSplit(compiler[:COMMAND], true)
         cmd += compiler[:COMPILE_FLAGS].split(" ")
 
         if dep_filename
@@ -228,6 +228,11 @@ module Bake
             end if Bake.options.filelist
           end
           check_config_file
+        else
+          if Bake.options.filename and Bake.options.verbose >= 1
+            puts "Up-to-date #{source}"
+            SyncOut.flushOutput()
+          end
         end
 
 
@@ -286,8 +291,10 @@ module Bake
       def execute
         #Dir.chdir(@projectDir) do
 
-          calcSources
-          calcObjects
+          SyncOut.mutex.synchronize do
+            calcSources
+            calcObjects
+          end
 
           fileListBlock = Set.new if Bake.options.filelist
           compileJobs = Multithread::Jobs.new(@source_files) do |jobs|
@@ -439,7 +446,7 @@ module Bake
           @source_files.keep_if do |source|
             source.include?Bake.options.filename
           end
-          if @source_files.length == 0 and cleaning == false and @config.files.length > 0
+          if @source_files.length == 0 and cleaning == false and @config.files.length > 0 and Bake.options.verbose >= 2
             Bake.formatter.printInfo("#{Bake.options.filename} does not match to any source", @config)
           end
         end

data/lib/blocks/executable.rb

@@ -116,8 +116,8 @@ module Bake
 
           linker = @block.tcs[:LINKER]
 
-          cmd = Utils.flagSplit(linker[:PREFIX], false)
-          cmd += Utils.flagSplit(linker[:COMMAND], false) # g++
+          cmd = Utils.flagSplit(linker[:PREFIX], true)
+          cmd += Utils.flagSplit(linker[:COMMAND], true) # g++
           cmd += linker[:MUST_FLAGS].split(" ")
           cmd += Bake::Utils::flagSplit(linker[:FLAGS],true)
 

data/lib/blocks/library.rb

@@ -87,8 +87,8 @@ module Bake
           end
           archiver = @block.tcs[:ARCHIVER]
 
-          cmd = Utils.flagSplit(archiver[:PREFIX], false)
-          cmd += Utils.flagSplit(archiver[:COMMAND], false) # ar
+          cmd = Utils.flagSplit(archiver[:PREFIX], true)
+          cmd += Utils.flagSplit(archiver[:COMMAND], true) # ar
           cmd += Bake::Utils::flagSplit(archiver[:FLAGS],true) # --all_load
           cmd += archiver[:ARCHIVE_FLAGS].split(" ")
 

data/lib/common/root.rb

@@ -79,6 +79,10 @@ module Bake
     end
 
     def self.search_to_depth(root, baseName, depth)
+      if not File.exist?(root)
+        Bake.formatter.printError("Root #{root} does not exist.")
+        ExitHelper.exit(1)
+      end
       if depth != nil
         array = Array.new(depth+1) {|i| root + '/*'*i + '/' + baseName}
         return Dir.glob(array).sort

data/lib/common/utils.rb

@@ -15,12 +15,12 @@ module Bake
       s = ""
 
       str.split("").each do |i|
-        hasDoubleQuote = !hasDoubleQuote if !hasQuote and i == '"'
-        hasQuote = !hasQuote if !hasDoubleQuote and i == '\''
-        hadQuote = true if hasDoubleQuote
+        hasDoubleQuote = !hasDoubleQuote if !hasQuote && i == '"'
+        hasQuote = !hasQuote if !hasDoubleQuote && i == '\''
+        hadQuote = true if hasDoubleQuote || hasQuote
         if i == ' '
-          if not hasDoubleQuote and not hasQuote
-            if hadQuote and removeQuotes
+          if !hasDoubleQuote && !hasQuote
+            if hadQuote && removeQuotes
               ar << s[1..-2] if s.length > 2
               hadQuote = false
             else
@@ -32,7 +32,11 @@ module Bake
         end
         s << i
       end
-      ar << s if s.length > 0
+      if !hasDoubleQuote && !hasQuote && hadQuote && removeQuotes
+        ar << s[1..-2] if s.length > 2
+      elsif s.length > 0
+        ar << s
+      end
       ar
     end
 

data/lib/common/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.37.14
+  version: 2.38.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -80,6 +80,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement