bake-toolkit 2.67.0 → 2.68.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b7e8c87879aebca8bbd9587f2a2763fcb2f62b32c83ef544f0071ef5ef9cd1c
-  data.tar.gz: 0236c294b3d7a72134a77ffb0c1ef671e48be28248055fff777644ef9ae71eec
+  metadata.gz: d2d635c3cc903018e92f111403d9a1450fa76c82cabd5d1159afbfe1269c3b1e
+  data.tar.gz: a4ecb9b50ead0faaf4e3a2ac37d3d295886bb8d3e6a221f41da69e74ad805474
 SHA512:
-  metadata.gz: 703bfcfeef0d0ddc237c096f29cac01fc545a17ee2b3d8213516964a2ad62d019bf2cb704e2898b294787322e04cf45482ca60d48733f8d4b16c4ab6417b1a9f
-  data.tar.gz: d4478018cc512ba6b3541bf2ec5a2149689d2e9212b92c2cce33324dfb3ac64d936c1bffc178c4820da167419e171222e85a8f333bc42ab288ec6e13e8452b35
+  metadata.gz: b5d974d79c37da1ced9fa7ae03273a5aacd27531d2e080259225df1884b646ffc7cd2b0b2658011e80446eba81617eef4072474515ee66d500e7fbbdcb87f81f
+  data.tar.gz: 998f741470db5a771b26356519f58bc904a0ac26e838aca5f100e4c2f73ef646fe09aa0ca8f96f5b08c075edc3e6dd699c136462a9cab9f8708d286cf882d5e8

data/bin/bakery

@@ -136,6 +136,7 @@ module Bake
       runOk = (ExitHelper.exit_code == 0)
     rescue Exception => e
       puts e.message
+      puts e.backtrace
     end
 
     if Bake.options.dev_features.detect { |x| x.start_with?("dep-overview=") }

data/lib/adapt/config/loader.rb

@@ -1,156 +1,164 @@
-require_relative '../../bake/model/loader'
-require_relative '../../bake/config/loader'
-require_relative '../../bake/config/checks'
-
-module Bake
-
-  class AdaptConfig
-    attr_reader :referencedConfigs
-
-    @@filenames = []
-
-    def self.filenames
-      @@filenames
-    end
-
-    def loadProjMeta(filename, filenum)
-
-      Bake::Configs::Checks.symlinkCheck(filename)
-      Bake::Configs::Checks.sanityFolderName(filename)
-
-      f = @loader.load(filename)
-
-      if f.root_elements.any? { |re| ! Metamodel::Adapt === re }
-        Bake.formatter.printError("Config file must have only 'Adapt' elements as roots", filename)
-        ExitHelper.exit(1)
-      end
-
-      f.root_elements.each do |a|
-        Bake::Config::checkVer(a.requiredBakeVersion)
-      end
-
-      configs = []
-      f.root_elements.each { |re| configs.concat(re.getConfig) }
-      AdaptConfig::checkSyntax(configs, filename)
-      configs
-    end
-
-    def self.checkSyntax(configs, filename, isLocalAdapt = false)
-      Bake::Configs::Checks::commonMetamodelCheck(configs, filename, true)
-      configs.each do |c|
-        if not c.extends.empty?
-          Bake.formatter.printError("Attribute 'extends' must not be used in adapt config.",c)
-          ExitHelper.exit(1)
-        end
-        if c.name.empty?
-          Bake.formatter.printError("Configs must be named.",c)
-          ExitHelper.exit(1)
-        end
-        if c.project.empty?
-          Bake.formatter.printError("The corresponding project must be specified.",c)
-          ExitHelper.exit(1)
-        end if !isLocalAdapt
-        if not ["replace", "remove", "extend", "push_front"].include?c.type
-          Bake.formatter.printError("Allowed types are 'replace', 'remove', 'extend' and 'push_front'.",c)
-          ExitHelper.exit(1)
-        end
-        if not ["", "yes", "no", "all"].include?c.mergeInc
-          Bake.formatter.printError("Allowed modes are 'all', 'yes', 'no' and unset.",c)
-          ExitHelper.exit(1)
-        end
-      end
-    end
-
-    def getPotentialAdaptionProjects()
-      potentialAdapts = []
-      Bake.options.roots.each do |root|
-        r = root.dir
-        if (r.length == 3 && r.include?(":/"))
-          r = r + Bake.options.main_project_name # glob would not work otherwise on windows (ruby bug?)
-        end
-        Bake.options.adapt.each do |a|
-          adaptBaseName = File.expand_path(a + "/Adapt.meta")
-          potentialAdapts << adaptBaseName  if File.exists?adaptBaseName
-        end
-        potentialAdapts.concat(Root.search_to_depth(r, "Adapt.meta", root.depth))
-      end
-
-      potentialAdapts.uniq
-    end
-
-    def chooseProjectFilenames(potentialAdapts)
-      @@filenames = []
-      Bake.options.adapt.each do |a|
-        a.gsub!(/\\/,"/")
-        found = false
-
-        # from working dir
-        if File.exist?(a) && File.file?(a)
-          @@filenames << File.expand_path(a)
-          found = true
-        end
-        next if found
-
-        # from main dir
-        Dir.chdir Bake.options.main_dir do
-          if File.exist?(a) && File.file?(a)
-            @@filenames << (Bake.options.main_dir + "/" + a)
-            found = true
-          end
-        end
-        next if found
-
-        # from roots
-        Bake.options.roots.each do |root|
-          r = root.dir
-          Dir.chdir r do
-            if File.exist?(a) && File.file?(a)
-              @@filenames << (r + "/" + a)
-              found = true
-            end
-          end
-          break if found
-        end
-        next if found
-
-        # old style
-        adapts = potentialAdapts.find_all { |p| p.include?("/"+a+"/Adapt.meta") or p == a+"/Adapt.meta" }
-        if adapts.empty?
-          Bake.formatter.printError("Adaption project #{a} not found")
-          ExitHelper.exit(1)
-        else
-          @@filenames << adapts[0]
-          if (adapts.length > 1)
-            Bake.formatter.printWarning("Adaption project #{a} exists more than once")
-            chosen = " (chosen)"
-            adapts.each do |f|
-              Bake.formatter.printWarning("  #{File.dirname(f)}#{chosen}")
-              chosen = ""
-            end
-          end
-        end
-      end
-
-    end
-
-    def load()
-      @@filenames = []
-      return [] if Bake.options.adapt.empty?
-
-      @loader = Loader.new
-
-      potentialProjects = getPotentialAdaptionProjects()
-      chooseProjectFilenames(potentialProjects)
-
-      configs = []
-      @@filenames.each_with_index do |f,i|
-        configs.concat(loadProjMeta(f, i+1))
-      end
-
-      return configs
-    end
-
-
-  end
-
-end
+require_relative '../../bake/model/loader'
+require_relative '../../bake/config/loader'
+require_relative '../../bake/config/checks'
+
+module Bake
+
+  class AdaptConfig
+    attr_reader :referencedConfigs
+
+    @@filenames = []
+
+    def self.filenames
+      @@filenames
+    end
+
+    def loadProjMeta(filename, filenum)
+
+      Bake::Configs::Checks.symlinkCheck(filename)
+      Bake::Configs::Checks.sanityFolderName(filename)
+
+      f = @loader.load(filename)
+
+      if f.root_elements.any? { |re| ! Metamodel::Adapt === re }
+        Bake.formatter.printError("Config file must have only 'Adapt' elements as roots", filename)
+        ExitHelper.exit(1)
+      end
+
+      f.root_elements.each do |a|
+        Bake::Config::checkVer(a.requiredBakeVersion)
+      end
+
+      configs = []
+      f.root_elements.each { |re| configs.concat(re.getConfig) }
+      AdaptConfig::checkSyntax(configs, filename)
+      configs
+    end
+
+    def self.checkSyntax(configs, filename, isLocalAdapt = false)
+      Bake::Configs::Checks::commonMetamodelCheck(configs, filename, true)
+      configs.each do |c|
+        if not c.extends.empty?
+          Bake.formatter.printError("Attribute 'extends' must not be used in adapt config.",c)
+          ExitHelper.exit(1)
+        end
+        if c.name.empty?
+          Bake.formatter.printError("Configs must be named.",c)
+          ExitHelper.exit(1)
+        end
+        if c.project.empty?
+          Bake.formatter.printError("The corresponding project must be specified.",c)
+          ExitHelper.exit(1)
+        end if !isLocalAdapt
+        if not ["replace", "remove", "extend", "push_front"].include?c.type
+          Bake.formatter.printError("Allowed types are 'replace', 'remove', 'extend' and 'push_front'.",c)
+          ExitHelper.exit(1)
+        end
+        if not ["", "yes", "no", "all"].include?c.mergeInc
+          Bake.formatter.printError("Allowed modes are 'all', 'yes', 'no' and unset.",c)
+          ExitHelper.exit(1)
+        end
+      end
+    end
+
+    def getPotentialAdaptionProjects()
+      potentialAdapts = []
+      Bake.options.roots.each do |root|
+        r = root.dir
+        if (r.length == 3 && r.include?(":/"))
+          r = r + Bake.options.main_project_name # glob would not work otherwise on windows (ruby bug?)
+        end
+        Bake.options.adapt.each do |a|
+          adaptBaseName = File.expand_path(a.gsub(/\(.*\)/,"") + "/Adapt.meta")
+          potentialAdapts << adaptBaseName  if File.exists?adaptBaseName
+        end
+        potentialAdapts.concat(Root.search_to_depth(r, "Adapt.meta", root.depth))
+      end
+
+      potentialAdapts.uniq
+    end
+
+    def chooseProjectFilenames(potentialAdapts)
+      @@filenames = []
+      Bake.options.adapt.each do |aComplete|
+        aComplete.gsub!(/\\/,"/")
+        a = aComplete.gsub(/\[.*\]/,"")
+        projFilter = aComplete.scan(/\[(.*)\]/)
+        if projFilter && projFilter.length > 0
+          projFilter = projFilter[0][0].split(";").map {|a| a.strip}
+        end
+
+        found = false
+
+        # from working dir
+        if File.exist?(a) && File.file?(a)
+          @@filenames << {:file => File.expand_path(a), :projs => projFilter}
+          found = true
+        end
+        next if found
+
+        # from main dir
+        Dir.chdir Bake.options.main_dir do
+          if File.exist?(a) && File.file?(a)
+            @@filenames << {:file => (Bake.options.main_dir + "/" + a), :projs => projFilter}
+            found = true
+          end
+        end
+        next if found
+
+        # from roots
+        Bake.options.roots.each do |root|
+          r = root.dir
+          Dir.chdir r do
+            if File.exist?(a) && File.file?(a)
+              @@filenames << {:file => (r + "/" + a), :projs => projFilter}
+              found = true
+            end
+          end
+          break if found
+        end
+        next if found
+
+        # old style
+        adapts = potentialAdapts.find_all { |p| p.include?("/"+a+"/Adapt.meta") or p == a+"/Adapt.meta" }
+        if adapts.empty?
+          Bake.formatter.printError("Adaption project #{a} not found")
+          ExitHelper.exit(1)
+        else
+          @@filenames << {:file => adapts[0], :projs => projFilter}
+          if (adapts.length > 1)
+            Bake.formatter.printWarning("Adaption project #{a} exists more than once")
+            chosen = " (chosen)"
+            adapts.each do |f|
+              Bake.formatter.printWarning("  #{File.dirname(f)}#{chosen}")
+              chosen = ""
+            end
+          end
+        end
+      end
+
+    end
+
+    def load()
+      @@filenames = []
+      return [] if Bake.options.adapt.empty?
+
+      @loader = Loader.new
+
+      potentialProjects = getPotentialAdaptionProjects()
+      chooseProjectFilenames(potentialProjects)
+
+      configs = []
+      @@filenames.each_with_index do |f,i|
+        loadProjMeta(f[:file], i+1).each do |c|
+          configs << {:config => c, :projs => f[:projs]}
+        end
+      end
+
+      return configs
+    end
+
+
+  end
+
+end

data/lib/bake/cache.rb

@@ -95,7 +95,8 @@ module Bake
             end
 
             if (cache != nil)
-              cache.adapt_filenames.each do |f|
+              cache.adapt_filenames.each do |fHash|
+                f = fHash[:file]
                 fileExists = File.exists?(f)
                 puts "Cache: Checking if #{f} exists: #{fileExists}" if Bake.options.debug
                 if !fileExists

data/lib/bake/config/loader.rb

@@ -89,64 +89,75 @@ module Bake
       end
 
       # check if config has to be manipulated
-      @adaptConfigs.each do |c|
-        
-        projSplitted = c.project.split(";")
-        confSplitted = c.name.split(";")
-        projPatterns = projSplitted.map { |p| /\A#{p.gsub("*", "(\\w*)")}\z/ }
-        confPatterns = confSplitted.map { |p| /\A#{p.gsub("*", "(\\w*)")}\z/ } 
-
-        if projPatterns.any? {|p| p.match(config.parent.name) } \
-          || (projName == Bake.options.main_project_name and projSplitted.any? {|p| p == "__MAIN__"}) \
-          || projSplitted.any? {|p| p == "__ALL__"}
-            
-          if confPatterns.any? {|p| p.match(config.name)} \
-            || (isMain and confSplitted.any? {|p| p == "__MAIN__"}) \
-            || confSplitted.any? {|p| p == "__ALL__"}
-
-            adaptHash = c.parent.getHash
-
-            configHash = {
-              "toolchain"   => [@defaultToolchainName],
-              "os"          => [Utils::OS.name],
-              "mainProject" => [@mainProjectName],
-              "mainConfig"  => [@mainConfigName]
-            }
-            config.scopes.each do |s|
-              configHash[s.name] = [] unless configHash.has_key?(s.name)
-              configHash[s.name] += s.value.split(";")
-            end
-
-            if !isMain && @configHashMain
-              @configHashMain.each do |k,v|
-                if configHash.has_key?(k)
-                  configHash[k] += v
-                  configHash[k].uniq!
-                else
-                  configHash[k] = v
+      @adaptConfigs.each do |cHash|
+
+        c = cHash[:config]
+
+        projSplitted    = c.project.split(";")
+        confSplitted    = c.name.split(";")
+        projSplittedCmd = cHash[:projs]
+
+        projPatterns    = projSplitted.map    { |p| /\A#{p.gsub("*", "(\\w*)")}\z/ }
+        confPatterns    = confSplitted.map    { |p| /\A#{p.gsub("*", "(\\w*)")}\z/ }
+        projPatternsCmd = projSplittedCmd.map { |p| /\A#{p.gsub("*", "(\\w*)")}\z/ } if projSplittedCmd 
+
+        if projSplittedCmd.empty? \
+          || projPatternsCmd.any? {|p| p.match(config.parent.name) } \
+          || (projName == Bake.options.main_project_name and projSplittedCmd.any? {|p| p == "__MAIN__"}) \
+          || projSplittedCmd.any? {|p| p == "__ALL__"}
+  
+          if projPatterns.any? {|p| p.match(config.parent.name) } \
+            || (projName == Bake.options.main_project_name and projSplitted.any? {|p| p == "__MAIN__"}) \
+            || projSplitted.any? {|p| p == "__ALL__"}
+              
+            if confPatterns.any? {|p| p.match(config.name)} \
+              || (isMain and confSplitted.any? {|p| p == "__MAIN__"}) \
+              || confSplitted.any? {|p| p == "__ALL__"}
+  
+              adaptHash = c.parent.getHash
+  
+              configHash = {
+                "toolchain"   => [@defaultToolchainName],
+                "os"          => [Utils::OS.name],
+                "mainProject" => [@mainProjectName],
+                "mainConfig"  => [@mainConfigName]
+              }
+              config.scopes.each do |s|
+                configHash[s.name] = [] unless configHash.has_key?(s.name)
+                configHash[s.name] += s.value.split(";")
+              end
+  
+              if !isMain && @configHashMain
+                @configHashMain.each do |k,v|
+                  if configHash.has_key?(k)
+                    configHash[k] += v
+                    configHash[k].uniq!
+                  else
+                    configHash[k] = v
+                  end
                 end
               end
-            end
-
-            checkCondition = lambda {|name,value|
-              return true if adaptHash[name].empty?
-              if !configHash.has_key?(name)
-                return adaptHash[name].any?{|ah| ah.match("")}
+  
+              checkCondition = lambda {|name,value|
+                return true if adaptHash[name].empty?
+                if !configHash.has_key?(name)
+                  return adaptHash[name].any?{|ah| ah.match("")}
+                end
+                adaptHash[name].any? { |ah| configHash[name].any?{|ch| ah.match(ch)}}
+              }
+  
+              adaptCondition = adaptHash.all? {|name,value| checkCondition.call(name, value)}
+  
+              invertLogic = (Bake::Metamodel::Unless === c.parent)
+              next if (adaptCondition && invertLogic) || (!adaptCondition && !invertLogic)
+  
+              MergeConfig.new(c, config).merge(c.type.to_sym)
+  
+              if isMain # can be changed after adapt
+                @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
               end
-              adaptHash[name].any? { |ah| configHash[name].any?{|ch| ah.match(ch)}}
-            }
-
-            adaptCondition = adaptHash.all? {|name,value| checkCondition.call(name, value)}
-
-            invertLogic = (Bake::Metamodel::Unless === c.parent)
-            next if (adaptCondition && invertLogic) || (!adaptCondition && !invertLogic)
 
-            MergeConfig.new(c, config).merge(c.type.to_sym)
-
-            if isMain # can be changed after adapt
-              @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
             end
-
           end
         end
       end
@@ -243,8 +254,8 @@ module Bake
           AdaptConfig.checkSyntax(adaptConfigs, filename, true)
           adaptConfigs.each do |ac|
             ac.project = proj.name if ac.project == "__THIS__" || ac.project == ""
+            @adaptConfigs << {:config => ac, :projs => []}
           end
-          @adaptConfigs.concat(adaptConfigs)
         end
       end
 

data/lib/bake/libElement.rb

@@ -56,6 +56,9 @@ module Bake
         cb = block.library.compileBlock
         if (block.prebuild and File.exist?adaptedPath) or
            (!cb.nil? and !(cb.calcSources(true, true) - cb.source_files_ignored_in_lib).empty?)
+          if Bake.options.consoleOutput_fullnames
+            adaptedPath = File.expand_path(adaptedPath, @projectDir)
+          end
           @@linker_libs_array << adaptedPath
           @@source_libraries << adaptedPath
         end
@@ -67,6 +70,9 @@ module Bake
           cb.object_files_ignored_in_lib.each do |ldirect|
             adaptedPath, prefix = adaptPath(ldirect, block, prefix)
             if (!block.prebuild or File.exist?adaptedPath)
+              if Bake.options.consoleOutput_fullnames
+                adaptedPath = File.expand_path(adaptedPath, @projectDir)
+              end
               @@linker_libs_array << adaptedPath
               @@source_libraries << adaptedPath
             end

data/lib/bake/model/loader.rb

@@ -1,179 +1,179 @@
-require_relative 'metamodel'
-require_relative 'language'
-require_relative '../../common/version'
-
-require 'rgen/environment'
-require 'rgen/fragment/dump_file_cache'
-require 'rgen/fragment/fragmented_model'
-require 'rgen/util/file_cache_map'
-
-require 'rtext/default_loader'
-
-require_relative '../../common/ext/rgen'
-require_relative '../../common/exit_helper'
-require_relative '../toolchain/colorizing_formatter'
-require_relative '../options/options'
-
-module Bake
-
-  class Loader
-
-    attr_reader :model
-
-    def initialize
-      @env = RGen::Environment.new
-
-      fcm = RGen::Util::FileCacheMap.new(".bake", ".cache")
-      fcm.version_info = Version.number
-
-      if !Bake.options.dry
-        @DumpFileCache = RGen::Fragment::DumpFileCache.new(fcm)
-      else
-        @DumpFileCache = nil
-      end
-
-      @model = RGen::Fragment::FragmentedModel.new(:env => @env)
-
-      @globalFilterStrMap = {
-        Bake::Metamodel::StartupSteps => "STARTUP",
-        Bake::Metamodel::PreSteps => "PRE",
-        Bake::Metamodel::PostSteps => "POST",
-        Bake::Metamodel::ExitSteps => "EXIT",
-        Bake::Metamodel::CleanSteps => "CLEAN"
-      }
-    end
-
-    def load_internal(filename, silent = false)
-      silent = false if Bake.options.debug
-      loader = RText::DefaultLoader.new(
-        Bake::Language,
-        @model,
-        :file_provider => proc { [filename] },
-        :cache => @DumpFileCache)
-      loader.load(:before_load => proc {|fragment, kind|
-        case kind
-        when :load_update_cache
-          if Bake.options.verbose >= 3
-            puts "Loading and caching #{fragment.location}" unless silent
-          else
-            puts "Loading #{fragment.location}" unless silent
-          end
-        when :load_cached
-          if Bake.options.verbose >= 3
-            puts "Loading cached #{fragment.location}" unless silent
-          else
-            puts "Loading #{fragment.location}" unless silent
-          end
-        when :load
-          puts "Loading #{fragment.location}" unless silent
-        else
-          Bake.formatter.printError("Error: Could not load #{fragment.location}")
-          ExitHelper.exit(1)
-        end
-      })
-
-      if !Bake.options.dry
-        Utils.gitIgnore(File.dirname(filename)+"/.bake")
-      end
-
-      frag = @model.fragments[0]
-      @model.remove_fragment(frag)
-      frag
-    end
-
-    def filterElement?(elem)
-      return false if Bake::Metamodel::Project === elem
-
-      # 1st prio: explicit single filter
-      if elem.filter != ""
-        return true if  Bake.options.exclude_filter.include?elem.filter
-        return false if Bake.options.include_filter.include?elem.filter
-      end
-
-      # 2nd prio: explicit global filter
-      if defined?(elem.parent)
-        globalFilterStr = @globalFilterStrMap[elem.parent.class]
-        if (globalFilterStr)
-            return true if  Bake.options.exclude_filter.include?globalFilterStr
-            return false if Bake.options.include_filter.include?globalFilterStr
-        end
-      end
-
-      # 3nd prio: default
-      return true if elem.default == "off"
-      false
-    end
-
-    def applyFilterOnArray(a)
-      toRemove = []
-      a.each do |elem|
-        if filterElement?(elem)
-          toRemove << elem
-        else
-          applyFilterOnElement(elem)
-        end
-      end
-      toRemove.each { |r| r.parent = nil if r.respond_to?(:parent=) }
-      return toRemove
-    end
-
-    def applyFilterOnElement(elem)
-      return if elem.nil?
-      elem.class.ecore.eAllReferences.each do |f|
-       next unless f.containment
-       begin
-         childData = elem.getGeneric(f.name)
-       rescue Exception => ex
-         next
-       end
-       next if childData.nil?
-       if (Array === childData)
-         applyFilterOnArray(childData)
-       elsif Metamodel::ModelElement === childData
-         if filterElement?(childData)
-           childData.parent = nil
-         else
-           applyFilterOnElement(childData)
-         end
-       end
-      end
-    end
-
-    def load(filename)
-      sumErrors = 0
-
-      if not File.exists?filename
-        Bake.formatter.printError("Error: #{filename} does not exist")
-        ExitHelper.exit(1)
-      end
-
-      frag = nil
-      if not Bake.options.nocache
-        frag = load_internal(filename) # regular load
-        frag = nil if frag.root_elements.length > 0 and filename != frag.root_elements[0].file_name
-      end
-
-      if frag.nil?
-        def @DumpFileCache.load(fragment)
-          :invalid
-        end
-        frag = load_internal(filename, !Bake.options.nocache)
-      end
-
-      frag.data[:problems].each do |p|
-        Bake.formatter.printError(p.message, p.file, p.line)
-      end
-
-      if frag.data[:problems].length > 0
-        ExitHelper.exit(1)
-      end
-
-      tor = applyFilterOnArray(frag.root_elements)
-      frag.root_elements.delete_if {|re| tor.include?(re)}
-
-      return frag
-
-    end
-
-  end
+require_relative 'metamodel'
+require_relative 'language'
+require_relative '../../common/version'
+
+require 'rgen/environment'
+require 'rgen/fragment/dump_file_cache'
+require 'rgen/fragment/fragmented_model'
+require 'rgen/util/file_cache_map'
+
+require 'rtext/default_loader'
+
+require_relative '../../common/ext/rgen'
+require_relative '../../common/exit_helper'
+require_relative '../toolchain/colorizing_formatter'
+require_relative '../options/options'
+
+module Bake
+
+  class Loader
+
+    attr_reader :model
+
+    def initialize
+      @env = RGen::Environment.new
+
+      fcm = RGen::Util::FileCacheMap.new(".bake", ".cache")
+      fcm.version_info = Version.number
+
+      if !Bake.options.dry
+        @DumpFileCache = RGen::Fragment::DumpFileCache.new(fcm)
+      else
+        @DumpFileCache = nil
+      end
+
+      @model = RGen::Fragment::FragmentedModel.new(:env => @env)
+
+      @globalFilterStrMap = {
+        Bake::Metamodel::StartupSteps => "STARTUP",
+        Bake::Metamodel::PreSteps => "PRE",
+        Bake::Metamodel::PostSteps => "POST",
+        Bake::Metamodel::ExitSteps => "EXIT",
+        Bake::Metamodel::CleanSteps => "CLEAN"
+      }
+    end
+
+    def load_internal(filename, silent = false)
+      silent = false if Bake.options.debug
+      loader = RText::DefaultLoader.new(
+        Bake::Language,
+        @model,
+        :file_provider => proc { [filename] },
+        :cache => @DumpFileCache)
+      loader.load(:before_load => proc {|fragment, kind|
+        case kind
+        when :load_update_cache
+          if Bake.options.verbose >= 3
+            puts "Loading and caching #{fragment.location}" unless silent
+          else
+            puts "Loading #{fragment.location}" unless silent
+          end
+        when :load_cached
+          if Bake.options.verbose >= 3
+            puts "Loading cached #{fragment.location}" unless silent
+          else
+            puts "Loading #{fragment.location}" unless silent
+          end
+        when :load
+          puts "Loading #{fragment.location}" unless silent
+        else
+          Bake.formatter.printError("Error: Could not load #{fragment.location}")
+          ExitHelper.exit(1)
+        end
+      })
+
+      if !Bake.options.dry
+        Utils.gitIgnore(File.dirname(filename)+"/.bake")
+      end
+
+      frag = @model.fragments[0]
+      @model.remove_fragment(frag)
+      frag
+    end
+
+    def filterElement?(elem)
+      return false if Bake::Metamodel::Project === elem
+
+      # 1st prio: explicit single filter
+      if elem.filter != ""
+        return true if  Bake.options.exclude_filter.include?elem.filter
+        return false if Bake.options.include_filter.include?elem.filter
+      end
+
+      # 2nd prio: explicit global filter
+      if defined?(elem.parent)
+        globalFilterStr = @globalFilterStrMap[elem.parent.class]
+        if (globalFilterStr)
+            return true if  Bake.options.exclude_filter.include?globalFilterStr
+            return false if Bake.options.include_filter.include?globalFilterStr
+        end
+      end
+
+      # 3nd prio: default
+      return true if elem.default == "off"
+      false
+    end
+
+    def applyFilterOnArray(a)
+      toRemove = []
+      a.each do |elem|
+        if filterElement?(elem)
+          toRemove << elem
+        else
+          applyFilterOnElement(elem)
+        end
+      end
+      toRemove.each { |r| r.parent = nil if r.respond_to?(:parent=) }
+      return toRemove
+    end
+
+    def applyFilterOnElement(elem)
+      return if elem.nil?
+      elem.class.ecore.eAllReferences.each do |f|
+       next unless f.containment
+       begin
+         childData = elem.getGeneric(f.name)
+       rescue Exception => ex
+         next
+       end
+       next if childData.nil?
+       if (Array === childData)
+         applyFilterOnArray(childData)
+       elsif Metamodel::ModelElement === childData
+         if filterElement?(childData)
+           childData.parent = nil
+         else
+           applyFilterOnElement(childData)
+         end
+       end
+      end
+    end
+
+    def load(filename)
+      sumErrors = 0
+
+      if not File.exists?filename
+        Bake.formatter.printError("Error: #{filename} does not exist")
+        ExitHelper.exit(1)
+      end
+
+      frag = nil
+      if not Bake.options.nocache
+        frag = load_internal(filename) # regular load
+        frag = nil if frag.root_elements.length > 0 and filename != frag.root_elements[0].file_name
+      end
+
+      if frag.nil?
+        def @DumpFileCache.load(fragment)
+          :invalid
+        end
+        frag = load_internal(filename, !Bake.options.nocache)
+      end
+
+      frag.data[:problems].each do |p|
+        Bake.formatter.printError(p.message, p.file, p.line)
+      end
+
+      if frag.data[:problems].length > 0
+        ExitHelper.exit(1)
+      end
+
+      tor = applyFilterOnArray(frag.root_elements)
+      frag.root_elements.delete_if {|re| tor.include?(re)}
+
+      return frag
+
+    end
+
+  end
 end

data/lib/bake/model/metamodel.rb

@@ -197,13 +197,16 @@ module Bake
         contains_many 'except', Except, 'parent'
       end
 
-      class Step < ModelElement
-        has_attr 'name', String, :defaultValueLiteral => ""
+      class StepBase < ModelElement
         has_attr 'echo', String, :defaultValueLiteral => "on"
         has_attr 'independent', Boolean, :defaultValueLiteral => "false"
         has_many_attr 'validExitCodes', Integer
       end
 
+      class Step < StepBase
+        has_attr 'name', String, :defaultValueLiteral => ""
+      end
+
       class Makefile < Step
         has_attr 'lib', String, :defaultValueLiteral => ""
         has_attr 'target', String, :defaultValueLiteral => ""
@@ -234,27 +237,28 @@ module Bake
         has_attr 'name', String, :defaultValueLiteral => "0.0"
       end
 
-      class CommandLine < Step
+      class CommandLine < StepBase
+        has_many_attr 'name', String, :defaultValueLiteral => ""
       end
 
       class PreSteps < ModelElement
-        contains_many 'step', Step, 'parent'
+        contains_many 'step', StepBase, 'parent'
       end
 
       class PostSteps < ModelElement
-        contains_many 'step', Step, 'parent'
+        contains_many 'step', StepBase, 'parent'
       end
 
       class ExitSteps < ModelElement
-        contains_many 'step', Step, 'parent'
+        contains_many 'step', StepBase, 'parent'
       end
 
       class CleanSteps < ModelElement
-        contains_many 'step', Step, 'parent'
+        contains_many 'step', StepBase, 'parent'
       end
 
       class StartupSteps < ModelElement
-        contains_many 'step', Step, 'parent'
+        contains_many 'step', StepBase, 'parent'
       end
 
       class LinkerScript < ModelElement
@@ -344,7 +348,7 @@ module Bake
       end
 
       class CustomConfig < BaseConfig_INTERNAL
-        contains_one 'step', Step, 'parent'
+        contains_one 'step', StepBase, 'parent'
         module ClassModule
           def color
             "red"

data/lib/bake/subst.rb

@@ -388,8 +388,14 @@ module Bake
         return if Metamodel::DefaultToolchain === elem
         return if Metamodel::Toolchain === elem.class
         next if a.eType.name != "EString"
-        substStr = substString(elem.getGeneric(a.name), elem, a.name)
-        elem.setGeneric(a.name, substStr)
+        value = elem.getGeneric(a.name)
+        if value.kind_of?(Array)
+          substArr = value.map { |s| substString(s, elem, a.name) }
+          elem.setGeneric(a.name, substArr)
+        else
+          substStr = substString(value, elem, a.name)
+          elem.setGeneric(a.name, substStr)
+        end
       end
 
       childsRefs = elem.class.ecore.eAllReferences.select{|r| r.containment}

data/lib/blocks/block.rb

@@ -601,6 +601,9 @@ module Bake
         if @tcs[:OUTPUT_DIR_POSTFIX] != nil
           @output_dir = @output_dir + @tcs[:OUTPUT_DIR_POSTFIX] 
         end
+        if Bake.options.consoleOutput_fullnames
+          @output_dir = File.expand_path(@output_dir, @projectDir)
+        end
       end
 
     end

data/lib/blocks/commandLine.rb

@@ -1,44 +1,44 @@
-require_relative 'has_execute_command'
-
-module Bake
-  module Blocks
-
-    class CommandLine
-      include HasExecuteCommand
-
-      def initialize(config)
-        @config = config # Bake::Metamodel::CommandLine
-        @commandLine = config.name
-        @projectDir = config.get_project_dir
-      end
-
-      def run
-        return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
-      end
-
-      def execute
-        return run()
-      end
-
-      def startupStep
-        return run()
-      end
-
-      def exitStep
-        return run()
-      end
-
-      def cleanStep
-        return run()
-      end
-
-      def clean
-        # nothing to do here
-        return true
-      end
-
-    end
-
-  end
-end
+require_relative 'has_execute_command'
+
+module Bake
+  module Blocks
+
+    class CommandLine
+      include HasExecuteCommand
+
+      def initialize(config)
+        @config = config # Bake::Metamodel::CommandLine
+        @commandLine = config.name.kind_of?(Array) ? config.name.join(' ') : config.name
+        @projectDir = config.get_project_dir
+      end
+
+      def run
+        return true if Bake.options.linkOnly
+        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
+      end
+
+      def execute
+        return run()
+      end
+
+      def startupStep
+        return run()
+      end
+
+      def exitStep
+        return run()
+      end
+
+      def cleanStep
+        return run()
+      end
+
+      def clean
+        # nothing to do here
+        return true
+      end
+
+    end
+
+  end
+end

data/lib/blocks/compile.rb

@@ -255,7 +255,7 @@ module Bake
           cmdJson = cmd.is_a?(Array) ? cmd.join(' ') : cmd
           srcFilePath = source
           if Bake.options.consoleOutput_fullnames
-            srcFilePath = File.join(@projectDir, srcFilePath)
+            srcFilePath = File.join(@projectDir, srcFilePath) if !File.is_absolute?(srcFilePath)
             cmdJson[source] = srcFilePath
           end
           cmdJson.gsub!("\"" , "\\\"")
@@ -524,10 +524,16 @@ module Bake
 
       def calcObjects
         @object_files_ignored_in_lib = []
-        @source_files.each do |source|
+        @source_files.map! do |source|
           type = get_source_type(source)
           if not type.nil?
             object = get_object_file(source)
+
+            if Bake.options.consoleOutput_fullnames
+              object = File.expand_path(object, @projectDir)
+              source = File.expand_path(source, @projectDir)
+            end
+
             if @objects.include?object
               @object_files.each do |k,v|
                 if (v == object) # will be found exactly once
@@ -545,6 +551,7 @@ module Bake
               @objects << object
             end
           end
+          source
         end
       end
 
@@ -629,16 +636,18 @@ module Bake
       end
 
       def calcIncludesInternal(block)
-        # puts "#{block.projectName},#{block.configName} " + block.to_s
         noDeps = @blocksRead.include?(block)
         @blocksRead << block
         block.bes.each do |be|
           if Metamodel::IncludeDir === be
-            # puts "-- #{be.name}"
             if be.inherit == true || block == @block
-              mappedInc = File.rel_from_to_project(@projectDir,be.name,false)
-              mappedInc  = "." if mappedInc.empty?
-              if !@include_set.include?(mappedInc) # todo set!!
+              if Bake.options.consoleOutput_fullnames
+                mappedInc = be.name
+              else
+                mappedInc = File.rel_from_to_project(@projectDir,be.name,false)
+                mappedInc  = "." if mappedInc.empty?
+              end
+              if !@include_set.include?(mappedInc)
                 @include_list << mappedInc
                 @include_set << mappedInc
                 if !@include_merge.has_key?(mappedInc)
@@ -674,15 +683,7 @@ module Bake
         @include_list = []
         @include_merge = {}
         @system_includes = Set.new
-        
-          #puts @block.bes.length
-          #@block.bes.each {|b| puts "#{b.class}: #{b.name}, #{b.respond_to?(:config) ? b.config : ""}"}
-          #exit(1)
-        
-
-        
         calcIncludesInternal(@block) # includeDir and child dependencies with inherit: true
-        # exit(1)
         @include_list = @include_list.flatten.uniq
       end
 

data/lib/blocks/executable.rb

@@ -43,6 +43,10 @@ module Bake
           baseFilename += ".#{@config.artifactExtension.name}"
         end
         @exe_name ||= File.join([@block.output_dir, baseFilename])
+        if Bake.options.consoleOutput_fullnames
+          @exe_name = File.expand_path(@exe_name, @projectDir)
+        end
+        return @exe_name
       end
 
       def calcCmdlineFile()

data/lib/blocks/library.rb

@@ -34,6 +34,10 @@ module Bake
           baseFilename += ".#{@config.artifactExtension.name}"
         end
         @archive_name ||= File.join([@block.output_dir, baseFilename])
+        if Bake.options.consoleOutput_fullnames
+          @archive_name = File.expand_path(@archive_name, @projectDir)
+        end
+        return @archive_name
       end
 
       def calcCmdlineFile()

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -652,8 +652,8 @@ module Bake
               al = AdaptConfig.new
               adaptConfigs = al.load()
 
-              @loadedConfig = Config.new
-              @referencedConfigs = @loadedConfig.load(adaptConfigs)
+              loadedConfig = Config.new
+              @referencedConfigs = loadedConfig.load(adaptConfigs)
 
               cache.write_cache(@referencedConfigs, adaptConfigs)
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.67.0
+  version: 2.68.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext