bake-toolkit 2.64.4 → 2.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 511748b7bf298219c3c7f9ea2444ca6ac0049d67c1f01e2510bfd7ae619dfbd0
-  data.tar.gz: a28dea4db9569b991637e0a98e749bec0f5336a2ede3a76869488f701bc74646
+  metadata.gz: 8fd56c91721f565baebab8ee13b453249a1673565cccd22ddde5787797035562
+  data.tar.gz: d6013cd8ad4eefe6f6979d2b3a905a30b1737b54398c7d317367bc9a36676e71
 SHA512:
-  metadata.gz: 439f8755aa29bdefd4e65300f56a56883db480e0efd277d1692c5494f1368d2ae40226fdf7ddf76c622585735c0750edade07468490a17aa5c4b34e04d833b85
-  data.tar.gz: 3cd7e4828239cebc6e6a61180919c563a4b3e1bd3701eecdb1fe6f60d86610716dcc9f370da5d0f3ec46063b258f6c5e56f42d87b2233985905b33946822b38c
+  metadata.gz: 4d360c2a3d60a572580ab81ab31575d330b69aa7001b09a3dd725e88e23c5bb3a7e34564d1933e8c68c680fea831eeec63c829f63e1cd5307079c319ef68ce09
+  data.tar.gz: 3190bf643083cd2378eec6b3a69077e17fe80c2f8f05080e80903306132c362c52dbea7ab834f5a8815eff1916b8b4689780ab863a9f93dbcce14f6dfd05b7da

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

@@ -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

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.4"
+      "2.65.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 = []

metadata

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