bake-toolkit 2.48.0 → 2.48.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c4161185d0ed348001e37f4e485c60be8e7b3a1
-  data.tar.gz: 58598500c6b2fc481cde897fa4c74e687d551df8
+SHA256:
+  metadata.gz: 401b4b2e2ab91edbd4f2f660a183bc6380b7618d97dae6049370437f25bf0b2e
+  data.tar.gz: 5c8166a43072d68dff6d5e770e4bcf9c3c29d954692f3724953e628f1c9f80b2
 SHA512:
-  metadata.gz: 9e7fa782e10d6b00ce959f9b88734486b818bd9902a0aa0a5c9187fb00988b81ccaf9ee5f8ae1e07f7e1d18b75cddddaabf0820fb68454b27d396ca9510eef8f
-  data.tar.gz: a9ea70d0ae6f16857db331ef7e50eda99773ecc0085825841924ae423ff2a6bf859a95cef1923a9a7278b3c7fbf69ac1860a582fa7739855dd90f4006c7904ce
+  metadata.gz: c32aa36c895f46216b50d37a5f5bdf755670f524350bf503246cceb440facf736488e123c6186ff5480f37d49df3f88c0483aee7d5aa07bf97f9314d9c5355aa
+  data.tar.gz: f15e3699fefcd36b1d8c2c937caea2a67a967eca1bcce2c00cf95252c209aad2286e91f56542e4123e0c49d4fba4dd82aa0055820f5ed610ba51452b60167a32

data/lib/bake/model/metamodel.rb

@@ -63,13 +63,13 @@ module Bake
 
       class Archiver < ModelElement
         has_attr 'command', String, :defaultValueLiteral => ""
-        has_attr 'prefix', String, :defaultValueLiteral => "$(<none>)"
+        has_attr 'prefix', String, :defaultValueLiteral => ""
         contains_many 'flags', Flags, 'parent'
       end
 
       class Linker < ModelElement
         has_attr 'command', String, :defaultValueLiteral => ""
-        has_attr 'prefix', String, :defaultValueLiteral => "$(<none>)"
+        has_attr 'prefix', String, :defaultValueLiteral => ""
         has_attr 'onlyDirectDeps', Boolean, :defaultValueLiteral => "false"
         contains_many 'flags', Flags, 'parent'
         contains_many 'libprefixflags', LibPrefixFlags, 'parent'
@@ -79,7 +79,7 @@ module Bake
       class Compiler < ModelElement
         has_attr 'ctype', CompilerType
         has_attr 'command', String, :defaultValueLiteral => ""
-        has_attr 'prefix', String, :defaultValueLiteral => "$(<none>)"
+        has_attr 'prefix', String, :defaultValueLiteral => ""
         contains_many 'define', Define, 'parent'
         contains_many 'flags', Flags, 'parent'
         contains_one 'internalDefines', InternalDefines, 'parent'

data/lib/bake/subst.rb

@@ -175,21 +175,6 @@ module Bake
           substStr << Bake.options.vars[var]
         elsif @@userVarMap.has_key?(var)
           substStr << @@userVarMap[var]
-        elsif var == "<none>"
-          # <none> shall be silently replaced with nothing
-        elsif (prefixScan = var.scan(/INTERNAL_(CPPCompiler|CCompiler|ASMCompiler|Archiver|Linker)_PREFIX/)).length > 0
-          v = prefixScan[0][0] + "Prefix"
-          if @@userVarMap.has_key?(v)
-            substStr << @@userVarMap[v]
-          elsif !ENV[v].nil?
-            substStr << ENV[v]
-          elsif v.include?"CompilerPrefix"
-            if @@userVarMap.has_key?("CompilerPrefix")
-              substStr << @@userVarMap["CompilerPrefix"]
-            elsif !ENV["CompilerPrefix"].nil?
-              substStr << ENV["CompilerPrefix"]
-            end
-          end
         elsif var == "MainConfigName"
           substStr << Bake.options.build_config
         elsif var == "MainProjectName"
@@ -335,7 +320,7 @@ module Bake
         elsif ENV[var]
           substStr << ENV[var]
         else
-          if Bake.options.verbose >= 2 && !(["CPPCompilerPrefix", "CCompilerPrefix", "ASMCompilerPrefix", "CompilerPrefix", "ArchiverPrefix", "LinkerPrefix"].include?(var))
+          if Bake.options.verbose >= 2 && !(["ASMCompilerPrefix", "CompilerPrefix", "ArchiverPrefix", "LinkerPrefix"].include?(var))
             msg = "Substitute variable '$(#{var})' with empty string"
             if elem
               Bake.formatter.printInfo(msg, elem)

data/lib/bake/toolchain/clang.rb

@@ -24,7 +24,6 @@ module Bake
     CLANG_CHAIN[:COMPILER][:C] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:CPP])
     CLANG_CHAIN[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
     CLANG_CHAIN[:COMPILER][:C][:COMMAND] = "clang"
-    CLANG_CHAIN[:COMPILER][:C][:PREFIX] = Provider.default[:COMPILER][:C][:PREFIX]
 
     CLANG_CHAIN[:COMPILER][:ASM] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:C])
     CLANG_CHAIN[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]

data/lib/bake/toolchain/clang_analyze.rb

@@ -20,7 +20,6 @@ module Bake
     CLANG_ANALYZE_CHAIN[:COMPILER][:C] = Utils.deep_copy(CLANG_ANALYZE_CHAIN[:COMPILER][:CPP])
     CLANG_ANALYZE_CHAIN[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
     CLANG_ANALYZE_CHAIN[:COMPILER][:C][:COMMAND] = "clang"
-    CLANG_ANALYZE_CHAIN[:COMPILER][:C][:PREFIX] = Provider.default[:COMPILER][:C][:PREFIX]
 
     CLANG_ANALYZE_CHAIN[:COMPILER][:ASM] = Utils.deep_copy(CLANG_ANALYZE_CHAIN[:COMPILER][:C])
     CLANG_ANALYZE_CHAIN[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]

data/lib/bake/toolchain/diab.rb

@@ -22,7 +22,6 @@ module Bake
 
     DiabChain[:COMPILER][:CPP] = Utils.deep_copy(DiabChain[:COMPILER][:C])
     DiabChain[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS]
-    DiabChain[:COMPILER][:C][:PREFIX] = Provider.default[:COMPILER][:C][:PREFIX]
 
     DiabChain[:COMPILER][:ASM] = Utils.deep_copy(DiabChain[:COMPILER][:C])
     DiabChain[:COMPILER][:ASM][:COMMAND] = "das"

data/lib/bake/toolchain/gcc.rb

@@ -40,7 +40,6 @@ module Bake
     GCCChain[:COMPILER][:C] = Utils.deep_copy(GCCChain[:COMPILER][:CPP])
     GCCChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
     GCCChain[:COMPILER][:C][:COMMAND] = "gcc"
-    GCCChain[:COMPILER][:C][:PREFIX] = Provider.default[:COMPILER][:C][:PREFIX]
 
     GCCChain[:COMPILER][:ASM] = Utils.deep_copy(GCCChain[:COMPILER][:C])
     GCCChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]

data/lib/bake/toolchain/gcc_env.rb

@@ -25,7 +25,6 @@ module Bake
     GCCENVChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
     GCCENVChain[:COMPILER][:C][:COMMAND] = "$(CC)"
     GCCENVChain[:COMPILER][:C][:FLAGS] = "$(CFLAGS)"
-    GCCENVChain[:COMPILER][:C][:PREFIX] = Provider.default[:COMPILER][:C][:PREFIX]
 
     GCCENVChain[:COMPILER][:ASM] = Utils.deep_copy(GCCENVChain[:COMPILER][:C])
     GCCENVChain[:COMPILER][:ASM][:COMMAND] = "$(AS)"

data/lib/bake/toolchain/greenhills.rb

@@ -22,7 +22,6 @@ module Bake
 
     GreenHillsChain[:COMPILER][:CPP] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
     GreenHillsChain[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-    GreenHillsChain[:COMPILER][:C][:PREFIX] = Provider.default[:COMPILER][:C][:PREFIX]
 
     GreenHillsChain[:COMPILER][:ASM] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
     GreenHillsChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]

data/lib/bake/toolchain/keil.rb

@@ -22,7 +22,6 @@ module Bake
 
     KeilChain[:COMPILER][:C] = Utils.deep_copy(KeilChain[:COMPILER][:CPP])
     KeilChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-    KeilChain[:COMPILER][:C][:PREFIX] = Provider.default[:COMPILER][:C][:PREFIX]
 
     KeilChain[:COMPILER][:ASM] = Utils.deep_copy(KeilChain[:COMPILER][:C])
     KeilChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]

data/lib/bake/toolchain/msvc.rb

@@ -24,7 +24,6 @@ module Bake
 
     MSVCChain[:COMPILER][:C] = Utils.deep_copy(MSVCChain[:COMPILER][:CPP])
     MSVCChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-    MSVCChain[:COMPILER][:C][:PREFIX] = Provider.default[:COMPILER][:C][:PREFIX]
 
     MSVCChain[:COMPILER][:ASM] = Utils.deep_copy(MSVCChain[:COMPILER][:C])
     MSVCChain[:COMPILER][:ASM][:COMMAND] = "ml"

data/lib/bake/toolchain/provider.rb

@@ -15,7 +15,7 @@ module Bake
         {
           :CPP => {
             :COMMAND => "",
-            :PREFIX => "$(INTERNAL_CPPCompiler_PREFIX)",
+            :PREFIX => "$(CompilerPrefix)",
             :DEFINE_FLAG => "",
             :OBJECT_FILE_FLAG => "",
             :OBJECT_FILE_ENDING => ".o",
@@ -35,7 +35,7 @@ module Bake
           },
           :C => {
             :COMMAND => "",
-            :PREFIX => "$(INTERNAL_CCompiler_PREFIX)",
+            :PREFIX => "$(CompilerPrefix)",
             :DEFINE_FLAG => "",
             :OBJECT_FILE_FLAG => "",
             :OBJECT_FILE_ENDING => ".o",
@@ -55,7 +55,7 @@ module Bake
           },
           :ASM => {
             :COMMAND => "",
-            :PREFIX => "$(INTERNAL_ASMCompiler_PREFIX)",
+            :PREFIX => "$(ASMCompilerPrefix)",
             :DEFINE_FLAG => "",
             :OBJECT_FILE_FLAG => "",
             :OBJECT_FILE_ENDING => ".o",
@@ -78,7 +78,7 @@ module Bake
         :ARCHIVER =>
         {
           :COMMAND => "",
-          :PREFIX => "$(INTERNAL_Archiver_PREFIX)",
+          :PREFIX => "$(ArchiverPrefix)",
           :ARCHIVE_FLAGS => "",
           :ARCHIVE_FLAGS_SPACE => true,
           :FLAGS => "",
@@ -88,7 +88,7 @@ module Bake
         :LINKER =>
         {
           :COMMAND => "",
-          :PREFIX => "$(INTERNAL_Linker_PREFIX)",
+          :PREFIX => "$(LinkerPrefix)",
           :MUST_FLAGS => "",
           :SCRIPT => "",
           :SCRIPT_SPACE => true,

data/lib/bake/toolchain/tasking.rb

@@ -22,7 +22,6 @@ module Bake
 
     TaskingChain[:COMPILER][:CPP] = Utils.deep_copy(TaskingChain[:COMPILER][:C])
     TaskingChain[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS]
-    TaskingChain[:COMPILER][:CPP][:PREFIX] = Provider.default[:COMPILER][:CPP][:PREFIX]
 
     TaskingChain[:COMPILER][:ASM] = Utils.deep_copy(TaskingChain[:COMPILER][:C])
     TaskingChain[:COMPILER][:ASM][:COMMAND] = "astc"

data/lib/bake/toolchain/ti.rb

@@ -23,7 +23,6 @@ module Bake
 
     TiChain[:COMPILER][:C] = Utils.deep_copy(TiChain[:COMPILER][:CPP])
     TiChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-    TiChain[:COMPILER][:C][:PREFIX] = Provider.default[:COMPILER][:C][:PREFIX]
 
     TiChain[:COMPILER][:ASM] = Utils.deep_copy(TiChain[:COMPILER][:C])
     TiChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]

data/lib/bake/util.rb

@@ -79,7 +79,7 @@ def integrateCompiler(tcs, compiler, type)
   if compiler.respond_to?("command") && compiler.command != ""
     tcs[:COMPILER][type][:COMMAND] = compiler.command
   end
-  if compiler.respond_to?("prefix") && compiler.prefix != "$(<none>)"
+  if compiler.respond_to?("prefix") && compiler.prefix != ""
     tcs[:COMPILER][type][:PREFIX] = compiler.prefix
   end
   if compiler.respond_to?("fileEndings") && compiler.fileEndings && compiler.fileEndings.endings != ""

data/lib/common/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.48.0
+  version: 2.48.1
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Build tool to compile C/C++ projects fast and easy.