bake-toolkit 2.47.1 → 2.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: cdb50f9e3c1b77177c3117ca94525148610a7ea30a85cb8da7a91d626b94b634
-  data.tar.gz: b58d7ddfefbbc01d2e0d3a9367bb88b10295c2155e48daacae19b577ec2b7568
+SHA1:
+  metadata.gz: 5c4161185d0ed348001e37f4e485c60be8e7b3a1
+  data.tar.gz: 58598500c6b2fc481cde897fa4c74e687d551df8
 SHA512:
-  metadata.gz: 8d902b404d8e28f3e4b15d3f853ff0e070ac68de0f6704a8c374398328ee5eead282789ecd236ab38995a131a8ada65074392f6c23a59afbb2d0a8fb9ed6b131
-  data.tar.gz: 3db672121a0b408c471e111241e8596f8f2807a360de246c4ea811c32cd9419f3627680af9eb3bd5eee281f002e3d128158a5fcd4be4b98055e95d1ee500ad5b
+  metadata.gz: 9e7fa782e10d6b00ce959f9b88734486b818bd9902a0aa0a5c9187fb00988b81ccaf9ee5f8ae1e07f7e1d18b75cddddaabf0820fb68454b27d396ca9510eef8f
+  data.tar.gz: a9ea70d0ae6f16857db331ef7e50eda99773ecc0085825841924ae423ff2a6bf859a95cef1923a9a7278b3c7fbf69ac1860a582fa7739855dd90f4006c7904ce

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 => "$(ArchiverPrefix)"
+        has_attr 'prefix', String, :defaultValueLiteral => "$(<none>)"
         contains_many 'flags', Flags, 'parent'
       end
 
       class Linker < ModelElement
         has_attr 'command', String, :defaultValueLiteral => ""
-        has_attr 'prefix', String, :defaultValueLiteral => "$(LinkerPrefix)"
+        has_attr 'prefix', String, :defaultValueLiteral => "$(<none>)"
         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 => "$(CompilerPrefix)"
+        has_attr 'prefix', String, :defaultValueLiteral => "$(<none>)"
         contains_many 'define', Define, 'parent'
         contains_many 'flags', Flags, 'parent'
         contains_one 'internalDefines', InternalDefines, 'parent'

data/lib/bake/subst.rb

@@ -88,7 +88,7 @@ module Bake
           ExitHelper.exit(1)
         end
 
-        if (s.value != "")
+        if (s.value != "") or (s.cmd == "")
           setName = substString(s.name, s)
           if (setName.empty?)
             Bake.formatter.printWarning("Name of variable must not be empty - variable will be ignored", s)
@@ -175,6 +175,21 @@ 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"
@@ -320,7 +335,7 @@ module Bake
         elsif ENV[var]
           substStr << ENV[var]
         else
-          if Bake.options.verbose >= 2 && !(["CompilerPrefix", "ArchiverPrefix", "LinkerPrefix"].include?(var))
+          if Bake.options.verbose >= 2 && !(["CPPCompilerPrefix", "CCompilerPrefix", "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,9 +24,11 @@ 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]
+    CLANG_CHAIN[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
 
     CLANG_CHAIN[:ARCHIVER][:COMMAND] = "ar"
     CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "r"

data/lib/bake/toolchain/clang_analyze.rb

@@ -20,9 +20,11 @@ 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]
+    CLANG_ANALYZE_CHAIN[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
 
     CLANG_ANALYZE_CHAIN[:ARCHIVER][:COMMAND] = ""
     CLANG_ANALYZE_CHAIN[:LINKER][:COMMAND] = ""

data/lib/bake/toolchain/diab.rb

@@ -22,12 +22,14 @@ 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"
     DiabChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
     DiabChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
     DiabChain[:COMPILER][:ASM][:PREPRO_FLAGS] = ""
+    DiabChain[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
 
     DiabChain[:ARCHIVER][:COMMAND] = "dar"
     DiabChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"

data/lib/bake/toolchain/gcc.rb

@@ -40,9 +40,11 @@ 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]
+    GCCChain[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
 
     GCCChain[:ARCHIVER][:COMMAND] = "ar"
     GCCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"

data/lib/bake/toolchain/gcc_env.rb

@@ -25,11 +25,13 @@ 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)"
     GCCENVChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
     GCCENVChain[:COMPILER][:ASM][:FLAGS] = "$(ASFLAGS)"
+    GCCENVChain[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
 
     GCCENVChain[:ARCHIVER][:COMMAND] = "$(AR)"
     GCCENVChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"

data/lib/bake/toolchain/greenhills.rb

@@ -21,11 +21,13 @@ module Bake
     })
 
     GreenHillsChain[:COMPILER][:CPP] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
-    GreenHillsChain[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS]
+    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]
     GreenHillsChain[:COMPILER][:ASM][:PREPRO_FLAGS] = ""
+    GreenHillsChain[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
 
     GreenHillsChain[:ARCHIVER][:COMMAND] = "cxppc"
     GreenHillsChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-archive -o"

data/lib/bake/toolchain/keil.rb

@@ -22,11 +22,13 @@ 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]
     KeilChain[:COMPILER][:ASM][:COMMAND] = "armasm"
     KeilChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
+    KeilChain[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
 
     KeilChain[:COMPILER][:DEP_FILE_SINGLE_LINE] = true
 

data/lib/bake/toolchain/msvc.rb

@@ -24,11 +24,13 @@ 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"
     MSVCChain[:COMPILER][:ASM][:COMPILE_FLAGS] = "-c $(MSVC_FORCE_SYNC_PDB_WRITES)"
     MSVCChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    MSVCChain[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
 
     MSVCChain[:ARCHIVER][:COMMAND] = "lib"
     MSVCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-out:"

data/lib/bake/toolchain/provider.rb

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

data/lib/bake/toolchain/tasking.rb

@@ -22,12 +22,14 @@ 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"
     TaskingChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
     TaskingChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
     TaskingChain[:COMPILER][:ASM][:PREPRO_FLAGS] = ""
+    TaskingChain[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
 
     TaskingChain[:ARCHIVER][:COMMAND] = "artc"
     TaskingChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rcu"

data/lib/bake/toolchain/ti.rb

@@ -23,9 +23,11 @@ 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]
+    TiChain[:COMPILER][:ASM][:PREFIX] = Provider.default[:COMPILER][:ASM][:PREFIX]
 
     TiChain[:COMPILER][:DEP_FILE_SINGLE_LINE] = true
 

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 != ""
+  if compiler.respond_to?("prefix") && compiler.prefix != "$(<none>)"
     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.47.1"
+      "2.48.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.47.1
+  version: 2.48.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-09-07 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.7.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Build tool to compile C/C++ projects fast and easy.