bake-toolkit 2.44.0 → 2.44.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3661ce41b15cb95daa7e30356c5436621bb9b9d8
-  data.tar.gz: 58ada38722104cc9f3a83348fa839428ffadc648
+  metadata.gz: 63594dff72adc9e2399d3e5b3e61c10cfa428937
+  data.tar.gz: b5ac0b63c555016846e26bb62db52e609d70db63
 SHA512:
-  metadata.gz: 5a95bb26915962630ba32e6693cfb7caa611b7ff3f729f8993d5c882a51587486ffbbe8be2e6ad90aaebf86b67a9ef78ee52ddde5827720ff17f43f5bab14173
-  data.tar.gz: 75f577c43f0d7ffc103e425cd33d86965bf8ad138c0c5697a2e4adb85731b064f7b6aaf45567969b1bc43f96d529eaec8759b3069deee35b3f7103a0a63c26ca
+  metadata.gz: 75df6bc8056a67e5250a0600149f9fcd356d86a51c20ecf0868f266062f918d0b8738d5703f8e4f506a6d4013174bc4fac0aaf7de53886200e863ccb01780646
+  data.tar.gz: d728f32ae07a50f727d93b8c9842c2d43c0bf2460d78908cc3abb370d69c8d25e687ab0ce1e0fb2f7a1b27aaa2c1cf76016dac171cfd98ccd41712e970e989d0

data/lib/bake/config/loader.rb

