bake-toolkit 2.42.1 → 2.42.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b90ba3d07f96a37da90faeb52c9349ccfbd3f40
-  data.tar.gz: f82470db0e10bf5ec247fb2160a2c4a2bb55f0e5
+  metadata.gz: 75f143b6235632040aaa32c21fa78875e329f4d4
+  data.tar.gz: 1b9a9c6a99e4eb48b959729c560e0fe29bae8752
 SHA512:
-  metadata.gz: 408c3b39a46ff98515567066393ecf09c62d735358f70143a29b02215525801b8e4fb242f07e40c58c14befec0b73570bec7b77e707af1ba2b8ee13373acd603
-  data.tar.gz: 61e1799cdcdd3c5d353c69ac7b0ac5facfc475b1bd51b31dd796f9a96e75b778e2b77209fbda66b66ecd89b9b26d3ace60bfc41a27d712142e5d406c36e1539b
+  metadata.gz: 74ef7187d30bd03f96d20028de7d4b7e10c513ef60f2aa46245aced7b0135eae8ab7d8941285cb1d08059ae30e24b5601caef31ef8076f75267560cadee2650f
+  data.tar.gz: 8e1d680f7ad4488183c4cd96a9facf5bcd2e95cb81228ce692c89ac532278b720f68ec87d26767e21d067c858638d946043ce9f0bab89f956e3d667f30d257e6

data/bin/bakeqac

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'fileutils'
+require 'set'
 
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 
@@ -19,6 +20,26 @@ module Bake
 
 @@cipFileSize = 1
 
+@@unsuppressibleErrorsList = [
+  "0019", "0020", "0031", "0034", "0035", "0036", "0061", "0098", "0099", "0224",
+  "0622", "0800", "0801", "0802", "0996", "1950", "1951", "1962", "1963", "1964",
+  "1965", "1966", "1967", "1968", "1969", "1970", "1971", "1972", "1973", "1974",
+  "1975", "1976", "1977", "1978", "1979", "1980", "1982", "1984", "1985", "1986",
+  "1987", "1989", "1990", "1991", "3104", "0014", "0015", "0016", "0021", "0022",
+  "0028", "0032", "0039", "0043", "0045", "0046", "0050", "0052", "0053", "0054",
+  "0058", "0059", "0079", "0083", "0101", "0133", "0150", "0165", "0170", "0174",
+  "0175", "0177", "0200", "0201", "0208", "0217", "0231", "0246", "0248", "0251",
+  "0253", "0255", "0257", "0271", "0276", "0278", "0279", "0282", "0284", "0285",
+  "0286", "0287", "0307", "0313", "0320", "0321", "0322", "0323", "0333", "0334",
+  "0335", "0336", "0339", "0400", "0401", "0403", "0404", "0405", "0415", "0424",
+  "0429", "0439", "0440", "0441", "0445", "0448", "0450", "0453", "0454", "0455",
+  "0456", "0457", "0458", "0459", "0469", "0481", "0482", "0483", "0484", "0491",
+  "0492", "0493", "0494", "0496", "0497", "0498", "0600", "0601", "0602", "0607",
+  "0608", "0611", "0616", "0617", "0619", "0620", "0621", "0627", "0631", "0632"]
+
+@@unsuppressibleErrors = Set.new()
+@@unsuppressibleErrorsList.each { |elem| @@unsuppressibleErrors << elem }
+
 def self.checkCipSize()
   cips = Dir.glob(@options.qacdata + "/**/*.cip")
   if !cips.empty?
@@ -301,6 +322,7 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
         linesOfFile = {}
         lineNum = 0
         currentMessage = []
+        suppressLine = false
         filteredLines.each do |line|
           if line.include? " ======= Results for "
             lineNum = 0
@@ -308,17 +330,41 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
             linesOfFile = {}
             sortedLines << line
           else
