RubyGems - bake-toolkit - Versions diffs - 2.19.2 → 2.20.1 - Mend

bake-toolkit 2.19.2 → 2.20.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (78) hide show

data/documentation/_build/html/tips_and_tricks/tips_and_tricks.html CHANGED

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Tips and Tricks &mdash; bake 2.19.2 documentation</title>
+    <title>Tips and Tricks &mdash; bake documentation</title>
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.19.2',
+        VERSION:     '',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.19.2 documentation" href="../index.html" />
+    <link rel="top" title="bake documentation" href="../index.html" />
     <link rel="next" title="The Bakery" href="the_bakery.html" />
     <link rel="prev" title="How to Debug in Visual Studio" href="../ide/vs/how_to_debug_in_vs.html" />
 <meta charset='utf-8'>
@@ -149,7 +149,7 @@
 <li class="toctree-l1"><a class="reference internal" href="static_code_analysis.html">Static Code Analysis</a></li>
 <li class="toctree-l1"><a class="reference internal" href="how_to_use_bake_with_cygwin.html">How to use bake with cygwin</a></li>
 <li class="toctree-l1"><a class="reference internal" href="the_clang.html">Clang Analyze</a></li>
-<li class="toctree-l1"><a class="reference internal" href="bundle.html">Bundle projects</a></li>
+<li class="toctree-l1"><a class="reference internal" href="dot.html">Generating dot graphs</a></li>
 </ul>
 </div>
 <div class="section" id="unnecessary-includes">

data/documentation/_build/html/why_bake/why_bake.html CHANGED

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Why you should use bake &mdash; bake 2.19.2 documentation</title>
+    <title>Why you should use bake &mdash; bake documentation</title>
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.19.2',
+        VERSION:     '',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,9 +29,9 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.19.2 documentation" href="../index.html" />
+    <link rel="top" title="bake documentation" href="../index.html" />
     <link rel="next" title="Install bake" href="../install/install_bake.html" />
-    <link rel="prev" title="bake 2.19.2" href="../index.html" />
+    <link rel="prev" title="bake 2.20.0" href="../index.html" />
 <meta charset='utf-8'>
 <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
 <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
@@ -108,7 +108,7 @@
   <li>
-    <a href="../index.html" title="Previous Chapter: bake 2.19.2"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; bake 2.19.2</span>
+    <a href="../index.html" title="Previous Chapter: bake 2.20.0"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; bake 2.20.0</span>
     </a>
   </li>
   <li>

data/lib/adapt/config/loader.rb CHANGED

@@ -5,71 +5,73 @@ module Bake
   class AdaptConfig
     attr_reader :referencedConfigs
     @@filenames = []
     def self.filenames
       @@filenames
-    end
+    end
     def loadProjMeta(filename, filenum)
       Bake::Configs::Checks.symlinkCheck(filename)
       f = @loader.load(filename)
       if f.root_elements.length != 1 or not Metamodel::Adapt === f.root_elements[0]
         Bake.formatter.printError("Config file must have exactly one 'Adapt' element as root element", filename)
         ExitHelper.exit(1)
       end
       adapt = f.root_elements[0]
       configs = adapt.getConfig
       Bake::Configs::Checks::commonMetamodelCheck(configs, filename)
       configs.each do |c|
         if not c.extends.empty?
-          Bake.formatter.printError("Attribute 'extends' must not be used in adapt config.",c)
+          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)
+          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)
+          Bake.formatter.printError("The corresponding project must be specified.",c)
           ExitHelper.exit(1)
         end
         if not ["replace", "remove", "extend"].include?c.type
-          Bake.formatter.printError("Allowed types are 'replace', 'remove' and 'extend'.",c)
+          Bake.formatter.printError("Allowed types are 'replace', 'remove' and 'extend'.",c)
           ExitHelper.exit(1)
         end
       end
       configs
-    end
+    end
     def getPotentialAdaptionProjects()
       potentialAdapts = []
       Bake.options.roots.each do |r|
         if (r.length == 3 && r.include?(":/"))
           r = r + Bake.options.main_project_name # glob would not work otherwise on windows (ruby bug?)
-        end
+        end
         Bake.options.adapt.each do |a|
-          fn = r+"/**{,/*/**}/#{a}/Adapt.meta"
+          adaptBaseName = a + "/Adapt.meta"
+          potentialAdapts << adaptBaseName  if File.exists?adaptBaseName
+          fn = r+"/**{,/*/**}/#{adaptBaseName}"
           potentialAdapts.concat(Dir.glob(fn).sort)
         end
       end
       potentialAdapts.uniq
-    end
-    def chooseProjectFilenames(potentialAdapts)
+    end
+    def chooseProjectFilenames(potentialAdapts)
       @@filenames = []
-      Bake.options.adapt.each do |a|
-        adapts = potentialAdapts.find_all { |p| p.include?(a+"/Adapt.meta") }
+        p potentialAdapts
+      Bake.options.adapt.each do |a|
+        adapts = potentialAdapts.find_all { |p| p.include?(a+"/Adapt.meta") }
         if adapts.empty?
           Bake.formatter.printError("Adaption project #{a} not found")
           ExitHelper.exit(1)
@@ -85,27 +87,27 @@ module Bake
           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
+      return configs
     end
   end
 end

data/lib/bake/config/checks.rb CHANGED

@@ -2,7 +2,7 @@ module Bake
   module Configs
     class Checks
       def self.symlinkCheck(filename)
         dirOfProjMeta = File.dirname(filename)
         Dir.chdir(dirOfProjMeta) do
@@ -19,14 +19,14 @@ module Bake
           end
         end
       end
       def self.commonMetamodelCheck(configs, filename)
         if configs.length == 0
           Bake.formatter.printError("No config found", filename)
           ExitHelper.exit(1)
         end
         configs.each do |config|
           if config.respond_to?("toolchain") and config.toolchain
             config.toolchain.compiler.each do |c|
@@ -36,26 +36,34 @@ module Bake
               end
             end
           end
           config.includeDir.each do |inc|
             if not ["front", "back", ""].include?inc.inject
-              Bake.formatter.printError("inject of IncludeDir must be 'front' or 'back'", inc)
+              Bake.formatter.printError("inject of IncludeDir must be 'front' or 'back'", inc)
               ExitHelper.exit(1)
             end
             if not ["front", "back", ""].include?inc.infix
-              Bake.formatter.printError("infix of IncludeDir must be 'front' or 'back'", inc)
+              Bake.formatter.printError("infix of IncludeDir must be 'front' or 'back'", inc)
               ExitHelper.exit(1)
             end
             if (inc.infix != "" and inc.inject != "")
-              Bake.formatter.printError("IncludeDir must have inject OR infix (deprecated)", inc)
+              Bake.formatter.printError("IncludeDir must have inject OR infix (deprecated)", inc)
               ExitHelper.exit(1)
             end
           end if config.respond_to?("includeDir")
+          config.dependency.each do |d|
+            if not ["front", "back", ""].include?d.inject
+              Bake.formatter.printError("inject of Dependency must be 'front' or 'back'", d)
+              ExitHelper.exit(1)
+            end
+          end
         end
       end
     end
   end
 end

data/lib/bake/config/loader.rb CHANGED

@@ -5,18 +5,18 @@ module Bake
   class Config
     attr_reader :referencedConfigs
     def getFullProjectInternal(configs, configname, isMain) # note: configs is never empty
       if (configname == "")
         if configs[0].parent.default != ""
           configname = configs[0].parent.default
         else
-          Bake.formatter.printError("No default config specified", configs[0].file_name)
+          Bake.formatter.printError("No default config specified", configs[0].file_name)
           ExitHelper.exit(1)
         end
       end
       config = nil
       configs.each do |c|
         if c.name == configname
@@ -26,13 +26,13 @@ module Bake
           end
           config = c
         end
-      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 != "")
@@ -41,10 +41,10 @@ module Bake
           end
         end
       end
       [config, configname]
     end
     def getFullProject(configs, configname, isMain)
       config, configname = getFullProjectInternal(configs, configname, isMain)
@@ -57,7 +57,7 @@ module Bake
           end
         end
       end
       [config, configname]
     end
@@ -77,7 +77,7 @@ module Bake
         end
       end
     end
     def checkVerFormat(ver)
       return true if ver.empty?
       return false if ver.length > 3
@@ -94,18 +94,18 @@ module Bake
       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]
@@ -116,16 +116,16 @@ module Bake
         bailOutVer(reqVersion) if v < cur[i]
       end
     end
     def loadProjMeta(filename)
       Bake::Configs::Checks.symlinkCheck(filename)
       @project_files << filename
       f = @loader.load(filename)
       config = nil
       if f.root_elements.length != 1 or not Metamodel::Project === f.root_elements[0]
         Bake.formatter.printError("Config file must have exactly one 'Project' element as root element", filename)
         ExitHelper.exit(1)
@@ -134,25 +134,25 @@ module Bake
       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)
+          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)
+          Bake.formatter.printError("Attribute 'type' must only be used in adapt config.",c)
           ExitHelper.exit(1)
         end
       end
       configs
     end
     def validateDependencies(config)
       config.dependency.each do |dep|
         if dep.name.include?"$" or dep.config.include?"$"
@@ -170,23 +170,27 @@ module Bake
         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")
+          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)"
@@ -195,7 +199,7 @@ module Bake
             chosen = ""
           end
         end
         @loadedConfigs[dep_name] = loadProjMeta(pmeta_filenames[0])
       else
         folder = @loadedConfigs[dep_name][0].get_project_dir
@@ -203,54 +207,57 @@ module Bake
           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(@loadedConfigs[dep_name], dep.config, false)
       dep.name = dep_name
       # config not referenced yet
       if not @referencedConfigs.include?dep_name
-        @referencedConfigs[dep_name] = [config]
+        @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"
       if not File.exist?(mainMeta)
         Bake.formatter.printError("Error: #{mainMeta} not found")
         ExitHelper.exit(1)
       end
       @project_files = []
       configs = loadProjMeta(mainMeta)
       @loadedConfigs = {}
       @loadedConfigs[Bake.options.main_project_name] = configs
-      if not showConfigNames?
+      if not showConfigNames?
         config, Bake.options.build_config = getFullProject(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
     end
     def checkRoots()
       @potentialProjs = []
       Bake.options.roots.each do |r|
@@ -260,30 +267,30 @@ module Bake
         r = r+"/**{,/*/**}/Project.meta"
         @potentialProjs.concat(Dir.glob(r).sort)
       end
       @potentialProjs = @potentialProjs.uniq
     end
     def filterStep(step, globalFilterStr)
       # 1st prio: explicit single filter
-      if step.filter != ""
+      if step.filter != ""
         return true if  Bake.options.exclude_filter.include?step.filter
         return false if Bake.options.include_filter.include?step.filter
-      end
+      end
       # 2nd prio: explicit global filter
       if globalFilterStr != nil
         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 step.default == "off"
-      false
+      false
     end
     def filterSteps
       @referencedConfigs.each do |projName, configs|
         configs.each do |config|
@@ -301,13 +308,13 @@ module Bake
     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
+      mainConfigName = Bake.options.build_config != "" ? Bake.options.build_config : defaultConfigName
       configs = @loadedConfigs[Bake.options.main_project_name]
       foundValidConfig = false
       configs.each do |c|
@@ -319,11 +326,11 @@ module Bake
         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 load(adaptConfigs)
       @adaptConfigs = adaptConfigs
       @loader = Loader.new
@@ -349,8 +356,8 @@ module Bake
       else
         loadMainMeta # "--list" specified
         printConfigNames
-      end
+      end
     end
   end
 end