bake-toolkit 2.64.1 → 2.65.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd55725b65ac6296092196df2fe85d8dead231341649db552cac76415643ba54
-  data.tar.gz: c8fc064f5c929e3968218bde7aee9b2548ee00bfcc9d55bc762f0e1ab917f0da
+  metadata.gz: 02d88a06a0d80fbac0d25a134ad432e52cd63ba7f99ba89f4623704a84be2abf
+  data.tar.gz: 35954f6e1a375a04c8959a9fbd67fc372208b5e79d159ea369260a6753e94e14
 SHA512:
-  metadata.gz: 8cad40c4ee60207533b867a29b53fb6efa8e0d5d12d1f9d929535fe5a682bc08a585ea0c64b5af3b3bcdcb80b920b3a924c460a2441ab33e1edda790bccd5b70
-  data.tar.gz: 577f622dc1d27c4abfa72b0ec484ffe2054f4bc75e67ae1afb4e48c598447d928ec463e6bd4cf3126fed0e9eeee743436852f1741cd54e7fa1d7809670256ccc
+  metadata.gz: 94ff89a2f8b098e2ff5ac7c2b6737f9379bc499444ade76aee30829b06975093831b619e8b729f58ce62424f005b10ad9366c7039641e5fce0876f9fa460d6c1
+  data.tar.gz: 490fd16f8285638f1a882af9e74f3efda987a4c2cda40a22a45f0e428c571a63ba7c70f91291e0ee77668b60b1e341a04ea25e8b0153f864d2e47e7f9afa81ed

data/lib/bake/config/loader.rb

@@ -237,7 +237,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/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
@@ -52,7 +52,7 @@ module Bake
 
     class Compile < BlockBase
 
-      attr_reader :objects, :source_files, :source_files_compiled, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib
+      attr_reader :objects, :source_files, :source_files_compiled, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib, :object_files
 
       def mutex
         @mutex ||= Mutex.new
@@ -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/executable.rb

@@ -190,9 +190,15 @@ module Bake
             BlockBase.writeCmdLineFile(cmd, cmdLineFile)
             success = true
             consoleOutput = ""
-            success, consoleOutput = ProcessHelper.run(realCmd, false, false, outPipe) if !Bake.options.dry
-            process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil, reason, success)
-
+            retry_linking = Bake.options.dev_features.include?("retry-linking") ? 5 : 1
+            begin
+              success, consoleOutput = ProcessHelper.run(realCmd, false, false, outPipe) if !Bake.options.dry
+              process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil, reason, success)
+            rescue Exception
+              retry_linking -= 1
+              retry if !success && retry_linking > 0
+              raise
+            end
             check_config_file()
           end
 

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/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.64.1"
+      "2.65.1"
     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,15 +890,14 @@ 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
-                          b.objects.each do |o|
-                            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
-                              end
+                        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
                             end
                           end
                         end
@@ -905,6 +905,7 @@ module Bake
                     end
                   end
                 end
+
                 pnPwd = Pathname.new(Dir.pwd)
                 ccNotIncluded = (ccIncludes - inCompilation).to_a
                 ccNotExcluded = inCompilation.select {|i| ccExcludes.include?(i) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.64.1
+  version: 2.65.1
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2020-09-07 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