bake-toolkit 2.41.1 → 2.41.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89ecc35e002bb19b477cd722dfcda35328eacd52
-  data.tar.gz: 7e9a9e12001d2f0996687fc04b9f77f2be5ae90d
+  metadata.gz: 30056fd4c9205a10b98ceb403605588fa16b571b
+  data.tar.gz: d70535aee1972fda96615221c58f1277db2997db
 SHA512:
-  metadata.gz: e01526d5efb99a0c375dbaabf1f4c001c47e86ff56b48f9cae103bd9c7faaf73cdcddb47899f37dab0920777a279c91619698c8962debe36bcdc66cbe15c6d6b
-  data.tar.gz: 8307b3f822215e122b366d3a47cc5160d557f7dbb30ae2fcae87f36830204fbce6eefc374ea007fcdd416644517510cd7361493af738cbd85d48d113f848c799
+  metadata.gz: 15a7b73a3209cb335ec6bbf85bd33949801eeea4655ee9081c3293123901989973a55e63d46a19ae577f2a0a414a59b1b62b2ce98f1fac07233192dbe5aee599
+  data.tar.gz: ccb9d35799f610cf527a986b300beffa2764a39c8873178c603b483a522b71a3e880fcec54848f7e9610280e2004047593c1e01a0f92cb729b71538831952aed

data/lib/bake/subst.rb

@@ -39,13 +39,22 @@ module Bake
       @@lazy = false
     end
 
+    def self.resolveOutputDir()
+      @@outputDirUnresolved.each do |elem|
+        subst(elem)
+     end
+    end
+
     def self.itute(config, projName, isMainProj, toolchain, referencedConfigs, configTcMap)
       @@lazy = true
       @@config = config
       @@toolchain = toolchain
       @@referencedConfigs = referencedConfigs
       @@configTcMap = configTcMap
-      @@toolchainName = config.defaultToolchain.basedOn if isMainProj
+      if isMainProj
+        @@toolchainName = config.defaultToolchain.basedOn
+        @@outputDirUnresolved = []
+      end
 
       @@configName = config.name
       @@projDir = config.parent.get_project_dir
@@ -120,23 +129,23 @@ module Bake
 
       @@userVarMapMain = @@userVarMap.clone if isMainProj
 
-      3.times {
-        subst(config);
-        substToolchain(toolchain)
-      }
-
       @@resolvedVars = 0
-      lastFoundInVar = -1
-      100.times do
+      lastFoundInVar = 0
+      10.times do
         subst(config)
-        break if @@resolvedVars == 0 or (@@resolvedVars >= lastFoundInVar and lastFoundInVar >= 0)
+        substToolchain(toolchain)
+        if @@resolvedVars == lastFoundInVar
+          lastFoundInVar = 0
+          break
+        end
         lastFoundInVar = @@resolvedVars
       end
-      if (@@resolvedVars > 0)
+      if (lastFoundInVar > 0)
         Bake.formatter.printError("Cyclic variable substitution detected", config.file_name)
         ExitHelper.exit(1)
       end
 
+
     end
 
     def self.substString(str, elem=nil)
@@ -230,11 +239,18 @@ module Bake
                   out_dir = "build" + Bake.options.buildDirDelimiter + qacPart + out_conf_name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
                 end
               end
-              out_dir = substString(out_dir, elem)
-              if File.is_absolute?(out_dir)
-                substStr << out_dir
+
+              if (out_dir.include?"$(")
+                substStr << str[posStart..posEnd]
+                @@resolvedVars -= 1
+                @@outputDirUnresolved << elem
               else
-                substStr << Pathname.new(File.rel_from_to_project(@@projDir,config.get_project_dir,true)  + out_dir).cleanpath.to_s
+                out_dir = substString(out_dir, elem)
+                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
+                end
               end
             else
               if Bake.options.verbose > 0

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -78,6 +78,7 @@ module Bake
           end
         end
       end
+      Subst.resolveOutputDir
     end
 
     def addLib(block, configSteps)

metadata

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