-            if (!@options.qacnoformat && line.start_with?("MSG: ")) || (@options.qacnoformat && line.include?(": Msg("))
-              lineScan = line.scan(/[^\(]*\((\d*)/)
-              lineNum = lineScan[0][0].to_i if lineScan.length > 0
-            end
-            if linesOfFile.has_key?lineNum
-              currentMessage = linesOfFile[lineNum]
+            if (!@options.qacnoformat && line.start_with?("MSG: ")) || (@options.qacnoformat && (line.include?(": Msg(") || line.include?(": Err(")))
+              begin
+                scanResult = line.scan(/([^\(\s]+)\s*\((\d+)[^\)]*\):\s*(Err|)\([^:]*:(\d+)\)/)
+                if scanResult.length > 0
+                  fileName = scanResult[0][0].gsub("\\", "/")
+                  lineNum = scanResult[0][1].to_i
+                  errorNum = scanResult[0][3]
+                  if (@@unsuppressibleErrors.include?errorNum)
+                    srcLine = File.readlines(fileName)[lineNum-1]
+                    if srcLine.match(Regexp.new("PRQA\s+S.+#{errorNum}"))
+                      suppressLine = true
+                    end
+                  end
+                end
+              rescue Exception =>ex
+                if Bake.options.debug
+                  puts ex.message
+                  puts ex.backtrace
+                end
+              end
+            elsif (!@options.qacnoformat && line.start_with?("trc: ")) || (@options.qacnoformat && line.include?("): -->("))
+              # nothing to be done here
             else
-              currentMessage = []
-              linesOfFile[lineNum] = currentMessage
+              suppressLine = false
+            end
+
+            if (!suppressLine)
+              if linesOfFile.has_key?lineNum
+                currentMessage = linesOfFile[lineNum]
+              else
+                currentMessage = []
+                linesOfFile[lineNum] = currentMessage
+              end
+              currentMessage << line
             end
-            currentMessage << line
           end
         end
         linesOfFile.sort.each { |lineNr, s| sortedLines += s }
@@ -327,7 +373,7 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
         numberOfMessages = 0
         sortedLines.each do |line|
           success = true if line.include?"The specified project does not have any source files" # to proceed we assume that this is a valid scenario
-          if (!@options.qacnoformat && line.start_with?("MSG: ")) || (@options.qacnoformat && line.include?(": Msg("))
+          if (!@options.qacnoformat && line.start_with?("MSG: ")) || (@options.qacnoformat && (line.include?(": Msg(") || line.include?(": Err(")))
             Bake.formatter.printWarning(line)
             if @options.qacdoc
               errorNumScan = line.scan(/[^\(]*\([^\(]*\([^:]*:(\d*)/)

data/lib/blocks/block.rb

@@ -315,8 +315,10 @@ module Bake
               exceptionOccured = true
             rescue Bake::SystemCommandFailed => scf # normal compilation error
             rescue SystemExit => exSys
+            rescue AbortException => exSys
+              Bake::IDEInterface.instance.set_abort(true)
             rescue Exception => ex1
-              if not Bake::IDEInterface.instance.get_abort
+              if !Bake::IDEInterface.instance.get_abort
                 SyncOut.mutex.synchronize do
                   Bake.formatter.printError("Error: #{ex1.message}")
                   puts ex1.backtrace if Bake.options.debug

data/lib/common/ext/stdout.rb

@@ -11,7 +11,10 @@ class ThreadOut
     if Thread.current[:stdout] then
       Thread.current[:stdout].write stuff
     else
-      @out.write stuff
+      begin
+        @out.write stuff
+      rescue Exception
+      end
     end
   end
 
@@ -19,7 +22,10 @@ class ThreadOut
     if Thread.current[:stdout] then
       Thread.current[:stdout].puts stuff
     else
-      @out.puts stuff
+      begin
+         @out.puts stuff
+      rescue Exception
+      end
     end
   end
 
@@ -27,7 +33,10 @@ class ThreadOut
     if Thread.current[:stdout] then
       Thread.current[:stdout].puts stuff
     else
-      @out.print stuff
+      begin
+        @out.print stuff
+      rescue Exception
+      end
     end
   end
 
@@ -35,7 +44,10 @@ class ThreadOut
     if Thread.current[:stdout] then
       Thread.current[:stdout].flush
     else
-      @out.flush
+      begin
+        @out.flush
+      rescue Exception
+      end
     end
   end
 end

data/lib/common/version.rb

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

metadata

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