bake-toolkit 2.65.0 → 2.68.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fd56c91721f565baebab8ee13b453249a1673565cccd22ddde5787797035562
-  data.tar.gz: d6013cd8ad4eefe6f6979d2b3a905a30b1737b54398c7d317367bc9a36676e71
+  metadata.gz: d2d635c3cc903018e92f111403d9a1450fa76c82cabd5d1159afbfe1269c3b1e
+  data.tar.gz: a4ecb9b50ead0faaf4e3a2ac37d3d295886bb8d3e6a221f41da69e74ad805474
 SHA512:
-  metadata.gz: 4d360c2a3d60a572580ab81ab31575d330b69aa7001b09a3dd725e88e23c5bb3a7e34564d1933e8c68c680fea831eeec63c829f63e1cd5307079c319ef68ce09
-  data.tar.gz: 3190bf643083cd2378eec6b3a69077e17fe80c2f8f05080e80903306132c362c52dbea7ab834f5a8815eff1916b8b4689780ab863a9f93dbcce14f6dfd05b7da
+  metadata.gz: b5d974d79c37da1ced9fa7ae03273a5aacd27531d2e080259225df1884b646ffc7cd2b0b2658011e80446eba81617eef4072474515ee66d500e7fbbdcb87f81f
+  data.tar.gz: 998f741470db5a771b26356519f58bc904a0ac26e838aca5f100e4c2f73ef646fe09aa0ca8f96f5b08c075edc3e6dd699c136462a9cab9f8708d286cf882d5e8

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/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

@@ -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?
@@ -88,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.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
@@ -237,13 +249,13 @@ 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|
             ac.project = proj.name if ac.project == "__THIS__" || ac.project == ""
+            @adaptConfigs << {:config => ac, :projs => []}
           end
-          @adaptConfigs.concat(adaptConfigs)
         end
       end