bake-toolkit 2.64.4 → 2.67.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 511748b7bf298219c3c7f9ea2444ca6ac0049d67c1f01e2510bfd7ae619dfbd0
-  data.tar.gz: a28dea4db9569b991637e0a98e749bec0f5336a2ede3a76869488f701bc74646
+  metadata.gz: 8b7e8c87879aebca8bbd9587f2a2763fcb2f62b32c83ef544f0071ef5ef9cd1c
+  data.tar.gz: 0236c294b3d7a72134a77ffb0c1ef671e48be28248055fff777644ef9ae71eec
 SHA512:
-  metadata.gz: 439f8755aa29bdefd4e65300f56a56883db480e0efd277d1692c5494f1368d2ae40226fdf7ddf76c622585735c0750edade07468490a17aa5c4b34e04d833b85
-  data.tar.gz: 3cd7e4828239cebc6e6a61180919c563a4b3e1bd3701eecdb1fe6f60d86610716dcc9f370da5d0f3ec46063b258f6c5e56f42d87b2233985905b33946822b38c
+  metadata.gz: 703bfcfeef0d0ddc237c096f29cac01fc545a17ee2b3d8213516964a2ad62d019bf2cb704e2898b294787322e04cf45482ca60d48733f8d4b16c4ab6417b1a9f
+  data.tar.gz: d4478018cc512ba6b3541bf2ec5a2149689d2e9212b92c2cce33324dfb3ac64d936c1bffc178c4820da167419e171222e85a8f333bc42ab288ec6e13e8452b35

data/Rakefile.rb

@@ -1,3 +1,7 @@
-require 'rake'
-
-require './rake_helper/spec.rb'
+gem "coveralls", "=0.8.23"
+gem "simplecov", "=0.16.1"
+gem "rspec",     "=3.10.0"
+
+require 'rake'
+
+require './rake_helper/spec.rb'

data/lib/bake/config/loader.rb

@@ -26,8 +26,7 @@ module Bake
       return configname
     end
 
-    def getFullProjectInternal(configs, configname, isMain) # note: configs is never empty
-
+    def getFullProjectInternal(configs, configname, isMain, extendStack) # note: configs is never empty
       configname = resolveConfigName(configs, configname)
 
       if isMain
@@ -60,7 +59,11 @@ module Bake
       if config.extends != ""
         config.extends.split(",").map {|ex| ex.strip}.reverse.each do |ex|
           if (ex != "")
-            parent,parentConfigName = getFullProjectInternal(configs, ex, isMain)
+            if extendStack.include?(ex)
+              Bake.formatter.printError("Config extends to circular loop: #{(extendStack << ex).join("->")}", configs[0].file_name)
+              ExitHelper.exit(1)
+            end
+            parent,parentConfigName = getFullProjectInternal(configs, ex, isMain, extendStack << ex)
             MergeConfig.new(config, parent).merge(:merge)
           end
         end
@@ -70,15 +73,13 @@ module Bake
     end
 
     def getFullProject(projName, configs, configname, isMain)
-      
-
       configname = resolveConfigName(configs, configname)
 
       if @fullProjects.has_key?(projName + "," + configname)
         return @fullProjects[projName + "," + configname]
       end
 
-      config, configname = getFullProjectInternal(configs, configname, isMain)
+      config, configname = getFullProjectInternal(configs, configname, isMain, [configname])
 
       if isMain
         @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
@@ -116,7 +117,7 @@ module Bake
               configHash[s.name] += s.value.split(";")
             end
 
-            if !isMain
+            if !isMain && @configHashMain
               @configHashMain.each do |k,v|
                 if configHash.has_key?(k)
                   configHash[k] += v
@@ -237,7 +238,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/mergeConfig.rb

