RubyGems - bake-toolkit - Versions diffs - 2.11.4 → 2.12.0 - Mend

bake-toolkit 2.11.4 → 2.12.0

Files changed (116) hide show

checksums.yaml +4 -4
data/documentation/_build/html/_sources/changelog.txt +4 -1
data/documentation/_build/html/_sources/index.txt +2 -3
data/documentation/_build/html/_static/syntax.html +2 -4
data/documentation/_build/html/changelog.html +11 -5
data/documentation/_build/html/commandline/commandline.html +4 -4
data/documentation/_build/html/concepts/build_hierarchy.html +4 -4
data/documentation/_build/html/concepts/concepts.html +4 -4
data/documentation/_build/html/concepts/the_main_project.html +4 -4
data/documentation/_build/html/concepts/the_project_meta_file.html +4 -4
data/documentation/_build/html/genindex.html +4 -4
data/documentation/_build/html/ide/eclipse/eclipse.html +4 -4
data/documentation/_build/html/ide/eclipse/how_to_convert_existing_cdt_workspace.html +4 -4
data/documentation/_build/html/ide/eclipse/how_to_create_a_new_project_in_eclipse.html +4 -4
data/documentation/_build/html/ide/eclipse/how_to_create_a_workspace_in_eclipse.html +4 -4
data/documentation/_build/html/ide/eclipse/how_to_install_eclipse_plugin.html +4 -4
data/documentation/_build/html/ide/eclipse/how_to_use_bake_in_eclipse.html +4 -4
data/documentation/_build/html/ide/ide_integrations.html +4 -4
data/documentation/_build/html/ide/vs/how_to_create_vs_projects.html +4 -4
data/documentation/_build/html/ide/vs/how_to_debug_in_vs.html +4 -4
data/documentation/_build/html/ide/vs/how_to_used_bake_in_vs.html +4 -4
data/documentation/_build/html/ide/vs/vs.html +4 -4
data/documentation/_build/html/ide/vs/vs_install.html +4 -4
data/documentation/_build/html/index.html +7 -7
data/documentation/_build/html/install/install_bake.html +4 -4
data/documentation/_build/html/internal.html +4 -4
data/documentation/_build/html/known_issues.html +4 -4
data/documentation/_build/html/license.html +4 -4
data/documentation/_build/html/objects.inv +0 -0
data/documentation/_build/html/performance/performance.html +4 -4
data/documentation/_build/html/quickstart/quickstart.html +4 -4
data/documentation/_build/html/search.html +4 -4
data/documentation/_build/html/searchindex.js +1 -1
data/documentation/_build/html/syntax/derive_configs.html +4 -4
data/documentation/_build/html/syntax/project_meta_syntax.html +6 -8
data/documentation/_build/html/syntax/syntax.html +4 -4
data/documentation/_build/html/syntax/variable_substitutions.html +4 -4
data/documentation/_build/html/tips_and_tricks/how_to_use_bake_with_cygwin.html +4 -4
data/documentation/_build/html/tips_and_tricks/static_code_analysis.html +4 -4
data/documentation/_build/html/tips_and_tricks/the_bakery.html +4 -4
data/documentation/_build/html/tips_and_tricks/the_clang.html +4 -4
data/documentation/_build/html/tips_and_tricks/tips_and_tricks.html +4 -4
data/documentation/_build/html/why_bake/why_bake.html +6 -6
data/lib/bake/util.rb +1 -1
data/lib/blocks/block.rb +11 -14
data/lib/common/version.rb +1 -1
data/lib/tocxx.rb +7 -7
metadata +2 -70
data/doc/cmd/install.html +0 -74
data/doc/cmd/mount.png +0 -0
data/doc/cmd/ruby.png +0 -0
data/doc/cmd/tty.png +0 -0
data/doc/cmd/usecmd.html +0 -80
data/doc/cmd/usecygwin.html +0 -49
data/doc/concepts/buildhierarchy.html +0 -42
data/doc/concepts/configfile.html +0 -102
data/doc/concepts/hier.png +0 -0
data/doc/concepts/mainproject.html +0 -87
data/doc/deployDoc.bat +0 -2
data/doc/dyk/clang.html +0 -50
data/doc/dyk/keys.png +0 -0
data/doc/dyk/lint.html +0 -78
data/doc/dyk/tipps.html +0 -45
data/doc/eclipse/build/buildFile.png +0 -0
data/doc/eclipse/build/buildMain.png +0 -0
data/doc/eclipse/build/console.png +0 -0
data/doc/eclipse/build/problem.png +0 -0
data/doc/eclipse/export.html +0 -39
data/doc/eclipse/export/Script.png +0 -0
data/doc/eclipse/export/Select.png +0 -0
data/doc/eclipse/import.html +0 -31
data/doc/eclipse/import/Import.png +0 -0
data/doc/eclipse/import/Select.png +0 -0
data/doc/eclipse/install.html +0 -26
data/doc/eclipse/install/AddRepository.png +0 -0
data/doc/eclipse/install/AvailableSoftware.png +0 -0
data/doc/eclipse/install/InstallNewSoftware.png +0 -0
data/doc/eclipse/install/Licenses.png +0 -0
data/doc/eclipse/install/Restart.png +0 -0
data/doc/eclipse/install/TrustMe.png +0 -0
data/doc/eclipse/misc/pref.png +0 -0
data/doc/eclipse/new.html +0 -17
data/doc/eclipse/new/New.png +0 -0
data/doc/eclipse/new/Result.png +0 -0
data/doc/eclipse/new/Select.png +0 -0
data/doc/eclipse/select/FirstSelect.png +0 -0
data/doc/eclipse/select/SecondSelect.png +0 -0
data/doc/eclipse/select/WrongSelect.png +0 -0
data/doc/eclipse/use.html +0 -59
data/doc/further/bakery/cmd.html +0 -33
data/doc/further/bakery/syntax.html +0 -203
data/doc/further/change.html +0 -525
data/doc/further/collections.html +0 -21
data/doc/further/internal.html +0 -42
data/doc/further/issues.html +0 -20
data/doc/further/perf.html +0 -54
data/doc/index.html +0 -80
data/doc/src/ok.png +0 -0
data/doc/syntax/derive.html +0 -58
data/doc/syntax/subst.html +0 -121
data/doc/syntax/syntax.html +0 -718
data/doc/vs/create.html +0 -16
data/doc/vs/create/cvsp.png +0 -0
data/doc/vs/debug.html +0 -50
data/doc/vs/echse/echse.png +0 -0
data/doc/vs/install.html +0 -28
data/doc/vs/install/install1.png +0 -0
data/doc/vs/install/install2010.png +0 -0
data/doc/vs/install/installed.png +0 -0
data/doc/vs/install/site.png +0 -0
data/doc/vs/install/update.png +0 -0
data/doc/vs/use.html +0 -24
data/doc/vs/use/error.png +0 -0
data/doc/vs/use/options.png +0 -0
data/doc/vs/use/select.png +0 -0
data/doc/vs/use/show.png +0 -0

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

@@ -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.11.4 documentation</title>
+    <title>Why you should use bake &mdash; bake 2.12.0 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.11.4',
+        VERSION:     '2.12.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -28,9 +28,9 @@
     <script type="text/javascript" src="../_static/js/jquery-fix.js"></script>
     <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="top" title="bake 2.11.4 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.12.0 documentation" href="../index.html" />
     <link rel="next" title="Install bake" href="../install/install_bake.html" />
-    <link rel="prev" title="Welcome to bake’s documentation!" href="../index.html" />
+    <link rel="prev" title="bake 2.11.4" 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'>
@@ -50,7 +50,7 @@
         </button>
         <a class="navbar-brand" href="../index.html">
           bake</a>
-        <span class="navbar-text navbar-version pull-left"><b>2.11.4</b></span>
+        <span class="navbar-text navbar-version pull-left"><b></b></span>
       </div>
         <div class="collapse navbar-collapse nav-collapse">
@@ -107,7 +107,7 @@
   <li>
-    <a href="../index.html" title="Previous Chapter: Welcome to bake’s documentation!"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; Welcome to ba...</span>
+    <a href="../index.html" title="Previous Chapter: bake 2.11.4"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; bake 2.11.4</span>
     </a>
   </li>
   <li>

data/lib/bake/util.rb CHANGED Viewed

@@ -133,7 +133,7 @@ def calc_def_roots(dir)
         if File.is_absolute?(line)
           def_roots << line
         else
-          def_roots << File.dirname(rootsFile) + "/" + line
+          def_roots << File.expand_path(File.dirname(rootsFile) + "/" + line)
         end
       end
     end

data/lib/blocks/block.rb CHANGED Viewed

@@ -65,7 +65,7 @@ module Bake
         @configName = config.name
         @projectDir = config.get_project_dir
         @@block_counter = 0
-        @result = false
+        @result = true
         @lib_elements = Bake::LibElements.calcLibElements(self)
       end
@@ -132,13 +132,16 @@ module Bake
       end
       def executeStep(step, method)
-        @result = false
         begin
-          @result = step.send(method)
+          @result = step.send(method) && @result
         rescue Bake::SystemCommandFailed => scf
+          @result = false
+          ProcessHelper.killProcess(true)
         rescue SystemExit => exSys
+          @result = false
           ProcessHelper.killProcess(true)
         rescue Exception => ex1
+          @result = false
           if not Bake::IDEInterface.instance.get_abort
             Bake.formatter.printError("Error: #{ex1.message}")
             puts ex1.backtrace if Bake.options.debug
@@ -148,7 +151,7 @@ module Bake
         if Bake::IDEInterface.instance.get_abort
           raise AbortException.new
         end
         return @result
       end
@@ -162,12 +165,12 @@ module Bake
       end
       def callSteps(method)
-        @result = true
         preSteps.each do |step|
           @result = executeStep(step, method) if @result
           return false if not @result and Bake.options.stopOnFirstError
         end
         mainSteps.each do |step|
           @result = executeStep(step, method) if @result
           return false if not @result and Bake.options.stopOnFirstError
@@ -237,16 +240,13 @@ module Bake
         @visited = true
         depResult = callDeps(:startup)
-        return false if not depResult and Bake.options.stopOnFirstError
         if Bake.options.verbose >= 1 and not startupSteps.empty?
           Bake.formatter.printAdditionalInfo "**** Starting up #{@projectName} (#{@configName}) ****"
         end
-        @result = true
         startupSteps.each do |step|
-          @result = executeStep(step, :startupStep) if @result
-          return false if not @result and Bake.options.stopOnFirstError
+          @result = executeStep(step, :startupStep) && @result
         end
         return (depResult && @result)
@@ -257,16 +257,13 @@ module Bake
         @visited = true
         depResult = callDeps(:exits)
-        return false if not depResult and Bake.options.stopOnFirstError
         if Bake.options.verbose >= 1 and not exitSteps.empty?
           Bake.formatter.printAdditionalInfo "**** Exiting #{@projectName} (#{@configName}) ****"
         end
-        @result = true
         exitSteps.each do |step|
-          @result = executeStep(step, :exitStep) if @result
-          return false if not @result and Bake.options.stopOnFirstError
+          @result = executeStep(step, :exitStep) && @result
         end
         return (depResult && @result)

data/lib/common/version.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.11.4"
+      "2.12.0"
     end
   end

data/lib/tocxx.rb CHANGED Viewed

@@ -184,13 +184,15 @@ module Bake
       end
     end
-    def callBlocks(startBlocks, method)
-      Blocks::ALL_BLOCKS.each {|name,block| block.visited = false; block.result = false;  block.inDeps = false }
+    def callBlocks(startBlocks, method, ignoreStopOnFirstError = false)
+      Blocks::ALL_BLOCKS.each {|name,block| block.visited = false; block.result = true;  block.inDeps = false }
       Blocks::Block.reset_block_counter
       result = true
       startBlocks.each do |block|
         result = callBlock(block, method) && result
-        return false if not result and Bake.options.stopOnFirstError
+        if not ignoreStopOnFirstError
+          return false if not result and Bake.options.stopOnFirstError
+        end
       end
       return result
     end
@@ -318,7 +320,7 @@ module Bake
         ideAbort = false
         begin
-          result = callBlocks(startBlocks, :startup)
+          result = callBlocks(startBlocks, :startup, true)
           if Bake.options.clean or Bake.options.rebuild
             if not Bake.options.stopOnFirstError or result
               result = callBlocks(startBlocks, :clean) && result
@@ -332,9 +334,7 @@ module Bake
         rescue AbortException
           ideAbort = true
         end
-        if not Bake.options.stopOnFirstError or result
-          result = callBlocks(startBlocks, :exits) && result
-        end
+        result = callBlocks(startBlocks, :exits, true) && result
         if ideAbort
           Bake.formatter.printError("\n#{taskType} aborted.")

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.12.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -153,74 +153,6 @@ files:
 - lib/tocxx.rb
 - lib/vs/options.rb
 - Rakefile.rb
-- doc/cmd/install.html
-- doc/cmd/mount.png
-- doc/cmd/ruby.png
-- doc/cmd/tty.png
-- doc/cmd/usecmd.html
-- doc/cmd/usecygwin.html
-- doc/concepts/buildhierarchy.html
-- doc/concepts/configfile.html
-- doc/concepts/hier.png
-- doc/concepts/mainproject.html
-- doc/deployDoc.bat
-- doc/dyk/clang.html
-- doc/dyk/keys.png
-- doc/dyk/lint.html
-- doc/dyk/tipps.html
-- doc/eclipse/build/buildFile.png
-- doc/eclipse/build/buildMain.png
-- doc/eclipse/build/console.png
-- doc/eclipse/build/problem.png
-- doc/eclipse/export.html
-- doc/eclipse/export/Script.png
-- doc/eclipse/export/Select.png
-- doc/eclipse/import.html
-- doc/eclipse/import/Import.png
-- doc/eclipse/import/Select.png
-- doc/eclipse/install.html
-- doc/eclipse/install/AddRepository.png
-- doc/eclipse/install/AvailableSoftware.png
-- doc/eclipse/install/InstallNewSoftware.png
-- doc/eclipse/install/Licenses.png
-- doc/eclipse/install/Restart.png
-- doc/eclipse/install/TrustMe.png
-- doc/eclipse/misc/pref.png
-- doc/eclipse/new.html
-- doc/eclipse/new/New.png
-- doc/eclipse/new/Result.png
-- doc/eclipse/new/Select.png
-- doc/eclipse/select/FirstSelect.png
-- doc/eclipse/select/SecondSelect.png
-- doc/eclipse/select/WrongSelect.png
-- doc/eclipse/use.html
-- doc/further/bakery/cmd.html
-- doc/further/bakery/syntax.html
-- doc/further/change.html
-- doc/further/collections.html
-- doc/further/internal.html
-- doc/further/issues.html
-- doc/further/perf.html
-- doc/index.html
-- doc/src/ok.png
-- doc/syntax/derive.html
-- doc/syntax/subst.html
-- doc/syntax/syntax.html
-- doc/vs/create.html
-- doc/vs/create/cvsp.png
-- doc/vs/debug.html
-- doc/vs/echse/echse.png
-- doc/vs/install.html
-- doc/vs/install/install1.png
-- doc/vs/install/install2010.png
-- doc/vs/install/installed.png
-- doc/vs/install/site.png
-- doc/vs/install/update.png
-- doc/vs/use.html
-- doc/vs/use/error.png
-- doc/vs/use/options.png
-- doc/vs/use/select.png
-- doc/vs/use/show.png
 - documentation/_build/html/_images/AddRepository.png
 - documentation/_build/html/_images/AvailableSoftware.png
 - documentation/_build/html/_images/FirstSelect.png

data/doc/cmd/install.html DELETED Viewed

@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Documentation of the bake-tookit</title>
-<style type="text/css">
-#rundrum {
-  border-width:1px;
-  border-style:dashed;
-  border-color:blue;
-  padding:0.2cm;
-  text-align:justify; }
-}
-</style>
-</head>
-<body>
-<h1>How to install bake command line tool</h1>
-bake is a ruby gem. It runs with ruby 1.9 and above.
-<p>
-bake and its depedencies can be found on rubygems, which is configured as ruby source per default. Type "gem sources" if you wish to check that.<br>
-Installing bake is very easy:
-<pre id="rundrum"><code>gem install bake-toolkit</code></pre>
-<p>
-This is how the installation could look like:
-<pre id="rundrum"><code>>>> gem install bake-toolkit
-Fetching: highline-1.6.15.gem (100%)
-Fetching: colored-1.2.gem (100%)
-Fetching: progressbar-0.11.0.gem (100%)
-Fetching: rgen-0.6.0.gem (100%)
-Fetching: rtext-0.2.0.gem (100%)
-Fetching: bake-toolkit-1.0.2.gem (100%)
-Successfully installed highline-1.6.15
-Successfully installed colored-1.2
-Successfully installed progressbar-0.11.0
-Successfully installed rgen-0.6.0
-Successfully installed rtext-0.2.0
-Successfully installed bake-toolkit-1.0.2
-7 gems installed
-Installing ri documentation for highline-1.6.15...
-Installing ri documentation for colored-1.2...
-Installing ri documentation for progressbar-0.11.0...
-Installing ri documentation for rgen-0.6.0...
-Installing ri documentation for rtext-0.2.0...
-Installing ri documentation for bake-toolkit-1.0.2...
-Installing RDoc documentation for highline-1.6.15...
-Installing RDoc documentation for colored-1.2...
-Installing RDoc documentation for progressbar-0.11.0...
-Installing RDoc documentation for rgen-0.6.0...
-Installing RDoc documentation for rtext-0.2.0...
-Installing RDoc documentation for bake-toolkit-1.0.2...</code></pre>
-<h2>Problems</h2>
-<ul>
-    <li>If the installation does not start, it might be a problem of a password protected internet proxy. Unlock the proxy by opening an external webpage e.g. google.
-    <li>Note, that the error parsers in bake assume English language. It depends on the system and compiler how to switch the language. One possibility is to set the environment variable LC_ALL:
-    <pre id="rundrum"><code>LC_ALL=en_US</code></pre>
-    <li>Don't worry if you get an error like this:
-<pre id="rundrum"><code>ERROR:  While generating documentation for ...
-... MESSAGE:   Error while evaluating ...
-   undefined method `gsub' for nil:NilClass ...</code></pre>
-It's a ruby bug. However, the gems were installed correctly. You can avoid building the documentation by installing bake like this:
-<pre id="rundrum"><code> gem install bake-toolkit --no-rdoc --no-ri</code></pre>
-</ul>
-</body>
-</html>

data/doc/cmd/mount.png DELETED Viewed

Binary file

data/doc/cmd/ruby.png DELETED Viewed

Binary file

data/doc/cmd/tty.png DELETED Viewed

Binary file

data/doc/cmd/usecmd.html DELETED Viewed

@@ -1,80 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Documentation of the bake-tookit</title>
-<style type="text/css">
-#rundrum {
-  border-width:1px;
-  border-style:dashed;
-  border-color:blue;
-  padding:0.2cm;
-  text-align:justify; }
-}
-</style>
-</head>
-<body>
-<h1>How to use bake on command line</h1>
-Call <b>bake -h</b> to display the command line options.
-<p>
-The most important options are:
-<ul>
-<li><b>-b</b> the build configuration name
-<li><b>-m</b> the main project directory (default is current directory)
-<li><b>-p</b> the project to build (if not specified, the main project will be built with all dependencies) - note, that ALL configs of the project will be built,
-which is usually just one config, but if you have more than one config of the project in the workspace, use a comma separator.
-</ul>
-<h2>Examples</h2>
-If you want to build your application, switch to the directory of the main project and call (assuming "Debug" is a valid build setup name):
-<pre id="rundrum"><code>bake -b Debug</code></pre>
-It is possible to omit "-b":
-<pre id="rundrum"><code>bake Debug</code></pre>
-It Debug is the default configuration, it's just:
-<pre id="rundrum"><code>bake</code></pre>
-If you are not in the directory of the main project you want to build:
-<pre id="rundrum"><code>bake Debug -m w:/root/mainProj</code></pre>
-Building just mainProj project:
-<pre id="rundrum"><code>bake Debug -m w:/root1/myProj -p myProj</code></pre>
-Assuming mainProj has several configs really included in the build (which is uncommon), you can choose one of the configs like this:
-<pre id="rundrum"><code>bake Debug -m w:/root1/myProj -p myProj,abc</code></pre>
-Code has been checked out into two roots, the console supports ansi colors, you want to stop on first error and build only the project bspAbc:
-<pre id="rundrum"><code>bake Debug -m w:/root1/myProj -w w:/root1 -w w:/root2 -r -a black -p bspAbc</code></pre>
-To clean the project(s), just add "-c":
-<pre id="rundrum"><code>bake Debug -m w:/root1/myProj -w w:/root1 -w w:/root2 -r -a black -p bspAbc -c</code></pre>
-To build single file(s), use "-f". All files matching this pattern will be compiled (no wildcards allowed):
-<pre id="rundrum"><code>bake Debug -p bspAbc -f main.cpp
-bake Debug -f .asm</code></pre>
-<h2>roots.bake</h2>
-Workspace roots can be defined in a file called "roots.bake", which will be searched from main project directory to root folder. Example:
-<pre id="rundrum"><code>../..
-C:/another/root # comments written like this
-something/else</code></pre>
-If -w and roots.bake are not specified, the default workspace root is the parent directory of the main project.
-</body>
-</html>