bake-toolkit 2.40.0 → 2.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb0adac43c63f67a6209eb737f5fea0441715416
-  data.tar.gz: 8f8b68bad2c337986352025b60cde6630e9ae7a5
+  metadata.gz: 47018509fb45c727f0be0b11470726b01d13606a
+  data.tar.gz: 3b0fa9295363deb6ee596df9c4c3d1c87d4c40e7
 SHA512:
-  metadata.gz: 0ae585591499cfb4c85cd413388d7e07679c79f07b0e7d415849dc2e008393a8f2af0c787457f2554d1445d94e2fa77bbed6fd3f9feb80e8f362d86053fca820
-  data.tar.gz: ad887fd898e1e4b8570e1b8c334fad34669957cee3c44f7678dbe3dbec2c55f30872f367884df4e234f3ef16334b37041c53b37974cd3315c895d31d852bb058
+  metadata.gz: d0ba48431dba2e59155c9d8026acce4a9f1d23a844ae4c347131d71a1b7150a24201e62f0b4afbd7e4c9a3581a12d2ee4a1a993c951ca744ce25aa82ae59889f
+  data.tar.gz: aa757eb55d06270e41ecfb84d885ec0db3d94b37702f589cfd39f965f4df8870f1caed7b8126fffaeff6c3ba94a92d1119dced7509a9b2e49aab885de98a0008

data/bin/bakeqac

@@ -321,33 +321,37 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
 
         # 3. print
         numberOfMessages = 0
-        Dir.chdir(@options.qac_home) do
-          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("))
-              Bake.formatter.printWarning(line)
-              if @options.qacdoc
-                errorNumScan = line.scan(/[^\(]*\([^\(]*\([^:]*:(\d*)/)
-                if errorNumScan.length > 0
-                  errorNum = errorNumScan[0][0].to_i
-                  htmlFiles = Dir.glob("components/qacpp*/doc-en_US/messages/%04d.html" % errorNum) + Dir.glob("components/mcpp*/doc-en_US/messages/%04d.html" % errorNum)
-                  htmlFiles.each do |htmlFile|
+        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("))
+            Bake.formatter.printWarning(line)
+            if @options.qacdoc
+              errorNumScan = line.scan(/[^\(]*\([^\(]*\([^:]*:(\d*)/)
+              if errorNumScan.length > 0
+                errorNum = errorNumScan[0][0].to_i
+                Dir.chdir(@options.qac_home) do
+                  htmlFiles = Dir.glob("components/qacpp*/doc-en_US/messages/%04d.html" % errorNum).each do |htmlFile|
+                    puts "doc: #{File.expand_path(htmlFile)}"
+                  end
+                end
+                Dir.chdir(@options.mcpp_home) do
+                  htmlFiles = Dir.glob("components/mcpp*/doc-en_US/messages/%04d.html" % errorNum).each do |htmlFile|
                     puts "doc: #{File.expand_path(htmlFile)}"
                   end
                 end
               end
-              numberOfMessages += 1
-            elsif line.include? " ======= Results for "
-              Bake.formatter.printAdditionalInfo(line)
-            else
-              Bake.formatter.printInfo(line)
             end
+            numberOfMessages += 1
+          elsif line.include? " ======= Results for "
+            Bake.formatter.printAdditionalInfo(line)
+          else
+            Bake.formatter.printInfo(line)
           end
-          Bake.formatter.printSuccess("\n**** Number of messages: #{numberOfMessages} ****")
-          if !success # HACK, see above
-            Bake.formatter.printInfo("\nNote: qacli exited with error, maybe the number of messages was too high and output was truncated.")
-            success = true
-          end
+        end
+        Bake.formatter.printSuccess("\n**** Number of messages: #{numberOfMessages} ****")
+        if !success # HACK, see above
+          Bake.formatter.printInfo("\nNote: qacli exited with error, maybe the number of messages was too high and output was truncated.")
+          success = true
         end
       else
         puts consoleOutput # error

data/lib/bakeqac/options/options.rb

@@ -6,12 +6,14 @@ require 'common/options/finder'
 module Bake
 
   class BakeqacOptions < Parser
-    attr_reader :rcf, :acf, :qacstep, :qac_home, :cct_append  # String
+    attr_reader :rcf, :acf, :qacstep, :qac_home, :mcpp_home, :cct_append  # String
     attr_reader :c11, :c14, :qacmsgfilter, :qacfilefilter, :qacnoformat, :qacunittest, :qacdoc, :cct_patch # Boolean
     attr_reader :cct # Array
     attr_reader :qacretry # int
     attr_accessor :qacdata # String
 
+    RCF_DEFAULT = "config/rcf/mcpp-1_5_1-en_US.rcf".freeze()
+
     def initialize(argv)
       super(argv)
 
@@ -65,11 +67,12 @@ module Bake
       puts " --cct <file>     Set a specific compiler compatibility template, can be defined multiple times."
       puts "                  If not specified, $(QAC_HOME)/config/cct/<platform>.ctt will be used and additionally"
       puts "                  a file named qac.cct will be searched up to root and also used if found."
-      puts " --rcf <file>     Set a specific rule config file. If not specified, $(QAC_HOME)/config/rcf/mcpp-1_5_1-en_US.rcf will be used."
+      puts " --rcf <file>     Set a specific rule config file. If not specified, $(MCPP_HOME)/#{RCF_DEFAULT} will be used."
       puts " --acf <file>     Set a specific analysis config file, otherwise $(QAC_HOME)/config/acf/default.acf will be used."
       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 " --qacstep <steps> Can be admin,analyze,view,report,mdr (separated by \",\" without spaces)."
+      puts "                  Defines the steps to execute, see documentation. Default: admin,analyze,view"
       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!)."
@@ -144,9 +147,35 @@ module Bake
         Bake.formatter.printError("Error: specify the environment variable QAC_HOME.")
         ExitHelper.exit(1)
       end
+      @qac_home = ENV["QAC_HOME"].gsub(/\\/,"/")
+      @qac_home = @qac_home[0, @qac_home.length-1] if @qac_home.end_with?"/"
+      if !File.directory?(@qac_home)
+        Bake.formatter.printError("Error: QAC_HOME points to invalid directory.")
+        ExitHelper.exit(1)
+      end
+
+      # find mcpp install folder
+      # prio 1: explicit env var
+      if ENV["MCPP_HOME"] && !ENV["MCPP_HOME"].empty?
+        @mcpp_home = ENV["MCPP_HOME"].gsub(/\\/,"/")
+        @mcpp_home = @mcpp_home[0, @mcpp_home.length-1] if @mcpp_home.end_with?"/"
+        if !File.directory?(@mcpp_home)
+          Bake.formatter.printError("Error: MCPP_HOME points to invalid directory: #{@mcpp_home}")
+          ExitHelper.exit(1)
+        end
+      # prio 2: with qac_home
+      elsif File.exists?(@qac_home+"/#{RCF_DEFAULT}")
+        @mcpp_home = @qac_home
+      # prio 3: next to qac_home
+      elsif File.exists?(File.dirname(@qac_home)+"/mcpp-1.5.1/#{RCF_DEFAULT}")
+        @mcpp_home = File.dirname(@qac_home)+"/mcpp-1.5.1"
+      else
+        Bake.formatter.printError("Error: cannot find MCPP home folder. Specify MCPP_HOME.")
+        ExitHelper.exit(1)
+      end
 
       if !@qacstep.nil?
-        @qacstep.split("|").each do |s|
+        @qacstep.split(/[,|]/).each do |s|
           if not ["admin", "analyze", "view", "report", "mdr"].include?s
             Bake.formatter.printError("Error: incorrect qacstep name.")
             ExitHelper.exit(1)
@@ -154,9 +183,6 @@ module Bake
         end
       end
 
-      @qac_home = ENV["QAC_HOME"].gsub(/\\/,"/")
-      @qac_home = qac_home[0, qac_home.length-1] if qac_home.end_with?"/"
-
       if @cct.empty?
         gccVersion = Bake::Toolchain::getGccVersion
         if gccVersion.length < 2
@@ -185,9 +211,9 @@ module Bake
         end
 
         while (@cct.empty? or gccVersion[0]>=4)
-          @cct = [qac_home + "/config/cct/GNU_GCC-g++_#{gccVersion[0]}.#{gccVersion[1]}-i686-#{plStr}-C++#{@cVersion}.cct"]
+          @cct = [@qac_home + "/config/cct/GNU_GCC-g++_#{gccVersion[0]}.#{gccVersion[1]}-i686-#{plStr}-C++#{@cVersion}.cct"]
           break if File.exist?@cct[0]
-          @cct = [qac_home + "/config/cct/GNU_GCC-g++_#{gccVersion[0]}.#{gccVersion[1]}-x86_64-#{plStr}-C++#{@cVersion}.cct"]
+          @cct = [@qac_home + "/config/cct/GNU_GCC-g++_#{gccVersion[0]}.#{gccVersion[1]}-x86_64-#{plStr}-C++#{@cVersion}.cct"]
           break if File.exist?@cct[0]
           if gccVersion[1]>0
             gccVersion[1] -= 1
@@ -202,11 +228,26 @@ module Bake
       @cct_append = cctInDir.gsub(/[\\]/,'/') if cctInDir
 
       if @acf.nil?
-        @acf = qac_home + "/config/acf/default.acf"
+        @acf = @qac_home + "/config/acf/default.acf"
       end
 
       if @rcf.nil?
-        @rcf  = qac_home + "/config/rcf/mcpp-1_5_1-en_US.rcf"
+        @rcf  = @mcpp_home + "/#{RCF_DEFAULT}"
+      end
+
+      @cct.each do |cct|
+        if !File.exists?(cct)
+          Bake.formatter.printError("Error: cct file not found: #{cct}")
+          ExitHelper.exit(1)
+        end
+      end
+      if !File.exists?(@acf)
+        Bake.formatter.printError("Error: acf file not found: #{@acf}")
+        ExitHelper.exit(1)
+      end
+      if !File.exists?(@rcf)
+        Bake.formatter.printError("Error: rcf file not found: #{@rcf}")
+        ExitHelper.exit(1)
       end
 
     end

data/lib/common/root.rb

@@ -28,7 +28,7 @@ module Bake
     end
 
     def self.extract_depth(str)
-      regex = /(.*)\s*,\s*(\d+)\s*\z/
+      regex = /\s*(\S*)\s*,\s*(\d+)\s*\z/
       scan_res = str.scan(regex)
       if scan_res.length > 0
         return Root.new(scan_res[0][0],scan_res[0][1].to_i)

data/lib/common/version.rb

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

metadata

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