@@ -1,242 +1,243 @@
-require_relative '../common/ext/rtext'
-
-module Bake
-
-  class MergeConfig
-
-    def initialize(child, parent)
-      @child = child
-      @parent = parent
-    end
-
-    def self.clone(obj)
-      if obj.is_a?(Metamodel::ModelElement)
-        cloneModelElement(obj)
-      elsif Array === obj
-        obj.map { |o| clone(o) }
-      else
-        obj # no clone, should not happen
-      end
-    end
-
-    def self.cloneModelElement(obj)
-      cpy = obj.class.new
-      cpy.file_name = obj.file_name
-      obj.class.ecore.eAllStructuralFeatures.each do |f|
-        value = obj.getGeneric(f.name)
-        if f.is_a?(RGen::ECore::EReference) && f.containment
-          if value.is_a?(Array)
-            cpy.setGeneric(f.name, value.collect{|v| clone(v)})
-          elsif !value.nil?
-            cpy.setGeneric(f.name, clone(value))
-          end
-        elsif f.is_a?(RGen::ECore::EAttribute)
-          cpy.setGeneric(f.name, value) if obj.eIsSet(f.name)
-        end
-      end
-      cpy
-    end
-
-
-    def replace()
-      if Metamodel::BaseConfig_INTERNAL === @child &&
-        Metamodel::BaseConfig_INTERNAL ===  @parent
-        if @child.mergeInc != "" && @parent.mergeInc != "no"
-          @parent.mergeInc = @child.mergeInc
-        end
-      end
-
-      @child.class.ecore.eAllReferences.each do |f|
-        next unless @parent.class.ecore.eAllReferences.include?f
-        next unless f.containment
-        childData = @child.getGeneric(f.name)
-        if Metamodel::ModelElement === childData
-          @parent.setGeneric(f.name,childData) if !childData.nil?
-        elsif Array === childData
-          if !childData.empty?
-            parentData = @parent.getGeneric(f.name)
-            cclasses = childData.map { |c| c.class }.uniq
-            parentData.delete_if { |p| cclasses.include?p.class }
-            parentData += childData
-            @parent.setGeneric(f.name,parentData)
-          end
-        end
-      end
-    end
-
-    def hasSubNodes(elem)
-      elem.class.ecore.eAllReferences.each do |f|
-        next unless f.containment
-        elemData = elem.getGeneric(f.name)
-        return true if (Array === elemData && !elemData.empty?)
-        return true if (Metamodel::ModelElement === elemData)
-      end
-      false
-    end
-
-    def sameAttr(childData, parentData)
-      childData.class.ecore.eAllAttributes.all? { |a|
-        a.eAnnotations.each do |x| x.details.each do |y|
-          return true if (y.key == :internal and y.value == true)
-        end; end
-        a.name == "line_number" || (not childData.eIsSet(a.name)) || (childData.getGeneric(a.name) == parentData.getGeneric(a.name))
-      }
-    end
-
-    def removeChilds(childElem, parentElem)
-      return if childElem.nil? or parentElem.nil?
-      
-      if Metamodel::BaseConfig_INTERNAL === childElem &&
-        Metamodel::BaseConfig_INTERNAL ===  parentElem
-        if childElem.mergeInc == parentElem.mergeInc
-          parentElem.mergeInc = ""
-        end
-      end
-
-      childElem.class.ecore.eAllReferences.each do |f|
-        next unless f.containment
-        begin
-          childData = childElem.getGeneric(f.name)
-          parentData = parentElem.getGeneric(f.name)
-        rescue Exception => ex
-          next # how to check fast if f.name is valid?
-        end
-        next if childData.nil? or parentData.nil?
-        if (Array === childData)
-          if !parentData.empty? && !childData.empty?
-            childData.each do |c|
-              cN = hasSubNodes(c)
-              toRemove = []
-              parentData.each do |p|
-                next if p.class != c.class
-                if (not cN)
-                  if sameAttr(c, p)
-                    toRemove << p
-                  end
-                else
-                  removeChilds(c, p);
-                end
-              end
-              toRemove.each do |r|
-                parentElem.removeGeneric(f.name, r)
-              end
-            end
-          end
-        elsif Metamodel::ModelElement === childData
-          if parentData.class == childData.class && sameAttr(childData, parentData)
-            cN = hasSubNodes(childData)
-            if (not cN)
-              parentElem.setGeneric(f.name, nil)
-            else
-              removeChilds(childData, parentData)
-            end
-          end # otherwise not equal, will not be deleted
-        end
-      end
-    end
-
-    def extendAttributes(childData, parentData)
-       parentData.class.ecore.eAllAttributes.each do |a|
-         childData.setGeneric(a.name, parentData.getGeneric(a.name)) if !childData.eIsSet(a.name) && parentData.eIsSet(a.name)
-       end
-     end
-
-     def extend(child, parent, push_front)
-       if Metamodel::BaseConfig_INTERNAL === child &&
-         Metamodel::BaseConfig_INTERNAL ===  parent
-         if child.mergeInc != "" && parent.mergeInc != "no"
-           parent.mergeInc = child.mergeInc
-         end
-       end
-
-       (parent.class.ecore.eAllReferences & child.class.ecore.eAllReferences).each do |f|
-         next unless f.containment
-         parentData = parent.getGeneric(f.name)
-         next if parentData.nil? or (Array === parentData && parentData.empty?)
-         childData = child.getGeneric(f.name)
-
-         if Array === parentData
-           if f.name == "compiler"
-             extendedParentData = []
-             parentData.each do |p|
-               c = childData.find { |c| p.ctype == c.ctype }
-               if c
-                 extendAttributes(c, p)
-                 extend(c, p, push_front)
-                 extendedParentData << c
-               else
-                 extendedParentData << p
-               end
-             end
-             restOfChildData = childData.find_all { |c| parentData.find {|p| p.ctype != c.ctype } }
-             child.setGeneric(f.name, extendedParentData + restOfChildData)
-           else
-             if push_front
-               child.setGeneric(f.name, childData + parentData)
-             else
-               child.setGeneric(f.name, parentData + childData)
-             end
-           end
-         elsif Metamodel::ModelElement === parentData
-           if childData.nil? || childData.class != parentData.class
-             child.setGeneric(f.name, parentData)
-           else
-             extendAttributes(childData, parentData)
-             extend(childData, parentData, push_front)
-           end
-         end
-       end
-     end
-
-     def copyChildToParent(c, p)
-       (p.class.ecore.eAllReferences & c.class.ecore.eAllReferences).each do |f|
-         next unless f.containment
-         childData = c.getGeneric(f.name)
-         next if childData.nil? || (Array === childData && childData.empty?)
-         p.setGeneric(f.name, childData)
-       end
-     end
-
-    def merge(type)
-      if (@child.strict == true) && !(@child.class == @parent.class)
-        return
-      end
-
-      s = StringIO.new
-      ser = RText::Serializer.new(Language)
-
-      if Bake.options.debug
-        s.puts "\n>>>> child <<<<"
-        ser.serialize(@child, s)
-        s.puts "\n>>>> parent <<<<"
-        ser.serialize(@parent, s)
-      end
-      
-      if (type == :remove)
-        removeChilds(@child, @parent)
-      elsif (type == :replace)
-        replace
-      elsif (type == :extend)
-        c = MergeConfig.clone(@child)
-        extend(c, @parent, false)
-        copyChildToParent(c, @parent)
-      elsif (type == :push_front)
-        c = MergeConfig.clone(@child)
-        extend(c, @parent, true)
-        copyChildToParent(c, @parent)
-      elsif (type == :merge)
-        extend(@child, MergeConfig.clone(@parent), false)
-      end
-
-      if Bake.options.debug
-        s.puts "\n>>>> result of #{type.to_s} <<<<"
-        ser.serialize(type == :merge ? @child : @parent, s)
-        puts "#{s.string}"
-      end
-
-
-    end
-
-  end
-
+require_relative '../common/ext/rtext'
+
+module Bake
+
+  class MergeConfig
+
+    def initialize(child, parent)
+      @child = child
+      @parent = parent
+    end
+
+    def self.clone(obj)
+      if obj.is_a?(Metamodel::ModelElement)
+        cloneModelElement(obj)
+      elsif Array === obj
+        obj.map { |o| clone(o) }
+      else
+        obj # no clone, should not happen
+      end
+    end
+
+    def self.cloneModelElement(obj)
+      cpy = obj.class.new
+      cpy.file_name = obj.file_name
+      cpy.org_file_name = obj.file_name
+      obj.class.ecore.eAllStructuralFeatures.each do |f|
+        value = obj.getGeneric(f.name)
+        if f.is_a?(RGen::ECore::EReference) && f.containment
+          if value.is_a?(Array)
+            cpy.setGeneric(f.name, value.collect{|v| clone(v)})
+          elsif !value.nil?
+            cpy.setGeneric(f.name, clone(value))
+          end
+        elsif f.is_a?(RGen::ECore::EAttribute)
+          cpy.setGeneric(f.name, value) if obj.eIsSet(f.name)
+        end
+      end
+      cpy
+    end
+
+
+    def replace()
+      if Metamodel::BaseConfig_INTERNAL === @child &&
+        Metamodel::BaseConfig_INTERNAL ===  @parent
+        if @child.mergeInc != "" && @parent.mergeInc != "no"
+          @parent.mergeInc = @child.mergeInc
+        end
+      end
+
+      @child.class.ecore.eAllReferences.each do |f|
+        next unless @parent.class.ecore.eAllReferences.include?f
+        next unless f.containment
+        childData = @child.getGeneric(f.name)
+        if Metamodel::ModelElement === childData
+          @parent.setGeneric(f.name,childData) if !childData.nil?
+        elsif Array === childData
+          if !childData.empty?
+            parentData = @parent.getGeneric(f.name)
+            cclasses = childData.map { |c| c.class }.uniq
+            parentData.delete_if { |p| cclasses.include?p.class }
+            parentData += childData
+            @parent.setGeneric(f.name,parentData)
+          end
+        end
+      end
+    end
+
+    def hasSubNodes(elem)
+      elem.class.ecore.eAllReferences.each do |f|
+        next unless f.containment
+        elemData = elem.getGeneric(f.name)
+        return true if (Array === elemData && !elemData.empty?)
+        return true if (Metamodel::ModelElement === elemData)
+      end
+      false
+    end
+
+    def sameAttr(childData, parentData)
+      childData.class.ecore.eAllAttributes.all? { |a|
+        a.eAnnotations.each do |x| x.details.each do |y|
+          return true if (y.key == :internal and y.value == true)
+        end; end
+        a.name == "line_number" || (not childData.eIsSet(a.name)) || (childData.getGeneric(a.name) == parentData.getGeneric(a.name))
+      }
+    end
+
+    def removeChilds(childElem, parentElem)
+      return if childElem.nil? or parentElem.nil?
+      
+      if Metamodel::BaseConfig_INTERNAL === childElem &&
+        Metamodel::BaseConfig_INTERNAL ===  parentElem
+        if childElem.mergeInc == parentElem.mergeInc
+          parentElem.mergeInc = ""
+        end
+      end
+
+      childElem.class.ecore.eAllReferences.each do |f|
+        next unless f.containment
+        begin
+          childData = childElem.getGeneric(f.name)
+          parentData = parentElem.getGeneric(f.name)
+        rescue Exception => ex
+          next # how to check fast if f.name is valid?
+        end
+        next if childData.nil? or parentData.nil?
+        if (Array === childData)
+          if !parentData.empty? && !childData.empty?
+            childData.each do |c|
+              cN = hasSubNodes(c)
+              toRemove = []
+              parentData.each do |p|
+                next if p.class != c.class
+                if (not cN)
+                  if sameAttr(c, p)
+                    toRemove << p
+                  end
+                else
+                  removeChilds(c, p);
+                end
+              end
+              toRemove.each do |r|
+                parentElem.removeGeneric(f.name, r)
+              end
+            end
+          end
+        elsif Metamodel::ModelElement === childData
+          if parentData.class == childData.class && sameAttr(childData, parentData)
+            cN = hasSubNodes(childData)
+            if (not cN)
+              parentElem.setGeneric(f.name, nil)
+            else
+              removeChilds(childData, parentData)
+            end
+          end # otherwise not equal, will not be deleted
+        end
+      end
+    end
+
+    def extendAttributes(childData, parentData)
+       parentData.class.ecore.eAllAttributes.each do |a|
+         childData.setGeneric(a.name, parentData.getGeneric(a.name)) if !childData.eIsSet(a.name) && parentData.eIsSet(a.name)
+       end
+     end
+
+     def extend(child, parent, push_front)
+       if Metamodel::BaseConfig_INTERNAL === child &&
+         Metamodel::BaseConfig_INTERNAL ===  parent
+         if child.mergeInc != "" && parent.mergeInc != "no"
+           parent.mergeInc = child.mergeInc
+         end
+       end
+
+       (parent.class.ecore.eAllReferences & child.class.ecore.eAllReferences).each do |f|
+         next unless f.containment
+         parentData = parent.getGeneric(f.name)
+         next if parentData.nil? or (Array === parentData && parentData.empty?)
+         childData = child.getGeneric(f.name)
+
+         if Array === parentData
+           if f.name == "compiler"
+             extendedParentData = []
+             parentData.each do |p|
+               c = childData.find { |c| p.ctype == c.ctype }
+               if c
+                 extendAttributes(c, p)
+                 extend(c, p, push_front)
+                 extendedParentData << c
+               else
+                 extendedParentData << p
+               end
+             end
+             restOfChildData = childData.find_all { |c| parentData.find {|p| p.ctype != c.ctype } }
+             child.setGeneric(f.name, extendedParentData + restOfChildData)
+           else
+             if push_front
+               child.setGeneric(f.name, childData + parentData)
+             else
+               child.setGeneric(f.name, parentData + childData)
+             end
+           end
+         elsif Metamodel::ModelElement === parentData
+           if childData.nil? || childData.class != parentData.class
+             child.setGeneric(f.name, parentData)
+           else
+             extendAttributes(childData, parentData)
+             extend(childData, parentData, push_front)
+           end
+         end
+       end
+     end
+
+     def copyChildToParent(c, p)
+       (p.class.ecore.eAllReferences & c.class.ecore.eAllReferences).each do |f|
+         next unless f.containment
+         childData = c.getGeneric(f.name)
+         next if childData.nil? || (Array === childData && childData.empty?)
+         p.setGeneric(f.name, childData)
+       end
+     end
+
+    def merge(type)
+      if (@child.strict == true) && !(@child.class == @parent.class)
+        return
+      end
+
+      s = StringIO.new
+      ser = RText::Serializer.new(Language)
+
+      if Bake.options.debug
+        s.puts "\n>>>> child <<<<"
+        ser.serialize(@child, s)
+        s.puts "\n>>>> parent <<<<"
+        ser.serialize(@parent, s)
+      end
+      
+      if (type == :remove)
+        removeChilds(@child, @parent)
+      elsif (type == :replace)
+        replace
+      elsif (type == :extend)
+        c = MergeConfig.clone(@child)
+        extend(c, @parent, false)
+        copyChildToParent(c, @parent)
+      elsif (type == :push_front)
+        c = MergeConfig.clone(@child)
+        extend(c, @parent, true)
+        copyChildToParent(c, @parent)
+      elsif (type == :merge)
+        extend(@child, MergeConfig.clone(@parent), false)
+      end
+
+      if Bake.options.debug
+        s.puts "\n>>>> result of #{type.to_s} <<<<"
+        ser.serialize(type == :merge ? @child : @parent, s)
+        puts "#{s.string}"
+      end
+
+
+    end
+
+  end
+
 end

data/lib/bake/model/loader.rb

@@ -113,7 +113,8 @@ module Bake
           applyFilterOnElement(elem)
         end
       end
-      toRemove.each { |r| r.parent = nil }
+      toRemove.each { |r| r.parent = nil if r.respond_to?(:parent=) }
+      return toRemove
     end
 
     def applyFilterOnElement(elem)
@@ -167,7 +168,8 @@ module Bake
         ExitHelper.exit(1)
       end
 
-      applyFilterOnArray(frag.root_elements)
+      tor = applyFilterOnArray(frag.root_elements)
+      frag.root_elements.delete_if {|re| tor.include?(re)}
 
       return frag
 

data/lib/bake/model/metamodel.rb

@@ -14,16 +14,10 @@ module Bake
         annotation :details => {'internal' => 'true'}
       end
       module ClassModule
+        attr_accessor :file_name, :org_file_name
         def fragment_ref=(fref)
-          @fname = fref.fragment.location
-        end
-
-        def file_name
-          @fname
-        end
-
-        def file_name=(name)
-          @fname = name
+          @file_name = fref.fragment.location
+          @org_file_name = fref.fragment.location
         end
       end
     end
@@ -103,6 +97,7 @@ module Bake
       class DefaultToolchain < ModelElement
         has_attr 'basedOn', String, :defaultValueLiteral => ""
         has_attr 'outputDir', String, :defaultValueLiteral => ""
+        has_attr 'outputDirPostfix', String, :defaultValueLiteral => ""
         has_attr 'eclipseOrder', Boolean, :defaultValueLiteral => "false"
         has_attr 'keepObjFileEndings', Boolean, :defaultValueLiteral => "false"
         contains_many 'compiler', Compiler, 'parent'
@@ -115,6 +110,7 @@ module Bake
 
       class Toolchain < ModelElement
         has_attr 'outputDir', String, :defaultValueLiteral => ""
+        has_attr 'outputDirPostfix', String, :defaultValueLiteral => ""
         contains_many 'compiler', Compiler, 'parent'
         contains_one 'archiver', Archiver, 'parent'
         contains_one 'linker', Linker, 'parent'

data/lib/bake/subst.rb

@@ -227,6 +227,13 @@ module Bake
             args = Bake.options.include_filter_args[splittedVar[1]]
             substStr << args if args
           end
+        elsif var == "OriginalDir"
+          org = File.dirname(elem.org_file_name)
+          if (org == @@projDir)
+            substStr << @@projDir
+          else
+            substStr << File.rel_from_to_project(@@projDir,File.dirname(elem.org_file_name),false)
+          end
         elsif var == "ProjectDir" or (splittedVar.length == 2 and splittedVar[0] == "ProjectDir")
           if (var == "ProjectDir")
             substStr << @@projDir
@@ -258,12 +265,18 @@ module Bake
             configs = @@referencedConfigs[out_proj_name]
             config = configs.select {|c| c.name == out_conf_name }.first
             if config
-              out_dir = nil
-              if (config.toolchain and config.toolchain.outputDir and config.toolchain.outputDir != "")
+
+              if config.toolchain && config.toolchain.outputDir && config.toolchain.outputDir != ""
                 out_dir = config.toolchain.outputDir
               else
                 out_dir = @@configTcMap[config][:OUTPUT_DIR]
               end
+              if config.toolchain && config.toolchain.outputDirPostfix && config.toolchain.outputDirPostfix != ""
+                out_dir_postfix = config.toolchain.outputDirPostfix
+              else
+                out_dir_postfix = @@configTcMap[config][:OUTPUT_DIR_POSTFIX]
+              end
+
               if not out_dir
                 qacPart = Bake.options.qac ? (".qac" + Bake.options.buildDirDelimiter) : ""
                 if out_proj_name == Bake.options.main_project_name and out_conf_name == Bake.options.build_config
@@ -272,6 +285,7 @@ module Bake
                   out_dir = "build" + Bake.options.buildDirDelimiter + qacPart + out_conf_name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
                 end
               end
+              out_dir += out_dir_postfix if out_dir_postfix
 
               if (out_dir.include?"$(")
                 if !elem

data/lib/bake/toolchain/clang.rb

@@ -32,6 +32,9 @@ module Bake
     if Bake::Utils::OS::name == "Mac"
       CLANG_CHAIN[:ARCHIVER][:COMMAND] = "libtool"
       CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "-static -o"
+    elsif Bake::Utils::OS::name == "Windows"
+      CLANG_CHAIN[:ARCHIVER][:COMMAND] = "clang"
+      CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "-fuse-ld=llvm-lib -o"
     else
       CLANG_CHAIN[:ARCHIVER][:COMMAND] = "ar"
       CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "r"

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/bake/util.rb

@@ -44,6 +44,7 @@ def integrateToolchain(tcs, toolchain)
 
   tcs[:KEEP_FILE_ENDINGS] = @mainConfig.defaultToolchain.keepObjFileEndings
   tcs[:OUTPUT_DIR] = toolchain.outputDir if toolchain.outputDir != ""
+  tcs[:OUTPUT_DIR_POSTFIX] = toolchain.outputDirPostfix if toolchain.outputDirPostfix != ""
   integrateLinker(tcs, toolchain.linker) if toolchain.respond_to?"linker"
   integrateArchiver(tcs, toolchain.archiver)
   toolchain.compiler.each do |c|

data/lib/bakery/model/metamodel.rb

@@ -25,6 +25,10 @@ module Bake
       has_attr 'name', String, :defaultValueLiteral => ""
       has_attr 'config', String, :defaultValueLiteral => ""
     end
+
+    class ExcludeDir < ModelElement
+      has_attr 'name', String, :defaultValueLiteral => ""
+    end
     class SubCollection < ModelElement
       has_attr 'name', String, :defaultValueLiteral => ""
     end
@@ -32,6 +36,7 @@ module Bake
       has_attr 'name', String, :defaultValueLiteral => ""
       contains_many 'project', Project, 'collection'
       contains_many 'exclude', Exclude, 'collection'
+      contains_many 'exclude_dir', ExcludeDir, 'collection'
       contains_many 'collections', SubCollection, 'collection'
     end
 

