bake-toolkit 2.37.2 → 2.37.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a45aa63944be2d13c5930eb7d647b2698e5fe5cc
-  data.tar.gz: bd806a9beba3f69d8bd86ec10ca6272d8ec1044c
+  metadata.gz: 3c3db2b5d5d9b971cc8be9b66bc839ea89d95688
+  data.tar.gz: bca9760382f776a84599f287d9d5748b54c1127f
 SHA512:
-  metadata.gz: 64c323e37a9ed5401d5e14060e2f1ff41ffcc45f3d878a206ab6d8b2b697ee5d5d645d7c25bca1dc3dedbd31b1735deeef08c023510f7e8834a8b3cb080f1db5
-  data.tar.gz: 830a4382f9ef11dc1945f0ffc7c31cb32530feac9f04815a02f8ecc26ef0fd6de72a98c48873abb184ac2af268382641f8af4b6a38bd50fee6226db805a98252
+  metadata.gz: 7950ade9a90bb0248e48f61ca43b6c9ce971e22bd07d1a65bf3731f9f9b4e96c92bf33b741622f79221d926299e69b9c6a1d9b1c5bc0a2f876e9b898dc89cf92
+  data.tar.gz: 27466dda71c0abb5fbb156f7cd41f3e82df6050106d6f5b05f4aa81776c169245831d66f1fb5b862b5ee97cd0622bf8d7112a20c6bc70bddcede61129df33f73

data/bin/bakeqac

@@ -402,7 +402,7 @@ end
 
     cmd = qaExe + ["report", "-P", @options.qacdata, "-t", "MDR"]
 
-    success, consoleOutput = ProcessHelper.run(cmd, false)
+    success, consoleOutput, checkError = executeQacli(cmd)
     puts consoleOutput
 
     success = true if consoleOutput.include?"The specified project does not have any source files"

data/lib/bake/subst.rb

@@ -181,9 +181,24 @@ module Bake
          substStr << @@toolchainName
         elsif var == "ProjectName"
           substStr << @@projName
-        elsif var == "ProjectDir"
-          substStr << @@projDir
-        elsif var == "OutputDir" or (splittedVar.length == 3 and splittedVar[0] == "OutputDir")
+        elsif var == "ProjectDir" or (splittedVar.length == 2 and splittedVar[0] == "ProjectDir")
+          if (var == "ProjectDir")
+            substStr << @@projDir
+          else
+            out_proj_name = splittedVar[1].strip
+            if @@referencedConfigs.has_key?out_proj_name
+              configs = @@referencedConfigs[out_proj_name]
+              config = configs.first
+
+              substStr << File.rel_from_to_project(@@projDir,config.get_project_dir,false)
+            else
+              if Bake.options.verbose > 0
+                msg = "Substitute variable '$(#{var})' with empty string, because project #{out_proj_name} not found"
+                Bake.formatter.printInfo(msg, elem ? elem : @@config)
+              end
+            end
+          end
+        elsif var == "OutputDir" or (splittedVar.length == 3 and splittedVar[0] == "ProjectDir")
           if (var == "OutputDir")
             out_proj_name = @@projName
             out_conf_name = @@configName

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.37.2"
+      "2.37.3"
     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.2
+  version: 2.37.3
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext