bake-toolkit 2.47.0 → 2.47.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f78e2244644f2f30995e911a8927f4fd135819a7
-  data.tar.gz: 7d97b8abee26bda490caf479e850f01080923903
+SHA256:
+  metadata.gz: cdb50f9e3c1b77177c3117ca94525148610a7ea30a85cb8da7a91d626b94b634
+  data.tar.gz: b58d7ddfefbbc01d2e0d3a9367bb88b10295c2155e48daacae19b577ec2b7568
 SHA512:
-  metadata.gz: 205b865a3d58f1a5815eeee319d5b2c9a549c51cdd8160f786808817a7618fd66dc3945b8b519d675e8e1ddbee24b0c657620d9742e004f5386cd4db0297d950
-  data.tar.gz: d8e65c232fa852f14b2a6366fb25acf51d87deda466c7cd5b5a90ccbb924274b86dd8d3bd6907fe598f257c09a4f90f334510cb33bce4f681661c561bfe9aa28
+  metadata.gz: 8d902b404d8e28f3e4b15d3f853ff0e070ac68de0f6704a8c374398328ee5eead282789ecd236ab38995a131a8ada65074392f6c23a59afbb2d0a8fb9ed6b131
+  data.tar.gz: 3db672121a0b408c471e111241e8596f8f2807a360de246c4ea811c32cd9419f3627680af9eb3bd5eee281f002e3d128158a5fcd4be4b98055e95d1ee500ad5b

data/lib/bake/model/metamodel_ext.rb

@@ -12,6 +12,15 @@ module Bake
           end
           ::File.dirname(comp.file_name)
         end
+
+        def getConfig
+          comp = self
+          while !(BaseConfig_INTERNAL === comp) && comp.respond_to?("parent")
+            comp = comp.parent
+          end
+          return comp
+        end
+
       end
 
       module BaseConfig_INTERNAL::ClassModule

data/lib/bake/subst.rb

@@ -222,8 +222,14 @@ module Bake
           end
         elsif var == "OutputDir" or (splittedVar.length == 3 and splittedVar[0] == "OutputDir")
           if (var == "OutputDir")
-            out_proj_name = @@projName
-            out_conf_name = @@configName
+            if (!elem.nil?)
+              config = elem.getConfig
+              out_proj_name = config.parent.name
+              out_conf_name = config.name
+            else
+              out_proj_name = @@projName
+              out_conf_name = @@configName
+            end
           else
             out_proj_name = splittedVar[1]
             out_conf_name = splittedVar[2]
@@ -255,7 +261,12 @@ module Bake
                 if File.is_absolute?(out_dir)
                   substStr << out_dir
                 else
-                  substStr << Pathname.new(File.rel_from_to_project(@@projDir,config.get_project_dir,true)  + out_dir).cleanpath.to_s
+                  if (elem.nil?)
+                    projDir = @@projDir
+                  else
+                    projDir = elem.get_project_dir
+                  end
+                  substStr << Pathname.new(File.rel_from_to_project(projDir,config.get_project_dir,true)  + out_dir).cleanpath.to_s
                 end
               end
             else

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.47.0"
+      "2.47.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.47.0
+  version: 2.47.1
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -98,42 +98,42 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: See documentation for more details
@@ -248,23 +248,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- -x
+- "-x"
 - doc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Build tool to compile C/C++ projects fast and easy.