bake-toolkit 2.41.4 → 2.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb031ecf751fd6de9602b91e74157fd7d487dca
-  data.tar.gz: 0fb933f2d6c8f82ee337c0f800283532e9950ec0
+  metadata.gz: 30b115d04d6f147c9b54638708839299ada7bc02
+  data.tar.gz: 8180029ea7cdf161e70c1c98bf91b73bcb0a7e6e
 SHA512:
-  metadata.gz: 31badf86143b439e651977fe576f284e9c271a17cc2c5769d1fdb8e1f84f91714fe308bf8962d1d4672ba48b34aeb53421a21480652d938965318fca0e6bd2e9
-  data.tar.gz: 16d5206127049c485a9d8b637d6ea1a9b12ee7117c8a95c6112ac4a1eb5372e60173dcaa9118c19a07059c9cc5bb42c09681d1798ef21156cac87f04cfa22231
+  metadata.gz: 8b6b7f29f46606f6fe4bc98e185fd02d6d718b88adbeae59d8613db26d31bdf97891bd0a0791b26953e91ea800f2bf8f03e0a6808011b2b868e5352fbeee758b
+  data.tar.gz: 8b3a7951978eb94886b2b78e7fe4c57bd60c235ece0634d877de9613eafb257e2ca83147e741f1191a47d2036ed9a53a188cabdf5960451bb296cd93b76d05de

data/bin/bakeqac

@@ -51,6 +51,8 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
     cmdDupped = cmd.dup
     cmdDupped << @options.qacdata
 
+    puts cmdDupped.join(" ") if @options.qacverbose
+
     # admin step should not take longer than 60 seconds, rest not longer than 80% of qacretry time if specified
     success, consoleOutput = ProcessHelper.run(cmdDupped, adminStepAndImmediateOutput, true, nil, [0], Dir.pwd, adminStepAndImmediateOutput ? 60 : (@options.qacretry * 0.8).to_i)
     licenseError = false
@@ -123,7 +125,7 @@ end
   excludeParam = false
   wasMinus = false
   ARGV.each do |x|
-    if ["--c++11", "--c++14", "--qacnofilefilter", "--qacnomsgfilter", "--qacnofilter", "--qacnoformat", "--qacrawformat", "--qacunittest", "--qacdoc", "--qaccctpatch"].include?x
+    if ["--c++11", "--c++14", "--qacnofilefilter", "--qacnomsgfilter", "--qacnofilter", "--qacnoformat", "--qacrawformat", "--qacunittest", "--qacdoc", "--qaccctpatch", "--qacverbose"].include?x
       excludeParam = false
       next
     elsif ["--cct", "--rcf", "--acf", "--qacdata", "--qacstep", "--qacretry"].include?x

data/lib/bakeqac/options/options.rb

@@ -7,12 +7,12 @@ module Bake
 
   class BakeqacOptions < Parser
     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 :c11, :c14, :qacmsgfilter, :qacfilefilter, :qacnoformat, :qacunittest, :qacdoc, :cct_patch, :qacverbose # 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()
+    RCF_DEFAULT = "config/rcf/mcpp-*-en_US.rcf".freeze()
 
     def initialize(argv)
       super(argv)
@@ -27,6 +27,7 @@ module Bake
       @cct = []
       @default = nil
       @qacdata = nil
+      @qacverbose = false
       @qacstep = nil
       @qacmsgfilter = true
       @qacfilefilter = true
@@ -55,6 +56,7 @@ module Bake
       add_option(["--qacnoformat", "--qacrawformat"], lambda { @qacnoformat = true              })
       add_option(["--qacunittest"                  ], lambda { @qacunittest = true              })
       add_option(["--qacdoc"                       ], lambda { @qacdoc = true                   })
+      add_option(["--qacverbose"                   ], lambda { @qacverbose = true               })
       add_option(["-h", "--help"                   ], lambda { usage; ExitHelper.exit(0)        })
       add_option(["--version"                      ], lambda { Bake::Version.printBakeqacVersion; ExitHelper.exit(0)    })
 
@@ -78,12 +80,20 @@ module Bake
       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."
+      puts " --qacverbose     Verbose output of bakeqac."
       puts " --version        Print version."
       puts " -h, --help       Print this help."
       puts "Note: all parameters from bake apply also here. Note, that --rebuild and --compile-only will be added to the internal bake call automatically."
       puts "Note: works only for GCC 4.1 and above"
     end
 
+    def checkNum(num)
+      if String === num && !/\A\d+\z/.match(num)
+        Bake.formatter.printError("Error: #{num} is not a positive number")
+        ExitHelper.exit(1)
+      end
+    end
+
     def setDefault(x)
       if (@default)
         Bake.formatter.printError("Error: '#{x}' not allowed, '#{@default}' already set.")
@@ -164,11 +174,11 @@ module Bake
           ExitHelper.exit(1)
         end
       # prio 2: with qac_home
-      elsif File.exists?(@qac_home+"/#{RCF_DEFAULT}")
+      elsif !(mcps = Dir.glob(@qac_home+"/#{RCF_DEFAULT}")).empty?
         @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"
+      elsif !(mcps = Dir.glob(File.dirname(@qac_home)+"/mcpp-*/")).empty?
+        @mcpp_home = mcps.sort.last[0..-2]
       else
         Bake.formatter.printError("Error: cannot find MCPP home folder. Specify MCPP_HOME.")
         ExitHelper.exit(1)
@@ -232,7 +242,12 @@ module Bake
       end
 
       if @rcf.nil?
-        @rcf  = @mcpp_home + "/#{RCF_DEFAULT}"
+        rcfs = Dir.glob(@mcpp_home+"/#{RCF_DEFAULT}")
+        if rcfs.empty?
+          Bake.formatter.printError("Error: rcf file not found: #{@mcpp_home+"/#{RCF_DEFAULT}"}")
+          ExitHelper.exit(1)
+        end
+        @rcf  = rcfs.sort.last
       end
 
       @cct.each do |cct|

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.41.4"
+      "2.42.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.41.4
+  version: 2.42.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext