bake-toolkit 2.27.0 → 2.28.0

data/documentation/_build/html/tips_and_tricks/the_bakery.html

@@ -30,9 +30,9 @@
     <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 documentation" href="../index.html" />
-    <link rel="up" title="Tips and Tricks" href="tips_and_tricks.html" />
-    <link rel="next" title="Static Code Analysis" href="static_code_analysis.html" />
-    <link rel="prev" title="Tips and Tricks" href="tips_and_tricks.html" />
+    <link rel="up" title="Additional features" href="tips_and_tricks.html" />
+    <link rel="next" title="How to use bake with cygwin" href="how_to_use_bake_with_cygwin.html" />
+    <link rel="prev" title="Additional features" href="tips_and_tricks.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'>
@@ -75,7 +75,7 @@
 <li class="toctree-l1"><a class="reference internal" href="../syntax/syntax.html">Syntax</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../commandline/commandline.html">Commandline</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../ide/ide_integrations.html">IDE Support</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="tips_and_tricks.html">Tips and Tricks</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="tips_and_tricks.html">Additional features</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../performance/performance.html">Performance</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../known_issues.html">Known Issues</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
@@ -111,11 +111,11 @@
               
                 
   <li>
-    <a href="tips_and_tricks.html" title="Previous Chapter: Tips and Tricks"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; Tips and Tricks</span>
+    <a href="tips_and_tricks.html" title="Previous Chapter: Additional features"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; Additional fe...</span>
     </a>
   </li>
   <li>
-    <a href="static_code_analysis.html" title="Next Chapter: Static Code Analysis"><span class="glyphicon glyphicon-chevron-right visible-sm"></span><span class="hidden-sm hidden-tablet">Static Code A... &raquo;</span>
+    <a href="how_to_use_bake_with_cygwin.html" title="Next Chapter: How to use bake with cygwin"><span class="glyphicon glyphicon-chevron-right visible-sm"></span><span class="hidden-sm hidden-tablet">How to use ba... &raquo;</span>
     </a>
   </li>
               

data/documentation/_build/html/tips_and_tricks/the_clang.html

@@ -30,7 +30,7 @@
     <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 documentation" href="../index.html" />
-    <link rel="up" title="Tips and Tricks" href="tips_and_tricks.html" />
+    <link rel="up" title="Additional features" href="tips_and_tricks.html" />
     <link rel="next" title="Generating dot graphs" href="dot.html" />
     <link rel="prev" title="How to use bake with cygwin" href="how_to_use_bake_with_cygwin.html" />
 <meta charset='utf-8'>
@@ -75,7 +75,7 @@
 <li class="toctree-l1"><a class="reference internal" href="../syntax/syntax.html">Syntax</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../commandline/commandline.html">Commandline</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../ide/ide_integrations.html">IDE Support</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="tips_and_tricks.html">Tips and Tricks</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="tips_and_tricks.html">Additional features</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../performance/performance.html">Performance</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../known_issues.html">Known Issues</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>

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

@@ -146,7 +146,6 @@
 <div class="toctree-wrapper compound">
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="the_bakery.html">The Bakery</a></li>
-<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="dot.html">Generating dot graphs</a></li>

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

@@ -31,7 +31,7 @@
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
     <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.21.0" href="../index.html" />
+    <link rel="prev" title="bake 2.28.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'>
@@ -74,7 +74,7 @@
 <li class="toctree-l1"><a class="reference internal" href="../syntax/syntax.html">Syntax</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../commandline/commandline.html">Commandline</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../ide/ide_integrations.html">IDE Support</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../tips_and_tricks/tips_and_tricks.html">Tips and Tricks</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../tips_and_tricks/tips_and_tricks.html">Additional features</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../performance/performance.html">Performance</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../known_issues.html">Known Issues</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
@@ -108,7 +108,7 @@
               
                 
   <li>
-    <a href="../index.html" title="Previous Chapter: bake 2.21.0"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; bake 2.21.0</span>
+    <a href="../index.html" title="Previous Chapter: bake 2.28.0"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; bake 2.28.0</span>
     </a>
   </li>
   <li>

data/lib/bake/model/metamodel.rb

@@ -75,10 +75,6 @@ module Bake
         contains_one 'internalDefines', InternalDefines, 'parent'
       end
 
-      class LintPolicy < ModelElement
-        has_attr 'name', String, :defaultValueLiteral => ""
-      end
-
       class Docu < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
       end
@@ -90,7 +86,6 @@ module Bake
         contains_many 'compiler', Compiler, 'parent'
         contains_one 'archiver', Archiver, 'parent'
         contains_one 'linker', Linker, 'parent'
-        contains_many 'lintPolicy', LintPolicy, 'parent'
         contains_one 'internalIncludes', InternalIncludes, 'parent'
         contains_one 'docu', Docu, 'parent'
       end
@@ -100,7 +95,6 @@ module Bake
         contains_many 'compiler', Compiler, 'parent'
         contains_one 'archiver', Archiver, 'parent'
         contains_one 'linker', Linker, 'parent'
-        contains_many 'lintPolicy', LintPolicy, 'parent'
         contains_one 'docu', Docu, 'parent'
       end
 
@@ -179,6 +173,7 @@ module Bake
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'default', String, :defaultValueLiteral => "on"
         has_attr 'filter', String, :defaultValueLiteral => ""
+        has_attr 'echo', String, :defaultValueLiteral => "on"
         has_many_attr 'validExitCodes', Integer
       end
 
@@ -232,6 +227,7 @@ module Bake
         has_attr 'extends', String, :defaultValueLiteral => ""
         has_attr 'type', String, :defaultValueLiteral => ""
         has_attr 'project', String, :defaultValueLiteral => ""
+        has_attr 'private', Boolean, :defaultValueLiteral => "false"
         contains_one 'description', Description, 'parent'
         contains_one 'startupSteps', StartupSteps, 'parent'
         contains_one 'preSteps', PreSteps, 'parent'

data/lib/bake/model/metamodel_ext.rb

@@ -27,6 +27,15 @@ module Bake
         def includeDir
           baseElement.find_all { |l| IncludeDir === l }
         end
+        def setEnvVar(name, value)
+          @envVar ||= {}
+          @envVar[name] = value
+        end
+        def writeEnvVars()
+          @envVar.each do |name, value|
+            ENV[name] = value
+          end if defined?(@envVar)
+        end
       end
 
   end

data/lib/bake/options/options.rb

@@ -5,7 +5,6 @@ require 'bake/options/showLicense'
 require 'bake/options/showDoc'
 require 'bake/options/usage'
 require 'bake/options/create'
-require 'bake/bundle'
 
 module Bake
 
@@ -18,11 +17,11 @@ module Bake
 
   class Options < Parser
     attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :envToolchain, :showConfigs
-    attr_reader :main_dir, :project, :filename, :main_project_name, :bundleDir, :buildDirDelimiter, :dot, :cc2j_filename # String
+    attr_reader :main_dir, :project, :filename, :main_project_name, :buildDirDelimiter, :dot, :cc2j_filename # String
     attr_reader :roots, :include_filter, :exclude_filter, :adapt # String List
-    attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :projectPaths, :qac # Boolean
-    attr_reader :linkOnly, :compileOnly, :no_autodir, :clobber, :lint, :docu, :debug, :prepro, :oldLinkOrder, :prebuild, :printTime, :json, :wparse # Boolean
-    attr_reader :threads, :socket, :lint_min, :lint_max # Fixnum
+    attr_reader :file_list, :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :projectPaths, :qac # Boolean
+    attr_reader :linkOnly, :compileOnly, :no_autodir, :clobber, :docu, :debug, :prepro, :oldLinkOrder, :prebuild, :printTime, :json, :wparse # Boolean
+    attr_reader :threads, :socket # Fixnum
     attr_reader :vars # map
     attr_reader :verbose
     attr_reader :consoleOutput_fullnames, :consoleOutput_visualStudio