data/lib/bakery/toBake.rb

@@ -67,11 +67,18 @@ module Bake
       p.config = "^"+p.config.gsub("*","(\\w*)")+"$"
     end
 
+    col.exclude_dir.each do |e|
+      e.name = File.expand_path(e.name, @options.collection_dir)
+    end
+
     toBuild.delete_if do |bp|
       exclude = false
       col.exclude.each do |p|
         exclude = true if (bp.proj.match(p.name) != nil and bp.conf.match(p.config) != nil)
       end
+      col.exclude_dir.each do |e|
+        exclude = true if bp.proj.start_with?(e.name)
+      end
       exclude
     end
 

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
@@ -597,6 +598,9 @@ module Bake
             @output_dir = "build" + Bake.options.buildDirDelimiter + qacPart + @config.name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
           end
         end
+        if @tcs[:OUTPUT_DIR_POSTFIX] != nil
+          @output_dir = @output_dir + @tcs[:OUTPUT_DIR_POSTFIX] 
+        end
       end
 
     end

data/lib/blocks/compile.rb

@@ -37,7 +37,7 @@ begin
     x = longname(shortname(file))
   end
 
-rescue Fiddle::DLError
+rescue Exception
 
   def realname file
     file
@@ -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/blocks/makefile.rb

@@ -17,14 +17,16 @@ module Bake
         @projectDir = config.get_project_dir
         @path_to = ""
         @flags = adjustFlags("",config.flags) if config.flags
-        @makefile = config.name
+        @makefile = block.convPath(config.name)
         @target = config.target != "" ? config.target : "all"
         calcPathTo(referencedConfigs)
         calcCommandLine
         calcCleanLine
         calcEnv
 
-        block.lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, config.lib) if config.lib != ""
+        if config.lib != ""
+          block.lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, block.convPath(config.lib))
+        end 
       end
 
       def calcEnv

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.64.4"
+      "2.67.0"
     end
 
     def self.printBakeVersion(ry = "")
@@ -29,26 +29,22 @@ module Bake
     end
   end
 
-  expectedRGen = "0.8.2"
-  expectedRText = "0.9.0"
-  expectedConcurrent = "1.0.5"
-
-  begin
-    gem "rgen", "=#{expectedRGen}"
-  rescue Exception => e
-    puts "Warning: Failed to load rgen #{expectedRGen}, using latest version"
-  end
-
-  begin
-    gem "rtext", "=#{expectedRText}"
-  rescue Exception => e
-    puts "Warning: Failed to load rtext #{expectedRText}, using latest version"
-  end
-
-  begin
-    gem "concurrent-ruby", "=#{expectedConcurrent}"
-  rescue Exception => e
-    puts "Warning: Failed to load concurrent-ruby #{expectedConcurrent}, using latest version"
+  deps = [
+    ["rgen", "0.8.2"],
+    ["rtext", "0.9.0"],
+    ["concurrent-ruby", "1.0.5"],
+    ["highline", "1.7.8"],
+    ["colored", "1.2"],
+    ["thwait", "0.1.0"],
+    ["e2mmap", "0.1.0"]]
+
+  deps.each do |d|
+    begin
+      gem d[0], "=#{d[1]}"
+    rescue Exception => e
+      puts "Error: Failed to load gem #{d[0]} #{d[1]}, please reinstall bake-toolkit."
+      exit -1
+    end
   end
 
 end

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 = []
@@ -893,10 +894,13 @@ module Bake
                           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
+                          fname = File.expand_path(dep_filename_conv, b.projectDir)
+                          if File.exist?(fname)
+                            File.readlines(fname).map{|line| line.strip}.each do |dep|
+                              header = File.expand_path(dep, b.projectDir)
+                              if File.exist?(header)
+                                inCompilation << header
+                              end
                             end
                           end
                         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.64.4
+  version: 2.67.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -84,86 +84,72 @@ 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
     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'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.23
 description: See documentation for more details
 email: alexander.schaal@esrlabs.com
 executables:
@@ -204,6 +190,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
@@ -278,7 +265,7 @@ files:
 - lib/rtext-service/options/options.rb
 - lib/tocxx.rb
 - license.txt
-homepage: 
+homepage: https://github.com/esrlabs/bake
 licenses:
 - MIT
 metadata: {}
@@ -299,8 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Build tool to compile C/C++ projects fast and easy.