@@ -1,393 +1,393 @@
-require 'bake/model/loader'
-require 'bake/config/checks'
-require 'adapt/config/loader'
-
-module Bake
-
-  class Config
-    attr_reader :referencedConfigs
-
-    def initialize()
-      @fullProjects = {}
-      @defaultToolchainName = ""
-      @mainProjectName = ""
-      @mainConfigName = ""
-    end
-
-    def resolveConfigName(configs, configname)
-      if (configname == "")
-        if configs[0].parent.default != ""
-          configname = configs[0].parent.default
-        else
-          Bake.formatter.printError("No default config specified", configs[0].file_name)
-          ExitHelper.exit(1)
-        end
-      end
-      return configname
-    end
-
-    def getFullProjectInternal(configs, configname, isMain) # note: configs is never empty
-
-      configname = resolveConfigName(configs, configname)
-
-      if isMain
-        if Bake.options.qac
-          configs.each do |c|
-            if c.name == (configname + "Qac")
-              configname = configname + "Qac"
-              break
-            end
-          end
-        end
-      end
-
-      config = nil
-      configs.each do |c|
-        if c.name == configname
-          if config
-            Bake.formatter.printError("Config '#{configname}' found more than once",config.file_name)
-            ExitHelper.exit(1)
-          end
-          config = c
-        end
-      end
-
-      if not config
-        Bake.formatter.printError("Config '#{configname}' not found", configs[0].file_name)
-        ExitHelper.exit(1)
-      end
-
-      if config.extends != ""
-        config.extends.split(",").map {|ex| ex.strip}.reverse.each do |ex|
-          if (ex != "")
-            parent,parentConfigName = getFullProjectInternal(configs, ex, isMain)
-            MergeConfig.new(config, parent).merge(:merge)
-          end
-        end
-      end
-
-      [config, configname]
-    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)
-
-      if isMain
-        @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
-        @mainProjectName = config.parent.name
-        @mainConfigName = config.name
-      end
-
-      # check if config has to be manipulated
-      @adaptConfigs.each do |c|
-
-      if isMain
-        @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
-        @mainProjectName = config.parent.name
-        @mainConfigName = config.name
-      end
-
-      projPattern = /\A#{c.project.gsub("*", "(\\w*)")}\z/
-      confPattern = /\A#{c.name.gsub("*", "(\\w*)")}\z/
-
-       if projPattern.match(config.parent.name) or (isMain and c.project == "__MAIN__") or c.project == "__ALL__"
-          if confPattern.match(config.name) or (isMain and c.name == "__MAIN__") or c.name == "__ALL__"
-
-            conditionProjPattern = /\A#{c.parent.mainProject.gsub("*", "(\\w*)")}\z/
-            conditionConfPattern = /\A#{c.parent.mainConfig.gsub("*", "(\\w*)")}\z/
-
-            adaptCondition = (c.parent.toolchain == ""   || c.parent.toolchain == @defaultToolchainName) &&
-              (c.parent.os == ""          || c.parent.os == Utils::OS.name) &&
-              (c.parent.mainProject == "" || !conditionProjPattern.match(@mainProjectName).nil?) &&
-              (c.parent.mainConfig ==  "" || !conditionConfPattern.match(@mainConfigName).nil?)
-
-            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
-
-      @fullProjects[projName + "," + configname] = [config, configname]
-      [config, configname]
-    end
-
-    def symlinkCheck(filename)
-      dirOfProjMeta = File.dirname(filename)
-      Dir.chdir(dirOfProjMeta) do
-        if Dir.pwd != dirOfProjMeta and File.dirname(Dir.pwd) != File.dirname(dirOfProjMeta)
-          isSym = false
-          begin
-            isSym = File.symlink?(dirOfProjMeta)
-          rescue
-          end
-          if isSym
-            Bake.formatter.printError("Symlinks only allowed with the same parent dir as the target: #{dirOfProjMeta} --> #{Dir.pwd}", filename)
-            ExitHelper.exit(1)
-          end
-        end
-      end
-    end
-
-    def checkVerFormat(ver)
-      return true if ver.empty?
-      return false if ver.length > 3
-      ver.each do |v|
-        return false if not /\A\d+\z/.match(v)
-      end
-      true
-    end
-
-    def bailOutVer(reqVersion)
-      text1 = (reqVersion.minimum.empty? ? "" : "minimum = #{reqVersion.minimum}")
-      text2 = ((reqVersion.minimum.empty? or reqVersion.maximum.empty?) ? "" : ", ")
-      text3 = (reqVersion.maximum.empty? ? "" : "maximum = #{reqVersion.maximum}")
-      Bake.formatter.printError("Not compatible with installed bake version: #{text1 + text2 + text3}", reqVersion)
-      ExitHelper.exit(1)
-    end
-
-    def checkVer(reqVersion)
-      return if reqVersion.nil?
-      min = reqVersion.minimum.split(".")
-      max = reqVersion.maximum.split(".")
-      cur = Bake::Version.number.split(".")
-
-      if !checkVerFormat(min) or !checkVerFormat(max)
-        Bake.formatter.printError("Version must be <major>.<minor>.<patch> whereas minor and patch are optional and all numbers >= 0.", reqVersion)
-        ExitHelper.exit(1)
-      end
-
-      [min,max,cur].each { |arr| arr.map! {|x| x.to_i} }
-      min.each_with_index do |v,i|
-        break if v < cur[i]
-        bailOutVer(reqVersion) if v > cur[i]
-      end
-      max.each_with_index do |v,i|
-        break if v > cur[i]
-        bailOutVer(reqVersion) if v < cur[i]
-      end
-    end
-
-    def loadProjMeta(filename)
-
-      Bake::Configs::Checks.symlinkCheck(filename)
-
-      f = @loader.load(filename)
-
-      config = nil
-
-      projRoots = f.root_elements.select { |re| Metamodel::Project === re }
-      if projRoots.length != 1
-        Bake.formatter.printError("Config file must have exactly one 'Project' element as root element", filename)
-        ExitHelper.exit(1)
-      end
-      proj = projRoots[0]
-
-      reqVersion = proj.getRequiredBakeVersion
-      checkVer(reqVersion)
-
-      configs = proj.getConfig
-      Bake::Configs::Checks::commonMetamodelCheck(configs, filename)
-
-      configs.each do |c|
-        if not c.project.empty?
-          Bake.formatter.printError("Attribute 'project' must only be used in adapt config.",c)
-          ExitHelper.exit(1)
-        end
-        if not c.type.empty?
-          Bake.formatter.printError("Attribute 'type' must only be used in adapt config.",c)
-          ExitHelper.exit(1)
-        end
-      end
-
-      adaptRoots = f.root_elements.select { |re| Metamodel::Adapt === re }
-      if adaptRoots.length > 0
-        adaptRoots.each do |adapt|
-          adapt.mainProject = @mainProjectName 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 == ""
-          end
-          @adaptConfigs.concat(adaptConfigs)
-        end
-      end
-
-      configs
-    end
-
-
-    def validateDependencies(config)
-      config.dependency.each do |dep|
-        if dep.name.include?"$" or dep.config.include?"$"
-          Bake.formatter.printError("No variables allowed in Dependency definition", dep)
-          ExitHelper.exit(1)
-        end
-        dep.name = config.parent.name if dep.name == ""
-      end
-    end
-
-    def loadMeta(dep)
-      dep_subbed = dep.name.gsub(/\\/,"/")
-      if dep_subbed.include?":" or dep_subbed.include?"../" or dep_subbed.start_with?"/" or dep_subbed.end_with?"/"
-        Bake.formatter.printError("#{dep.name}  is invalid", dep)
-        ExitHelper.exit(1)
-      end
-      dep_path, dismiss, dep_name = dep_subbed.rpartition("/")
-
-      # file not loaded yet
-      if not @loadedConfigs.include?dep_name
-
-        if Bake.options.verbose >= 3
-          puts "First referenced by #{dep.parent.parent.name} (#{dep.parent.name}):"
-        end
-
-        pmeta_filenames = []
-
-        @potentialProjs.each do |pp|
-          if pp.include?("/" + dep_subbed + "/Project.meta") or pp == (dep_subbed + "/Project.meta")
-            pmeta_filenames << pp
-          end
-        end
-
-        if pmeta_filenames.empty?
-          Bake.formatter.printError("#{dep.name}/Project.meta not found", dep)
-          ExitHelper.exit(1)
-        end
-
-        if pmeta_filenames.length > 1
-          Bake.formatter.printWarning("Project #{dep.name} exists more than once", dep)
-          chosen = " (chosen)"
-          pmeta_filenames.each do |f|
-            Bake.formatter.printWarning("  #{File.dirname(f)}#{chosen}")
-            chosen = ""
-          end
-        end
-
-        @loadedConfigs[dep_name] = loadProjMeta(pmeta_filenames[0])
-      else
-        folder = @loadedConfigs[dep_name][0].get_project_dir
-        if not folder.include?dep_subbed
-          Bake.formatter.printError("Cannot load #{dep.name}, because #{folder} already loaded", dep)
-          ExitHelper.exit(1)
-        end
-
-      end
-      # get config
-      if Bake.options.verbose >= 3
-        puts "  #{dep_name} #{dep.config.empty? ? "<default>" : "("+dep.config+")"} referenced by #{dep.parent.parent.name} (#{dep.parent.name})"
-      end
-      config, dep.config = getFullProject(dep_name, @loadedConfigs[dep_name], dep.config, false)
-      dep.name = dep_name
-
-      # config not referenced yet
-      if not @referencedConfigs.include?dep_name
-        @referencedConfigs[dep_name] = [config]
-      elsif @referencedConfigs[dep_name].index { |c| c.name == dep.config } == nil
-        @referencedConfigs[dep_name] << config
-      else
-        return
-      end
-
-      validateDependencies(config)
-      @depsPending += config.dependency
-    end
-
-    def loadMainMeta()
-      mainMeta = Bake.options.main_dir+"/Project.meta"
-      configs = loadProjMeta(mainMeta)
-      @loadedConfigs = {}
-      @loadedConfigs[Bake.options.main_project_name] = configs
-
-      if not showConfigNames?
-        config, Bake.options.build_config = getFullProject(Bake.options.main_project_name, configs,Bake.options.build_config, true)
-
-        @referencedConfigs = {}
-        @referencedConfigs[Bake.options.main_project_name] = [config]
-
-        validateDependencies(config)
-        @depsPending = config.dependency
-
-        if Bake.options.build_config != "" and config.defaultToolchain == nil
-          Bake.formatter.printError("Main project configuration must contain DefaultToolchain", config)
-          ExitHelper.exit(1)
-        end
-      end
-
-    end
-
-    def checkRoots()
-      @potentialProjs = []
-      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
-        depthStr = root.depth.nil? ? "max" : root.depth.to_s
-        puts "Checking root #{r} (depth: #{depthStr})" if Bake.options.verbose >= 1
-        @potentialProjs.concat(Root.search_to_depth(r, "Project.meta", root.depth))
-      end
-      @potentialProjs.uniq!
-    end
-
-    def defaultConfigName
-      @loadedConfigs[Bake.options.main_project_name].first.parent.default
-    end
-
-    def showConfigNames?
-      Bake.options.showConfigs or (Bake.options.build_config == "" and defaultConfigName == "")
-    end
-
-    def printConfigNames
-      mainConfigName = Bake.options.build_config != "" ? Bake.options.build_config : defaultConfigName
-      configs = @loadedConfigs[Bake.options.main_project_name]
-      foundValidConfig = false
-      configs.each do |c|
-        config, tmp = getFullProject(Bake.options.main_project_name, configs, c.name, c.name == mainConfigName)
-        next if config.defaultToolchain.nil?
-        Kernel.print "* #{config.name}"
-        Kernel.print " (default)" if config.name == defaultConfigName
-        Kernel.print ": #{config.description.text}" if config.description
-        Kernel.print "\n"
-        foundValidConfig = true
-      end
-
-      Bake.formatter.printWarning("No configuration with a DefaultToolchain found", Bake.options.main_dir+"/Project.meta") unless foundValidConfig
-      ExitHelper.exit(0)
-    end
-
-    def printConfigs(adaptConfigs)
-      @adaptConfigs = adaptConfigs
-      @loader = Loader.new
-      loadMainMeta # note.in cache only needed configs are stored
-      printConfigNames
-    end
-
-    def load(adaptConfigs)
-      @adaptConfigs = adaptConfigs
-      @loader = Loader.new
-      loadMainMeta
-      printConfigNames if showConfigNames? # if neither config name nor default is set, list the configs with DefaultToolchain
-      checkRoots
-      while dep = @depsPending.shift
-        loadMeta(dep)
-      end
-
-      return @referencedConfigs
-    end
-
-  end
-end
+require 'bake/model/loader'
+require 'bake/config/checks'
+require 'adapt/config/loader'
+
+module Bake
+
+  class Config
+    attr_reader :referencedConfigs
+
+    def initialize()
+      @fullProjects = {}
+      @defaultToolchainName = ""
+      @mainProjectName = ""
+      @mainConfigName = ""
+    end
+
+    def resolveConfigName(configs, configname)
+      if (configname == "")
+        if configs[0].parent.default != ""
+          configname = configs[0].parent.default
+        else
+          Bake.formatter.printError("No default config specified", configs[0].file_name)
+          ExitHelper.exit(1)
+        end
+      end
+      return configname
+    end
+
+    def getFullProjectInternal(configs, configname, isMain) # note: configs is never empty
+
+      configname = resolveConfigName(configs, configname)
+
+      if isMain
+        if Bake.options.qac
+          configs.each do |c|
+            if c.name == (configname + "Qac")
+              configname = configname + "Qac"
+              break
+            end
+          end
+        end
+      end
+
+      config = nil
+      configs.each do |c|
+        if c.name == configname
+          if config
+            Bake.formatter.printError("Config '#{configname}' found more than once",config.file_name)
+            ExitHelper.exit(1)
+          end
+          config = c
+        end
+      end
+
+      if not config
+        Bake.formatter.printError("Config '#{configname}' not found", configs[0].file_name)
+        ExitHelper.exit(1)
+      end
+
+      if config.extends != ""
+        config.extends.split(",").map {|ex| ex.strip}.reverse.each do |ex|
+          if (ex != "")
+            parent,parentConfigName = getFullProjectInternal(configs, ex, isMain)
+            MergeConfig.new(config, parent).merge(:merge)
+          end
+        end
+      end
+
+      [config, configname]
+    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)
+
+      if isMain
+        @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
+        @mainProjectName = config.parent.name
+        @mainConfigName = config.name
+      end
+
+      # check if config has to be manipulated
+      @adaptConfigs.each do |c|
+
+      if isMain
+        @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
+        @mainProjectName = config.parent.name
+        @mainConfigName = config.name
+      end
+
+      projPattern = /\A#{c.project.gsub("*", "(\\w*)")}\z/
+      confPattern = /\A#{c.name.gsub("*", "(\\w*)")}\z/
+
+       if projPattern.match(config.parent.name) or (projName == Bake.options.main_project_name and c.project == "__MAIN__") or c.project == "__ALL__"
+          if confPattern.match(config.name) or (isMain and c.name == "__MAIN__") or c.name == "__ALL__"
+
+            conditionProjPattern = /\A#{c.parent.mainProject.gsub("*", "(\\w*)")}\z/
+            conditionConfPattern = /\A#{c.parent.mainConfig.gsub("*", "(\\w*)")}\z/
+
+            adaptCondition = (c.parent.toolchain == ""   || c.parent.toolchain == @defaultToolchainName) &&
+              (c.parent.os == ""          || c.parent.os == Utils::OS.name) &&
+              (c.parent.mainProject == "" || !conditionProjPattern.match(@mainProjectName).nil?) &&
+              (c.parent.mainConfig ==  "" || !conditionConfPattern.match(@mainConfigName).nil?)
+
+            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
+
+      @fullProjects[projName + "," + configname] = [config, configname]
+      [config, configname]
+    end
+
+    def symlinkCheck(filename)
+      dirOfProjMeta = File.dirname(filename)
+      Dir.chdir(dirOfProjMeta) do
+        if Dir.pwd != dirOfProjMeta and File.dirname(Dir.pwd) != File.dirname(dirOfProjMeta)
+          isSym = false
+          begin
+            isSym = File.symlink?(dirOfProjMeta)
+          rescue
+          end
+          if isSym
+            Bake.formatter.printError("Symlinks only allowed with the same parent dir as the target: #{dirOfProjMeta} --> #{Dir.pwd}", filename)
+            ExitHelper.exit(1)
+          end
+        end
+      end
+    end
+
+    def checkVerFormat(ver)
+      return true if ver.empty?
+      return false if ver.length > 3
+      ver.each do |v|
+        return false if not /\A\d+\z/.match(v)
+      end
+      true
+    end
+
+    def bailOutVer(reqVersion)
+      text1 = (reqVersion.minimum.empty? ? "" : "minimum = #{reqVersion.minimum}")
+      text2 = ((reqVersion.minimum.empty? or reqVersion.maximum.empty?) ? "" : ", ")
+      text3 = (reqVersion.maximum.empty? ? "" : "maximum = #{reqVersion.maximum}")
+      Bake.formatter.printError("Not compatible with installed bake version: #{text1 + text2 + text3}", reqVersion)
+      ExitHelper.exit(1)
+    end
+
+    def checkVer(reqVersion)
+      return if reqVersion.nil?
+      min = reqVersion.minimum.split(".")
+      max = reqVersion.maximum.split(".")
+      cur = Bake::Version.number.split(".")
+
+      if !checkVerFormat(min) or !checkVerFormat(max)
+        Bake.formatter.printError("Version must be <major>.<minor>.<patch> whereas minor and patch are optional and all numbers >= 0.", reqVersion)
+        ExitHelper.exit(1)
+      end
+
+      [min,max,cur].each { |arr| arr.map! {|x| x.to_i} }
+      min.each_with_index do |v,i|
+        break if v < cur[i]
+        bailOutVer(reqVersion) if v > cur[i]
+      end
+      max.each_with_index do |v,i|
+        break if v > cur[i]
+        bailOutVer(reqVersion) if v < cur[i]
+      end
+    end
+
+    def loadProjMeta(filename)
+
+      Bake::Configs::Checks.symlinkCheck(filename)
+
+      f = @loader.load(filename)
+
+      config = nil
+
+      projRoots = f.root_elements.select { |re| Metamodel::Project === re }
+      if projRoots.length != 1
+        Bake.formatter.printError("Config file must have exactly one 'Project' element as root element", filename)
+        ExitHelper.exit(1)
+      end
+      proj = projRoots[0]
+
+      reqVersion = proj.getRequiredBakeVersion
+      checkVer(reqVersion)
+
+      configs = proj.getConfig
+      Bake::Configs::Checks::commonMetamodelCheck(configs, filename)
+
+      configs.each do |c|
+        if not c.project.empty?
+          Bake.formatter.printError("Attribute 'project' must only be used in adapt config.",c)
+          ExitHelper.exit(1)
+        end
+        if not c.type.empty?
+          Bake.formatter.printError("Attribute 'type' must only be used in adapt config.",c)
+          ExitHelper.exit(1)
+        end
+      end
+
+      adaptRoots = f.root_elements.select { |re| Metamodel::Adapt === re }
+      if adaptRoots.length > 0
+        adaptRoots.each do |adapt|
+          adapt.mainProject = @mainProjectName 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 == ""
+          end
+          @adaptConfigs.concat(adaptConfigs)
+        end
+      end
+
+      configs
+    end
+
+
+    def validateDependencies(config)
+      config.dependency.each do |dep|
+        if dep.name.include?"$" or dep.config.include?"$"
+          Bake.formatter.printError("No variables allowed in Dependency definition", dep)
+          ExitHelper.exit(1)
+        end
+        dep.name = config.parent.name if dep.name == ""
+      end
+    end
+
+    def loadMeta(dep)
+      dep_subbed = dep.name.gsub(/\\/,"/")
+      if dep_subbed.include?":" or dep_subbed.include?"../" or dep_subbed.start_with?"/" or dep_subbed.end_with?"/"
+        Bake.formatter.printError("#{dep.name}  is invalid", dep)
+        ExitHelper.exit(1)
+      end
+      dep_path, dismiss, dep_name = dep_subbed.rpartition("/")
+
+      # file not loaded yet
+      if not @loadedConfigs.include?dep_name
+
+        if Bake.options.verbose >= 3
+          puts "First referenced by #{dep.parent.parent.name} (#{dep.parent.name}):"
+        end
+
+        pmeta_filenames = []
+
+        @potentialProjs.each do |pp|
+          if pp.include?("/" + dep_subbed + "/Project.meta") or pp == (dep_subbed + "/Project.meta")
+            pmeta_filenames << pp
+          end
+        end
+
+        if pmeta_filenames.empty?
+          Bake.formatter.printError("#{dep.name}/Project.meta not found", dep)
+          ExitHelper.exit(1)
+        end
+
+        if pmeta_filenames.length > 1
+          Bake.formatter.printWarning("Project #{dep.name} exists more than once", dep)
+          chosen = " (chosen)"
+          pmeta_filenames.each do |f|
+            Bake.formatter.printWarning("  #{File.dirname(f)}#{chosen}")
+            chosen = ""
+          end
+        end
+
+        @loadedConfigs[dep_name] = loadProjMeta(pmeta_filenames[0])
+      else
+        folder = @loadedConfigs[dep_name][0].get_project_dir
+        if not folder.include?dep_subbed
+          Bake.formatter.printError("Cannot load #{dep.name}, because #{folder} already loaded", dep)
+          ExitHelper.exit(1)
+        end
+
+      end
+      # get config
+      if Bake.options.verbose >= 3
+        puts "  #{dep_name} #{dep.config.empty? ? "<default>" : "("+dep.config+")"} referenced by #{dep.parent.parent.name} (#{dep.parent.name})"
+      end
+      config, dep.config = getFullProject(dep_name, @loadedConfigs[dep_name], dep.config, false)
+      dep.name = dep_name
+
+      # config not referenced yet
+      if not @referencedConfigs.include?dep_name
+        @referencedConfigs[dep_name] = [config]
+      elsif @referencedConfigs[dep_name].index { |c| c.name == dep.config } == nil
+        @referencedConfigs[dep_name] << config
+      else
+        return
+      end
+
+      validateDependencies(config)
+      @depsPending += config.dependency
+    end
+
+    def loadMainMeta()
+      mainMeta = Bake.options.main_dir+"/Project.meta"
+      configs = loadProjMeta(mainMeta)
+      @loadedConfigs = {}
+      @loadedConfigs[Bake.options.main_project_name] = configs
+
+      if not showConfigNames?
+        config, Bake.options.build_config = getFullProject(Bake.options.main_project_name, configs,Bake.options.build_config, true)
+
+        @referencedConfigs = {}
+        @referencedConfigs[Bake.options.main_project_name] = [config]
+
+        validateDependencies(config)
+        @depsPending = config.dependency
+
+        if Bake.options.build_config != "" and config.defaultToolchain == nil
+          Bake.formatter.printError("Main project configuration must contain DefaultToolchain", config)
+          ExitHelper.exit(1)
+        end
+      end
+
+    end
+
+    def checkRoots()
+      @potentialProjs = []
+      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
+        depthStr = root.depth.nil? ? "max" : root.depth.to_s
+        puts "Checking root #{r} (depth: #{depthStr})" if Bake.options.verbose >= 1
+        @potentialProjs.concat(Root.search_to_depth(r, "Project.meta", root.depth))
+      end
+      @potentialProjs.uniq!
+    end
+
+    def defaultConfigName
+      @loadedConfigs[Bake.options.main_project_name].first.parent.default
+    end
+
+    def showConfigNames?
+      Bake.options.showConfigs or (Bake.options.build_config == "" and defaultConfigName == "")
+    end
+
+    def printConfigNames
+      mainConfigName = Bake.options.build_config != "" ? Bake.options.build_config : defaultConfigName
+      configs = @loadedConfigs[Bake.options.main_project_name]
+      foundValidConfig = false
+      configs.each do |c|
+        config, tmp = getFullProject(Bake.options.main_project_name, configs, c.name, c.name == mainConfigName)
+        next if config.defaultToolchain.nil?
+        Kernel.print "* #{config.name}"
+        Kernel.print " (default)" if config.name == defaultConfigName
+        Kernel.print ": #{config.description.text}" if config.description
+        Kernel.print "\n"
+        foundValidConfig = true
+      end
+
+      Bake.formatter.printWarning("No configuration with a DefaultToolchain found", Bake.options.main_dir+"/Project.meta") unless foundValidConfig
+      ExitHelper.exit(0)
+    end
+
+    def printConfigs(adaptConfigs)
+      @adaptConfigs = adaptConfigs
+      @loader = Loader.new
+      loadMainMeta # note.in cache only needed configs are stored
+      printConfigNames
+    end
+
+    def load(adaptConfigs)
+      @adaptConfigs = adaptConfigs
+      @loader = Loader.new
+      loadMainMeta
+      printConfigNames if showConfigNames? # if neither config name nor default is set, list the configs with DefaultToolchain
+      checkRoots
+      while dep = @depsPending.shift
+        loadMeta(dep)
+      end
+
+      return @referencedConfigs
+    end
+
+  end
+end

data/lib/bake/options/options.rb

@@ -148,7 +148,7 @@ module Bake
 
       add_option(["--version"                                    ], lambda {     Bake::Usage.version                     })
       add_option(["--list",               "--show_configs"       ], lambda {     @showConfigs = true                     })
-      add_option(["--compilation-db"                             ], lambda { |x,dummy| @cc2j_filename = (x ? x : "compilation-db.json" )})
+      add_option(["--compilation-db"                             ], lambda { |x,dummy| @cc2j_filename = (x ? x : "compile_commands.json" )})
       add_option(["--link-2-17",          "--link_2_17"          ], lambda {     @oldLinkOrder = true                    })
       add_option(["--build_",                                    ], lambda {     @buildDirDelimiter = "_"                })
 

data/lib/bake/options/usage.rb

@@ -55,7 +55,7 @@ module Bake
       puts " --file-list              Writes all sources and headers used by a SINGLE config into '<config output folder>/file-list.txt'."
       puts "                          Writes all sources and headers used by ALL configs into '<main config output folder/global-file-list.txt'."
       puts " --prebuild               Does not build configs which are marked as 'prebuild', this feature is used for distributions."
-      puts " --compilation-db [<fn>]  Writes compilation information into filename fn in json format, default for fn is compilation-db.json"
+      puts " --compilation-db [<fn>]  Writes compilation information into filename fn in json format, default for fn is compile_commands.json"
       puts " --create exe|lib|custom  Creates a project with exe, lib or custom template"
       puts " --nb                     Suppresses the lines \"**** Building x of y: name (config) ****"
       puts " --crc32 <string>         Calulates the CRC32 of string (0x4C11DB7, init 0, final xor 0, input and result not reflected), used for Uid variable calculation"

data/lib/blocks/compile.rb

@@ -237,7 +237,12 @@ module Bake
 
         if Bake.options.cc2j_filename
           cmdJson = cmd.is_a?(Array) ? cmd.join(' ') : cmd
-          Blocks::CC2J << { :directory => @projectDir, :command => cmdJson, :file => source }
+          srcFilePath = source
+          if Bake.options.consoleOutput_fullnames
+            srcFilePath = File.join(@projectDir, srcFilePath)
+            cmdJson[source] = srcFilePath
+          end
+          Blocks::CC2J << { :directory => @projectDir, :command => cmdJson, :file => srcFilePath }
         end
 
         if not (cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile))

data/lib/common/version.rb

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

data/license.txt

@@ -1,6 +1,6 @@
 bake License:
 
-Copyright (c) 2012-2015 E.S.R.Labs AG
+Copyright (c) 2012-2018 E.S.R.Labs AG
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.44.0
+  version: 2.44.1
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -98,42 +98,42 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: See documentation for more details
@@ -249,23 +249,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "-x"
+- -x
 - doc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Build tool to compile C/C++ projects fast and easy.