@@ -40,6 +39,7 @@ module Bake
       @buildDirDelimiter = "/"
       @oldLinkOrder = false
       @conversion_info = false
+      @file_list = false
       @envToolchain = false
       @analyze = false
       @eclipseOrder = false
@@ -58,7 +58,6 @@ module Bake
       @json = false
       @clean = false
       @clobber = false
-      @lint = false
       @docu = false
       @debug = false
       @rebuild = false
@@ -69,8 +68,6 @@ module Bake
       @compileOnly = false
       @no_autodir = false
       @threads = 8
-      @lint_min = 0
-      @lint_max = -1
       @roots = []
       @socket = 0
       @include_filter = []
@@ -78,7 +75,6 @@ module Bake
       @def_roots = []
       @main_project_name = ""
       @adapt = []
-      @bundleDir = nil
 
       add_option(["-b",                   ""                     ], lambda { |x| set_build_config(x)                     })
       add_option(["-m"                                           ], lambda { |x| set_main_dir(x)                         })
@@ -93,12 +89,10 @@ module Bake
       add_option(["--link-only",          "--link_only"          ], lambda {     @linkOnly = true;                       })
       add_option(["--compile-only",       "--compile_only"       ], lambda {     @compileOnly = true;                    })
       add_option(["--no-autodir",         "--no_autodir"         ], lambda {     @no_autodir = true                      })
-      add_option(["--lint"                                       ], lambda {     @lint = true                            })
-      add_option(["--lint-min",           "--lint_min"           ], lambda { |x| @lint_min = String === x ? x.to_i : x   })
-      add_option(["--lint-max",           "--lint_max"           ], lambda { |x| @lint_max = String === x ? x.to_i : x   })
 
       add_option(["--create"                                     ], lambda { |x| Bake::Create.proj(x)                    })
       add_option(["--conversion-info",    "--conversion_info"    ], lambda {     @conversion_info = true                 })
+      add_option(["--file-list",          "--file_list"          ], lambda {     @file_list = true                       })
       add_option(["--filter-paths"                               ], lambda {     @projectPaths = true                    })
       add_option(["--qac"                                        ], lambda {     @qac = true                             })
 
@@ -124,11 +118,6 @@ module Bake
       add_option(["--do",                 "--include_filter"     ], lambda { |x| @include_filter << x                    })
       add_option(["--omit",               "--exclude_filter"     ], lambda { |x| @exclude_filter << x                    })
       add_option(["--abs-paths",          "--show_abs_paths"     ], lambda {     @consoleOutput_fullnames = true         })
-      add_option(["--bundle"                                     ], lambda { |x| Bake::Usage.bundle                      })
-      add_option(["--bundle"                                     ], lambda {     Bake::Usage.bundle                      })
-#      add_option(["--bundle"                                     ], lambda { |x| set_bundle_dir(x)                       })
-# OLD flag renamed in case someone uses this feature
-      add_option(["--bundleDeprecated"                           ], lambda { |x| set_bundle_dir(x)                       })
       add_option(["--prebuild"                                   ], lambda {     @prebuild = true                        })
       add_option(["--Wparse"                                     ], lambda {     @wparse = true                          })
 
@@ -157,7 +146,6 @@ module Bake
     end
 
     def parse_options()
-      Bake::Bundle.instance.cleanup()
       parse_internal(false)
       set_main_dir(Dir.pwd) if @main_dir.nil?
       @roots += @def_roots
@@ -171,7 +159,11 @@ module Bake
         end
       end
 
-      if @conversion_info
+      if @conversion_info || @file_list
+        if @conversion_info && @file_list
+          Bake.formatter.printError("Error: --conversion-info and --file-list not allowed at the same time")
+          ExitHelper.exit(1)
+        end
         if @rebuild
           Bake.formatter.printError("Error: --conversion-info and --rebuild not allowed at the same time")
           ExitHelper.exit(1)
@@ -192,18 +184,10 @@ module Bake
           Bake.formatter.printError("Error: --conversion-info and --compileOnly not allowed at the same time")
           ExitHelper.exit(1)
         end
-        if @lint
-          Bake.formatter.printError("Error: --conversion-info and --lint not allowed at the same time")
-          ExitHelper.exit(1)
-        end
         if @docu
           Bake.formatter.printError("Error: --conversion-info and --docu not allowed at the same time")
           ExitHelper.exit(1)
         end
-        if not @project
-          Bake.formatter.printError("Error: --conversion-info must be used with -p")
-          ExitHelper.exit(1)
-        end
       end
 
       if @linkOnly
@@ -247,11 +231,6 @@ module Bake
         end
       end
 
-      if @lint and @docu
-        Bake.formatter.printError("Error: --lint and --docu not allowed at the same time")
-        ExitHelper.exit(1)
-      end
-
       @filename = "." if @compileOnly
 
     end
@@ -282,12 +261,6 @@ module Bake
       @def_roots = calc_def_roots(@main_dir)
     end
 
-    def set_bundle_dir(dir)
-      d = File.expand_path(dir.gsub(/[\\]/,'/'))
-      Bake::Bundle.instance.setOutputDir(d)
-    end
-
-
     def set_root(dir)
       check_valid_dir(dir)
       r = File.expand_path(dir.gsub(/[\\]/,'/'))

data/lib/bake/options/usage.rb

@@ -31,10 +31,6 @@ module Bake
       puts "                          Forces executables to be relinked."
       puts " --compile-only           Only the compile steps are executed, equivalent to -f '.'"
       puts " --generate-doc           Builds docu instead of compiling sources."
-      puts " --lint                   Performs Lint checks instead of compiling sources."
-      puts " --lint-min <num>         If number of files in a project is too large for lint to handle, it is possible"
-      puts "                          to specify only a part of the file list to lint (default -1)."
-      puts " --lint-max <num>         See above (default -1)."
       puts " --ignore-cache           Rereads the original meta files - usefull if workspace structure has been changed."
       puts " -j <num>                 Set NUMBER of parallel compiled files (default is 8)."
       puts " --socket <num>           Set SOCKET for sending errors, receiving commands, etc. - used by e.g. Eclipse."
@@ -53,7 +49,7 @@ module Bake
       puts " --incs-and-defs=json     Prints includes and defines of all projects in json format"
       puts " --incs-and-defs=bake     Used by IDEs plugins"
       puts " --conversion-info        Prints infos for an external tool which converts bake configs for other build systems"
-#      puts " --bundle <dir>           Bundles the output (experimental, description will follow)"
+      puts " --file-list              Prints all files which will be built"
       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 " --create exe|lib|custom  Creates a project with exe, lib or custom template"
@@ -68,11 +64,6 @@ module Bake
       ExitHelper.exit(0)
     end
 
-    def self.bundle
-      puts "\nOption --bundle not supported anymore, please contact the author via github if still needed."
-      ExitHelper.exit(1)
-    end
-
   end
 
 end

data/lib/bake/subst.rb

@@ -85,7 +85,10 @@ module Bake
             Bake.formatter.printWarning("Name of variable must not be empty - variable will be ignored", s)
           else
             @@userVarMap[s.name] = substString(s.value, s)
-            ENV[s.name] = @@userVarMap[s.name] if s.env
+            if s.env
+              ENV[s.name] = @@userVarMap[s.name]
+              config.setEnvVar(s.name, @@userVarMap[s.name])
+            end
           end
         else
           cmd_result = false
@@ -95,7 +98,10 @@ module Bake
               cmd = [substString(s.cmd, s)]
               cmd_result, consoleOutput = ProcessHelper.run(cmd)
               @@userVarMap[s.name] = consoleOutput.chomp
-              ENV[s.name] = @@userVarMap[s.name] if s.env
+              if s.env
+                ENV[s.name] = @@userVarMap[s.name]
+                config.setEnvVar(s.name, @@userVarMap[s.name])
+              end
             end
           rescue Exception=>e
             consoleOutput = e.message
@@ -103,7 +109,10 @@ module Bake
           if (cmd_result == false)
             Bake.formatter.printWarning("Command not successful, variable #{s.name} will be set to \"\" (#{consoleOutput.chomp}).", s)
             @@userVarMap[s.name] = ""
-            ENV[s.name] = "" if s.env
+            if s.env
+              ENV[s.name] = ""
+              config.setEnvVar(s.name, "")
+            end
           end
         end
 

data/lib/bake/toolchain/provider.rb

@@ -110,7 +110,6 @@ module Bake
           :CLEAN => "clean"
         },
 
-        :LINT_POLICY => [],
         :DEP_FILE_SINGLE_LINE => false,
         :DOCU => ""
       }
@@ -137,7 +136,7 @@ module Bake
       end
 
       def self.list
-        return @@settings.delete_if {|x| x.include?"Lint" }
+        return @@settings
       end
 
     end
@@ -147,7 +146,6 @@ end
 
 require 'bake/toolchain/diab'
 require 'bake/toolchain/gcc'
-require 'bake/toolchain/lint'
 require 'bake/toolchain/clang'
 require 'bake/toolchain/clang_analyze'
 require 'bake/toolchain/ti'

data/lib/bake/util.rb

@@ -50,16 +50,9 @@ def integrateToolchain(tcs, toolchain)
   toolchain.compiler.each do |c|
     integrateCompiler(tcs, c, c.ctype)
   end
-  integrateLintPolicy(tcs, toolchain.lintPolicy)
   integrateDocu(tcs, toolchain.docu) if toolchain.docu
 end
 
-def integrateLintPolicy(tcs, policies)
-  policies.each do |d|
-    tcs[:LINT_POLICY] << d.name
-  end
-end
-
 def integrateDocu(tcs, docu)
   tcs[:DOCU] = docu.name if docu.name != ""
 end

data/lib/blocks/block.rb

@@ -205,6 +205,8 @@ module Bake
 
       def callSteps(method)
 
+        @config.writeEnvVars()
+
         preSteps.each do |step|
           @result = executeStep(step, method) if @result
           return false if not @result and Bake.options.stopOnFirstError

data/lib/blocks/blockBase.rb

@@ -1,5 +1,3 @@
-require 'bake/bundle'
-
 module Bake
   module Blocks
 
@@ -166,11 +164,7 @@ module Bake
                 console_output = console_output_VS
               end
 
-              if Bake.options.lint
-                # ignore error output
-              else
-                ret = error_descs.any? { |e| e.severity == ErrorParser::SEVERITY_ERROR }
-              end
+              ret = error_descs.any? { |e| e.severity == ErrorParser::SEVERITY_ERROR }
 
               console_output.gsub!(/[\r]/, "")
               Bake.formatter.format(console_output, error_descs, error_parser) unless console_output.empty?
@@ -191,7 +185,7 @@ module Bake
 
       def process_result(cmd, console_output, error_parser, alternate, reason, success)
         hasError = (success == false)
-        printCmd(cmd, alternate, reason, (hasError and not Bake.options.lint))
+        printCmd(cmd, alternate, reason, hasError)
         errorPrinted, incList = process_console_output(console_output, error_parser)
         if hasError and not errorPrinted
           Bake.formatter.printError("System command failed", @projectDir)

data/lib/blocks/commandLine.rb

@@ -14,17 +14,17 @@ module Bake
 
       def execute
         return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes)
+        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
       end
 
       def startupStep
         return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes)
+        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
       end
 
       def exitStep
         return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes)
+        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
       end
 
       def clean