bake-toolkit 2.52.1 → 2.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a2d5a5936542b4a6224264cff05e7dda54bf6059f1b5e6f064eda0f1ce81016
-  data.tar.gz: 3f8e2cc7f126644ee2d64bb4f48efbd51a2b96072b1502310b9ea58cd4885faf
+  metadata.gz: c30b262873a0ace0c66d50fd465eadc5831efab3aec86c1581449326894f53b8
+  data.tar.gz: bde9aa588f9735d37088bc3954ac6bec2c605665d6a472fcf9c1859898db5cb0
 SHA512:
-  metadata.gz: d9927f571614e0761f479ce586da3d8ea75a2c17cbee2bfda8f8be6188d112579231cd56fd3adad64691a2a2c386235edecd359176977a8e4c936a4c26943dec
-  data.tar.gz: 6343ec2501a1d9db66daa120eb7785c2b8345d00b0c982a2addb8710012f1051b0ee5d5f2da87178d5a67fa87a6084cee52bc37042865e9cf619ed45e7838d85
+  metadata.gz: 6ff3239869804870c5d108cd5f43ca476749b0effc7fa4eccb909c0307f35f0fee6ba43b74c27590f0f764f1346ab9ce781601d46055c2c3bc48f71ec30512e8
+  data.tar.gz: 8df0c9092ce5073e0fe3d431edf8431c2e30ec958a9c5170650a62426db764749cd85119d1c1b6bd48c08a1e15f2e1d7d44380034981575befa9d56301885555

data/lib/bake/mergeConfig.rb

@@ -198,6 +198,10 @@ module Bake
      end
 
     def merge(type)
+      if (@child.strict == true) && !(@child.class == @parent.class)
+        return
+      end
+
       s = StringIO.new
       ser = RText::Serializer.new(Language)
 
@@ -207,7 +211,7 @@ module Bake
         s.puts "\n>>>> parent <<<<"
         ser.serialize(@parent, s)
       end
-
+      
       if (type == :remove)
         removeChilds(@child, @parent)
       elsif (type == :replace)

data/lib/bake/model/metamodel.rb

@@ -279,6 +279,7 @@ module Bake
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'extends', String, :defaultValueLiteral => ""
         has_attr 'type', String, :defaultValueLiteral => ""
+        has_attr 'strict', Boolean, :defaultValueLiteral => "false"
         has_attr 'project', String, :defaultValueLiteral => ""
         has_attr 'private', Boolean, :defaultValueLiteral => "false"
         has_attr 'mergeInc', String, :defaultValueLiteral => ""

data/lib/bake/subst.rb

@@ -45,6 +45,18 @@ module Bake
      end
     end
 
+    def self.empty(elem, var, mandatory, str)
+      if mandatory
+        Bake.formatter.printError("Variable '$(#{var})' cannot be substituted, because #{str}", elem ? elem : @@config)
+        ExitHelper.exit(1)
+      else
+        if Bake.options.verbose > 0
+          msg = "Substitute variable '$(#{var})' with empty string, because #{str}"
+          Bake.formatter.printInfo(msg, elem ? elem : @@config)
+        end
+      end
+    end
+
     def self.itute(config, projName, isMainProj, toolchain, referencedConfigs, configTcMap)
       @@lazy = true
       @@config = config
@@ -168,9 +180,17 @@ module Bake
 
         substStr << str[posSubst..posStart-1] if posStart>0
 
-        var = str[posStart+2..posEnd-1]
+        var = str[posStart+2..posEnd-1].strip
+        mandatory = false
 
         splittedVar = var.split(",").map { |v| v.strip() }
+        splittedVar.each_with_index do |s,i|
+          if s.end_with?("!")
+            mandatory = true
+            splittedVar[i] = s[0..-2]
+          end
+        end
+        var = splittedVar.join(", ")
 
         if Bake.options.vars.has_key?(var)
           substStr << Bake.options.vars[var]
@@ -215,10 +235,7 @@ module Bake
               config = configs.first
               substStr << File.rel_from_to_project(@@projDir,config.get_project_dir,false)
             else
-              if Bake.options.verbose > 0
-                msg = "Substitute variable '$(#{var})' with empty string, because project #{out_proj_name} not found"
-                Bake.formatter.printInfo(msg, elem ? elem : @@config)
-              end
+              empty(elem, var, mandatory, "project #{out_proj_name} not found")
             end
           end
         elsif var == "OutputDir" or (splittedVar.length == 3 and splittedVar[0] == "OutputDir")
@@ -271,22 +288,13 @@ module Bake
                 end
               end
             else
-              if Bake.options.verbose > 0
-                msg = "Substitute variable '$(#{var})' with empty string, because config #{out_conf_name} not found for project #{out_proj_name}"
-                Bake.formatter.printInfo(msg, elem ? elem : @@config)
-              end
+              empty(elem, var, mandatory, "config #{out_conf_name} not found for project #{out_proj_name}")
             end
           else
-            if Bake.options.verbose > 0
-              msg = "Substitute variable '$(#{var})' with empty string, because project #{out_proj_name} not found"
-              Bake.formatter.printInfo(msg, elem ? elem : @@config)
-            end
+            empty(elem, var, mandatory, "project #{out_proj_name} not found")
           end
         elsif splittedVar.length > 1 and splittedVar[0] == "OutputDir"
-          if Bake.options.verbose > 0
-            msg = "Substitute variable '$(#{var})' with empty string, because syntax of complex variable OutputDir is not $(OutputDir,<project name>,<config name>)"
-            Bake.formatter.printInfo(msg, elem ? elem : @@config)
-          end
+          empty(elem, var, mandatory, "syntax of complex variable OutputDir is not $(OutputDir,<project name>,<config name>)")
         elsif var == "Time"
           substStr << Time.now.to_s
         elsif var == "Hostname"
@@ -321,13 +329,8 @@ module Bake
         elsif ENV[var]
           substStr << ENV[var]
         else
-          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)
-            else
-              Bake.formatter.printInfo(msg +  " in the toolchain", @@config)
-            end
+          if !(["ASMCompilerPrefix", "CompilerPrefix", "ArchiverPrefix", "LinkerPrefix"].include?(var))
+            empty(elem, var, mandatory, "it's not set") if mandatory || Bake.options.verbose >= 2
           end
         end
 

data/lib/bake/toolchain/clang.rb

@@ -29,8 +29,14 @@ module Bake
     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"
+    if Bake::Utils::OS::name == "Mac"
+      CLANG_CHAIN[:ARCHIVER][:COMMAND] = "libtool"
+      CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "-static -o"
+    else
+      CLANG_CHAIN[:ARCHIVER][:COMMAND] = "ar"
+      CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "r"
+    end
+
     CLANG_CHAIN[:ARCHIVER][:ERROR_PARSER] = gccCompilerErrorParser
 
     CLANG_CHAIN[:LINKER][:COMMAND] = "clang++"

data/lib/bakery/toBake.rb

@@ -45,7 +45,7 @@ module Bake
       next unless bp.proj
       contents = File.open(bp.proj, "r") {|io| io.read }
       contents.split("\n").each do |c|
-        res = c.match("\\s*(Library|Executable|Custom){1}Config\\s*\"?([\\w:-]*)\"?")
+        res = c.gsub(/#.*/,"").match("\\s*(Library|Executable|Custom){1}Config\\s*\"?([\\w:-]*)\"?")
         if res
           if res[2].match(bp.conf) != nil
             toBuild << BuildPattern.new(bp.proj, res[2], bp.args, nil)

data/lib/blocks/compile.rb

@@ -249,6 +249,8 @@ module Bake
             srcFilePath = File.join(@projectDir, srcFilePath)
             cmdJson[source] = srcFilePath
           end
+          puts cmdJson
+          cmdJson.gsub!("\"" , "\\\"")
           Blocks::CC2J << { :directory => @projectDir, :command => cmdJson, :file => srcFilePath }
         end
 

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.52.1"
+      "2.53.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.52.1
+  version: 2.53.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext