bake-toolkit 2.48.1 → 2.48.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 401b4b2e2ab91edbd4f2f660a183bc6380b7618d97dae6049370437f25bf0b2e
-  data.tar.gz: 5c8166a43072d68dff6d5e770e4bcf9c3c29d954692f3724953e628f1c9f80b2
+  metadata.gz: b0a8b873c9ef3fd82a1bf99bf759f3e5c28724bbfd48512049de7f9a4bd185ad
+  data.tar.gz: 8976b3accc193478e53223ba9b9aae3a4a18af1a9d1ed30f32988277188c86db
 SHA512:
-  metadata.gz: c32aa36c895f46216b50d37a5f5bdf755670f524350bf503246cceb440facf736488e123c6186ff5480f37d49df3f88c0483aee7d5aa07bf97f9314d9c5355aa
-  data.tar.gz: f15e3699fefcd36b1d8c2c937caea2a67a967eca1bcce2c00cf95252c209aad2286e91f56542e4123e0c49d4fba4dd82aa0055820f5ed610ba51452b60167a32
+  metadata.gz: 79519eff2ea01179de9a9191ff6fb71a22249c3af16a83a440d8d81dd06a95aa7d8b63e28567da717c1616f5b5ed3e1987b9e2ca0cc3d8a7d5e6ce55eb79675f
+  data.tar.gz: 815dcd04763b289612b84882be0623687e0bc25c922433c482a975e156aac520c60e1c590a0d4fe41ce86a3acfe5edffbe1afff4b3d71259e1378774cd217ae0

data/bin/bakeqac

@@ -188,7 +188,14 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
     success, consoleOutput, checkError = executeQacli(cmd, true)
 
     if success
-      cct220 = (File.exist?(@options.qacdata+"/prqa/configs/Initial_Config/config") ? "configs/Initial_Config/" : "")
+      if File.exist?(@options.qacdata+"/prqa/configs/Initial/config")
+        cct220 = "configs/Initial/"
+      elsif File.exist?(@options.qacdata+"/prqa/configs/Initial_Config/config")
+        cct220 = "configs/Initial_Config/"
+      else
+        cct220 = ""
+      end
+
       cctFilename = @options.qacdata+"/prqa/" + cct220 + "config/" + File.basename(@options.cct[0])
       if File.exist?cctFilename
         File.open(cctFilename, 'a') do |f|
@@ -208,6 +215,8 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
           end
 
         end
+      else
+        Bake.formatter.printWarning("Could not find cct file in .qacdata folder")
       end
     else
       puts consoleOutput unless consoleOutput.empty?

data/lib/bake/config/checks.rb

@@ -30,6 +30,12 @@ module Bake
         configs.each do |config|
           if config.respond_to?("toolchain") and config.toolchain
             config.toolchain.compiler.each do |c|
+              puts c.ctype.class
+              puts c.ctype
+              if [:CPP,:C,:ASM].none? {|t| t == c.ctype}
+                Bake.formatter.printError("Type of compiler must be CPP, C or ASM", c)
+                ExitHelper.exit(1)
+              end
               if not c.internalDefines.nil? and c.internalDefines != ""
                 Bake.formatter.printError("InternalDefines only allowed in DefaultToolchain", c.internalDefines)
                 ExitHelper.exit(1)
@@ -48,6 +54,10 @@ module Bake
               Bake.formatter.printWarning("Lint support was removed. Please delete LintPolicy from Project.meta.", l)
             end
             config.defaultToolchain.compiler.each do |c|
+              if [:CPP,:C,:ASM].none? {|t| t == c.ctype}
+                Bake.formatter.printError("Type of compiler must be CPP, C or ASM", c)
+                ExitHelper.exit(1)
+              end
               if c.fileEndings && c.fileEndings.endings.empty?
                 Bake.formatter.printError("FileEnding must not be empty.", c.fileEndings)
                 ExitHelper.exit(1)

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.48.1"
+      "2.48.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.48.1
+  version: 2.48.2
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext