bake-toolkit 2.64.3 → 2.66.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f86c6966b1bcc6734554272efa676b4c4f85683858e705acb451375e86cba78
-  data.tar.gz: 2370bbc61ce6b72044694ad16c6e94c3d7147f68010703a6de76a10104932bbd
+  metadata.gz: fa60204c2439429e2b1d8e42d36206941185d1085f5c59390b8e5552f6549893
+  data.tar.gz: 5cfa793f77484f38e0170995b40b679fbd4367f3ef06c50c86c5cc148aacc9cc
 SHA512:
-  metadata.gz: ed22dda65897b546f6cca7a39369cb6667ec14e06980ce25070d98d519ba1b383b864db9b742a01b3389ec5fd432e46be2d78a92a643411d9318f5167830b3f3
-  data.tar.gz: e1e658af7515f5661b9e268d0d3c4db25404818b7c1d16ee94b946b634430e0680e1326caaf67a3dfe491117345740ac3a16c0850acfa2b049c685eee24f8077
+  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
@@ -237,7 +238,7 @@ module Bake
       if adaptRoots.length > 0
         adaptRoots.each do |adapt|
           Bake::Config::checkVer(adapt.requiredBakeVersion)
-          adapt.mainProject = @mainProjectName if adapt.mainProject == "__THIS__"
+          adapt.mainProject = proj.name if adapt.mainProject == "__THIS__"
           adaptConfigs = adapt.getConfig
           AdaptConfig.checkSyntax(adaptConfigs, filename, true)
           adaptConfigs.each do |ac|

data/lib/bake/model/loader.rb

@@ -113,7 +113,8 @@ module Bake
           applyFilterOnElement(elem)
         end
       end
-      toRemove.each { |r| r.parent = nil }
+      toRemove.each { |r| r.parent = nil if r.respond_to?(:parent=) }
+      return toRemove
     end
 
     def applyFilterOnElement(elem)
@@ -167,7 +168,8 @@ module Bake
         ExitHelper.exit(1)
       end
 
-      applyFilterOnArray(frag.root_elements)
+      tor = applyFilterOnArray(frag.root_elements)
+      frag.root_elements.delete_if {|re| tor.include?(re)}
 
       return frag
 

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/bake/toolchain/clang_bitcode.rb

@@ -0,0 +1,34 @@
+require_relative'../../common/utils'
+require_relative '../toolchain/provider'
+require_relative '../toolchain/errorparser/error_parser'
+require_relative '../toolchain/errorparser/gcc_compiler_error_parser'
+require_relative '../toolchain/errorparser/gcc_linker_error_parser'
+
+module Bake
+  module Toolchain
+    CLANG_BITCODE_CHAIN = Provider.add("CLANG_BITCODE")
+
+    CLANG_BITCODE_CHAIN[:COMPILER][:CPP].update({
+      :COMMAND => "clang++",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :OBJ_FLAG_SPACE => true,
+      :OBJECT_FILE_ENDING => ".bc",
+      :COMPILE_FLAGS => "-emit-llvm -c ",
+      :ERROR_PARSER => nil,
+      :DEP_FLAGS => "-MD -MF",
+      :DEP_FLAGS_SPACE => true,
+    })
+
+    CLANG_BITCODE_CHAIN[:COMPILER][:C] = Utils.deep_copy(CLANG_BITCODE_CHAIN[:COMPILER][:CPP])
+    CLANG_BITCODE_CHAIN[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+    CLANG_BITCODE_CHAIN[:COMPILER][:C][:COMMAND] = "clang"
+
+    CLANG_BITCODE_CHAIN[:ARCHIVER][:COMMAND] = "llvm-link"
+    CLANG_BITCODE_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "-o"
+    CLANG_BITCODE_CHAIN[:ARCHIVER][:ARCHIVE_FILE_ENDING] = ".bc"
+
+    CLANG_BITCODE_CHAIN[:LINKER][:COMMAND] = "llvm-link"
+    CLANG_BITCODE_CHAIN[:LINKER][:EXE_FLAG] = "-o"
+  end
+end

data/lib/bake/toolchain/provider.rb

@@ -88,6 +88,7 @@ module Bake
           :PREFIX => "$(ArchiverPrefix)",
           :ARCHIVE_FLAGS => "",
           :ARCHIVE_FLAGS_SPACE => true,
+          :ARCHIVE_FILE_ENDING => ".a",
           :FLAGS => "",
           :ERROR_PARSER => nil,
           :FILE_COMMAND => ""
@@ -163,6 +164,7 @@ require_relative '../toolchain/diab'
 require_relative '../toolchain/gcc'
 require_relative '../toolchain/clang'
 require_relative '../toolchain/clang_analyze'
+require_relative '../toolchain/clang_bitcode'
 require_relative '../toolchain/ti'
 require_relative '../toolchain/greenhills'
 require_relative '../toolchain/keil'

data/lib/blocks/block.rb

@@ -2,6 +2,7 @@ require_relative '../bake/libElement'
 require_relative '../bake/model/metamodel'
 require_relative '../common/abortException'
 require_relative "../multithread/job"
+gem "thwait", "0.1.0"
 require "thwait"
 
 module Bake

data/lib/blocks/compile.rb

@@ -37,7 +37,7 @@ begin
     x = longname(shortname(file))
   end
 
-rescue Fiddle::DLError
+rescue Exception
 
   def realname file
     file
@@ -133,14 +133,18 @@ module Bake
         return false
       end
 
+      def calcObjectBasename(object)
+        object.chomp(File.extname(object))
+      end
+
       def calcCmdlineFile(object)
-        File.expand_path(object[0..-3] + ".cmdline", @projectDir)
+        File.expand_path(calcObjectBasename(object) + ".cmdline", @projectDir)
       end
 
       def calcDepFile(object, type)
         dep_filename = nil
         if type != :ASM
-          dep_filename = object[0..-3] + ".d"
+          dep_filename = calcObjectBasename(object) + ".d"
         end
         dep_filename
       end
@@ -561,7 +565,7 @@ module Bake
           pr = sources.name
           pr = pr[2..-1] if pr.start_with?"./"
 
-          res = Dir.glob_dir(pr, @projectDir).sort
+          res = Dir.glob_dir(pr, @projectDir).select {|f| !get_source_type(f).nil?}.sort
           if res.length == 0 and cleaning == false
             if not pr.include?"*" and not pr.include?"?"
               Bake.formatter.printError("Source file '#{pr}' not found", sources)

data/lib/blocks/library.rb

@@ -18,10 +18,13 @@ module Bake
       end
 
       def calcArtifactName
+        archiver = @block.tcs[:ARCHIVER]
+        fileEnding = archiver[:ARCHIVE_FILE_ENDING]
+
         if not @config.artifactName.nil? and @config.artifactName.name != ""
           baseFilename = @config.artifactName.name
         else
-          baseFilename = "lib#{@projectName}.a"
+          baseFilename = "lib#{@projectName}#{fileEnding}"
         end
         if !@config.artifactExtension.nil? && @config.artifactExtension.name != "default"
           extension = ".#{@config.artifactExtension.name}"

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.64.3"
+      "2.66.0"
     end
 
     def self.printBakeVersion(ry = "")

data/lib/tocxx.rb

@@ -859,6 +859,7 @@ module Bake
                !Bake.options.linkOnly &&
                !Bake.options.prepro &&
                !Bake.options.compileOnly &&
+               !Bake.options.dry &&
                !Bake.options.clean
 
               ccChecks = []
@@ -889,14 +890,17 @@ module Bake
                       b.source_files_compiled.each do |s|
                         inCompilation << File.expand_path(s, b.projectDir)
                         type = b.get_source_type(s)
-                        if type != :ASM
+                        if type != :ASM && b.object_files && b.object_files.has_key?(s)
                           o = b.object_files[s]
                           dep_filename = b.calcDepFile(o, type)
                           dep_filename_conv = b.calcDepFileConv(dep_filename)
-                          File.readlines(File.expand_path(dep_filename_conv, b.projectDir)).map{|line| line.strip}.each do |dep|
-                            header = File.expand_path(dep, b.projectDir)
-                            if File.exist?(header)
-                              inCompilation << header
+                          fname = File.expand_path(dep_filename_conv, b.projectDir)
+                          if File.exist?(fname)
+                            File.readlines(fname).map{|line| line.strip}.each do |dep|
+                              header = File.expand_path(dep, b.projectDir)
+                              if File.exist?(header)
+                                inCompilation << header
+                              end
                             end
                           end
                         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.64.3
+  version: 2.66.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -84,16 +84,16 @@ dependencies:
   name: thwait
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: e2mmap
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,7 @@ files:
 - lib/bake/subst.rb
 - lib/bake/toolchain/clang.rb
 - lib/bake/toolchain/clang_analyze.rb
+- lib/bake/toolchain/clang_bitcode.rb
 - lib/bake/toolchain/colorizing_formatter.rb
 - lib/bake/toolchain/diab.rb
 - lib/bake/toolchain/errorparser/diab_compiler_error_parser.rb