bake-toolkit 2.65.2 → 2.66.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7940840d0fb9f3cc5a45d0445ccb05f7b1c18391a7dcc0ae48b1fb90c3e5915
-  data.tar.gz: 5298ad5317ae06506708e9db31bdc10e7ac98d1f56b98f078656f78cf67f299e
+  metadata.gz: fa60204c2439429e2b1d8e42d36206941185d1085f5c59390b8e5552f6549893
+  data.tar.gz: 5cfa793f77484f38e0170995b40b679fbd4367f3ef06c50c86c5cc148aacc9cc
 SHA512:
-  metadata.gz: ffefb7d0b223fb47ece543a0dab7ff405b845b9c5fb4bc5d281e79de23a85a91f8b5f79bce8868de8361ebf5a9571dfdd3adb345f8bacf6958a9f4179f27bd58
-  data.tar.gz: 578bdae05e43d4cde5c4e5443123850a014373a8e27ed7f225e1f0ed7a749e9c04d65c440715b6255c87123094863df1e242ae523f31a6acace005eb36b3bc1a
+  metadata.gz: 6901da13b1b992c9e99af33b82f4dc0841d3d236e376a8a6932ba9d1d40490a98f283d0c6aacc794881703fea09b147f353e24b7c5790329cee56d44c0b9bf97
+  data.tar.gz: 93edb29bd48e1752ebe1d29e83916309fd291e69701b30e9deadfb9f58dc8507bffdb2da7474fcce7336de9f08275017759092b46528c9db793033e2795f0a9e

data/lib/bake/config/loader.rb

@@ -26,8 +26,7 @@ module Bake
       return configname
     end
 
-    def getFullProjectInternal(configs, configname, isMain) # note: configs is never empty
-
+    def getFullProjectInternal(configs, configname, isMain, extendStack) # note: configs is never empty
       configname = resolveConfigName(configs, configname)
 
       if isMain
@@ -60,7 +59,11 @@ module Bake
       if config.extends != ""
         config.extends.split(",").map {|ex| ex.strip}.reverse.each do |ex|
           if (ex != "")
-            parent,parentConfigName = getFullProjectInternal(configs, ex, isMain)
+            if extendStack.include?(ex)
+              Bake.formatter.printError("Config extends to circular loop: #{(extendStack << ex).join("->")}", configs[0].file_name)
+              ExitHelper.exit(1)
+            end
+            parent,parentConfigName = getFullProjectInternal(configs, ex, isMain, extendStack << ex)
             MergeConfig.new(config, parent).merge(:merge)
           end
         end
@@ -70,15 +73,13 @@ module Bake
     end
 
     def getFullProject(projName, configs, configname, isMain)
-      
-
       configname = resolveConfigName(configs, configname)
 
       if @fullProjects.has_key?(projName + "," + configname)
         return @fullProjects[projName + "," + configname]
       end
 
-      config, configname = getFullProjectInternal(configs, configname, isMain)
+      config, configname = getFullProjectInternal(configs, configname, isMain, [configname])
 
       if isMain
         @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
@@ -116,7 +117,7 @@ module Bake
               configHash[s.name] += s.value.split(";")
             end
 
-            if !isMain
+            if !isMain && @configHashMain
               @configHashMain.each do |k,v|
                 if configHash.has_key?(k)
                   configHash[k] += v

data/lib/bake/toolchain/clang.rb

@@ -32,6 +32,9 @@ module Bake
     if Bake::Utils::OS::name == "Mac"
       CLANG_CHAIN[:ARCHIVER][:COMMAND] = "libtool"
       CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "-static -o"
+    elsif Bake::Utils::OS::name == "Windows"
+      CLANG_CHAIN[:ARCHIVER][:COMMAND] = "clang"
+      CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "-fuse-ld=llvm-lib -o"
     else
       CLANG_CHAIN[:ARCHIVER][:COMMAND] = "ar"
       CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "r"

data/lib/blocks/makefile.rb

@@ -17,14 +17,16 @@ module Bake
         @projectDir = config.get_project_dir
         @path_to = ""
         @flags = adjustFlags("",config.flags) if config.flags
-        @makefile = config.name
+        @makefile = block.convPath(config.name)
         @target = config.target != "" ? config.target : "all"
         calcPathTo(referencedConfigs)
         calcCommandLine
         calcCleanLine
         calcEnv
 
-        block.lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, config.lib) if config.lib != ""
+        if config.lib != ""
+          block.lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, block.convPath(config.lib))
+        end 
       end
 
       def calcEnv

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.65.2"
+      "2.66.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.65.2
+  version: 2.66.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext