bake-toolkit 2.66.0 → 2.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa60204c2439429e2b1d8e42d36206941185d1085f5c59390b8e5552f6549893
-  data.tar.gz: 5cfa793f77484f38e0170995b40b679fbd4367f3ef06c50c86c5cc148aacc9cc
+  metadata.gz: 512387067bf3154e79bfe2993a33c20ab4b8527360b89e85105ed74cf9e724df
+  data.tar.gz: 017f9892593659a0c6567b51aec681751528f2b5de47ace6ef37d54944399a2d
 SHA512:
-  metadata.gz: 6901da13b1b992c9e99af33b82f4dc0841d3d236e376a8a6932ba9d1d40490a98f283d0c6aacc794881703fea09b147f353e24b7c5790329cee56d44c0b9bf97
-  data.tar.gz: 93edb29bd48e1752ebe1d29e83916309fd291e69701b30e9deadfb9f58dc8507bffdb2da7474fcce7336de9f08275017759092b46528c9db793033e2795f0a9e
+  metadata.gz: 676bfebf96efab215d3744dc341ffdd6026df836b9797a4cf5a1d26acd264f2ad55718b99a27e57366b900bf721e8a195e4455d97f5884f94058cd1f5e3e65bc
+  data.tar.gz: af6d6ba478071e3c4ad5ffaf009e581bb42f160af73f8c8646a1f24e3ae97bbb661e00a12006fe1d305bab24046ff04b41bb5ce49596dd412829a1575b6acd4a

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

@@ -112,7 +112,7 @@ module Bake
     p = File.dirname(bp.proj)
     pRel = File.rel_from_to_project(Dir.pwd, p, false)
     pRel = "." if pRel.empty?
-    cmd = (["-m", pRel, "-b", bp.conf] + bp.args.split + passedParams)
+    cmd = (["-m", pRel, "-b", bp.conf] + bp.args.split + passedParams + bp.args_end.split)
     cmdWithNum = "bakery #{currentRun} of #{maxRuns}: bake " + cmd.join(" ")
     puts "\n#{$stars}"
     Bake.formatter.printInfo(cmdWithNum)
@@ -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,78 @@ 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
+                if name == "toolchain" && configHash[name] == [""]
+                  Bake.formatter.printWarning("Trying to adapt '#{config.name}' with 'toolchain == #{c.parent.toolchain}', but toolchain is not defined yet", c)
+                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 +257,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