bake-toolkit 2.13.0 → 2.13.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.
- checksums.yaml +4 -4
- data/documentation/_build/html/_sources/changelog.txt +2 -0
- data/documentation/_build/html/_sources/index.txt +1 -1
- data/documentation/_build/html/changelog.html +8 -3
- data/documentation/_build/html/commandline/commandline.html +3 -3
- data/documentation/_build/html/concepts/build_hierarchy.html +3 -3
- data/documentation/_build/html/concepts/concepts.html +3 -3
- data/documentation/_build/html/concepts/the_main_project.html +3 -3
- data/documentation/_build/html/concepts/the_project_meta_file.html +3 -3
- data/documentation/_build/html/genindex.html +3 -3
- data/documentation/_build/html/ide/eclipse/eclipse.html +3 -3
- data/documentation/_build/html/ide/eclipse/how_to_convert_existing_cdt_workspace.html +3 -3
- data/documentation/_build/html/ide/eclipse/how_to_create_a_new_project_in_eclipse.html +3 -3
- data/documentation/_build/html/ide/eclipse/how_to_create_a_workspace_in_eclipse.html +3 -3
- data/documentation/_build/html/ide/eclipse/how_to_install_eclipse_plugin.html +3 -3
- data/documentation/_build/html/ide/eclipse/how_to_use_bake_in_eclipse.html +3 -3
- data/documentation/_build/html/ide/ide_integrations.html +3 -3
- data/documentation/_build/html/ide/vs/how_to_create_vs_projects.html +3 -3
- data/documentation/_build/html/ide/vs/how_to_debug_in_vs.html +3 -3
- data/documentation/_build/html/ide/vs/how_to_used_bake_in_vs.html +3 -3
- data/documentation/_build/html/ide/vs/vs.html +3 -3
- data/documentation/_build/html/ide/vs/vs_install.html +3 -3
- data/documentation/_build/html/index.html +6 -6
- data/documentation/_build/html/install/install_bake.html +3 -3
- data/documentation/_build/html/internal.html +3 -3
- data/documentation/_build/html/known_issues.html +3 -3
- data/documentation/_build/html/license.html +3 -3
- data/documentation/_build/html/performance/performance.html +3 -3
- data/documentation/_build/html/quickstart/quickstart.html +3 -3
- data/documentation/_build/html/search.html +3 -3
- data/documentation/_build/html/searchindex.js +1 -1
- data/documentation/_build/html/syntax/derive_configs.html +3 -3
- data/documentation/_build/html/syntax/project_meta_syntax.html +3 -3
- data/documentation/_build/html/syntax/syntax.html +3 -3
- data/documentation/_build/html/syntax/variable_substitutions.html +3 -3
- data/documentation/_build/html/tips_and_tricks/how_to_use_bake_with_cygwin.html +3 -3
- data/documentation/_build/html/tips_and_tricks/static_code_analysis.html +3 -3
- data/documentation/_build/html/tips_and_tricks/the_bakery.html +3 -3
- data/documentation/_build/html/tips_and_tricks/the_clang.html +3 -3
- data/documentation/_build/html/tips_and_tricks/tips_and_tricks.html +3 -3
- data/documentation/_build/html/why_bake/why_bake.html +5 -5
- data/lib/bake/mergeConfig.rb +7 -6
- data/lib/common/version.rb +1 -1
- metadata +1 -1
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<head>
|
|
6
6
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
7
7
|
|
|
8
|
-
<title>How to use bake with cygwin — bake 2.13.
|
|
8
|
+
<title>How to use bake with cygwin — bake 2.13.1 documentation</title>
|
|
9
9
|
|
|
10
10
|
<link rel="stylesheet" href="../_static/basic.css" type="text/css" />
|
|
11
11
|
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
<script type="text/javascript">
|
|
16
16
|
var DOCUMENTATION_OPTIONS = {
|
|
17
17
|
URL_ROOT: '../',
|
|
18
|
-
VERSION: '2.13.
|
|
18
|
+
VERSION: '2.13.1',
|
|
19
19
|
COLLAPSE_INDEX: false,
|
|
20
20
|
FILE_SUFFIX: '.html',
|
|
21
21
|
HAS_SOURCE: true
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
<script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
|
|
30
30
|
<script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
|
|
31
31
|
<link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
|
|
32
|
-
<link rel="top" title="bake 2.13.
|
|
32
|
+
<link rel="top" title="bake 2.13.1 documentation" href="../index.html" />
|
|
33
33
|
<link rel="up" title="Tips and Tricks" href="tips_and_tricks.html" />
|
|
34
34
|
<link rel="next" title="Clang Analyze" href="the_clang.html" />
|
|
35
35
|
<link rel="prev" title="Static Code Analysis" href="static_code_analysis.html" />
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<head>
|
|
6
6
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
7
7
|
|
|
8
|
-
<title>Static Code Analysis — bake 2.13.
|
|
8
|
+
<title>Static Code Analysis — bake 2.13.1 documentation</title>
|
|
9
9
|
|
|
10
10
|
<link rel="stylesheet" href="../_static/basic.css" type="text/css" />
|
|
11
11
|
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
<script type="text/javascript">
|
|
16
16
|
var DOCUMENTATION_OPTIONS = {
|
|
17
17
|
URL_ROOT: '../',
|
|
18
|
-
VERSION: '2.13.
|
|
18
|
+
VERSION: '2.13.1',
|
|
19
19
|
COLLAPSE_INDEX: false,
|
|
20
20
|
FILE_SUFFIX: '.html',
|
|
21
21
|
HAS_SOURCE: true
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
<script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
|
|
30
30
|
<script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
|
|
31
31
|
<link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
|
|
32
|
-
<link rel="top" title="bake 2.13.
|
|
32
|
+
<link rel="top" title="bake 2.13.1 documentation" href="../index.html" />
|
|
33
33
|
<link rel="up" title="Tips and Tricks" href="tips_and_tricks.html" />
|
|
34
34
|
<link rel="next" title="How to use bake with cygwin" href="how_to_use_bake_with_cygwin.html" />
|
|
35
35
|
<link rel="prev" title="The Bakery" href="the_bakery.html" />
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<head>
|
|
6
6
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
7
7
|
|
|
8
|
-
<title>The Bakery — bake 2.13.
|
|
8
|
+
<title>The Bakery — bake 2.13.1 documentation</title>
|
|
9
9
|
|
|
10
10
|
<link rel="stylesheet" href="../_static/basic.css" type="text/css" />
|
|
11
11
|
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
<script type="text/javascript">
|
|
16
16
|
var DOCUMENTATION_OPTIONS = {
|
|
17
17
|
URL_ROOT: '../',
|
|
18
|
-
VERSION: '2.13.
|
|
18
|
+
VERSION: '2.13.1',
|
|
19
19
|
COLLAPSE_INDEX: false,
|
|
20
20
|
FILE_SUFFIX: '.html',
|
|
21
21
|
HAS_SOURCE: true
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
<script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
|
|
30
30
|
<script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
|
|
31
31
|
<link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
|
|
32
|
-
<link rel="top" title="bake 2.13.
|
|
32
|
+
<link rel="top" title="bake 2.13.1 documentation" href="../index.html" />
|
|
33
33
|
<link rel="up" title="Tips and Tricks" href="tips_and_tricks.html" />
|
|
34
34
|
<link rel="next" title="Static Code Analysis" href="static_code_analysis.html" />
|
|
35
35
|
<link rel="prev" title="Tips and Tricks" href="tips_and_tricks.html" />
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<head>
|
|
6
6
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
7
7
|
|
|
8
|
-
<title>Clang Analyze — bake 2.13.
|
|
8
|
+
<title>Clang Analyze — bake 2.13.1 documentation</title>
|
|
9
9
|
|
|
10
10
|
<link rel="stylesheet" href="../_static/basic.css" type="text/css" />
|
|
11
11
|
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
<script type="text/javascript">
|
|
16
16
|
var DOCUMENTATION_OPTIONS = {
|
|
17
17
|
URL_ROOT: '../',
|
|
18
|
-
VERSION: '2.13.
|
|
18
|
+
VERSION: '2.13.1',
|
|
19
19
|
COLLAPSE_INDEX: false,
|
|
20
20
|
FILE_SUFFIX: '.html',
|
|
21
21
|
HAS_SOURCE: true
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
<script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
|
|
30
30
|
<script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
|
|
31
31
|
<link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
|
|
32
|
-
<link rel="top" title="bake 2.13.
|
|
32
|
+
<link rel="top" title="bake 2.13.1 documentation" href="../index.html" />
|
|
33
33
|
<link rel="up" title="Tips and Tricks" href="tips_and_tricks.html" />
|
|
34
34
|
<link rel="next" title="Performance" href="../performance/performance.html" />
|
|
35
35
|
<link rel="prev" title="How to use bake with cygwin" href="how_to_use_bake_with_cygwin.html" />
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<head>
|
|
6
6
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
7
7
|
|
|
8
|
-
<title>Tips and Tricks — bake 2.13.
|
|
8
|
+
<title>Tips and Tricks — bake 2.13.1 documentation</title>
|
|
9
9
|
|
|
10
10
|
<link rel="stylesheet" href="../_static/basic.css" type="text/css" />
|
|
11
11
|
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
<script type="text/javascript">
|
|
16
16
|
var DOCUMENTATION_OPTIONS = {
|
|
17
17
|
URL_ROOT: '../',
|
|
18
|
-
VERSION: '2.13.
|
|
18
|
+
VERSION: '2.13.1',
|
|
19
19
|
COLLAPSE_INDEX: false,
|
|
20
20
|
FILE_SUFFIX: '.html',
|
|
21
21
|
HAS_SOURCE: true
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
<script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
|
|
30
30
|
<script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
|
|
31
31
|
<link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
|
|
32
|
-
<link rel="top" title="bake 2.13.
|
|
32
|
+
<link rel="top" title="bake 2.13.1 documentation" href="../index.html" />
|
|
33
33
|
<link rel="next" title="The Bakery" href="the_bakery.html" />
|
|
34
34
|
<link rel="prev" title="How to Debug in Visual Studio" href="../ide/vs/how_to_debug_in_vs.html" />
|
|
35
35
|
<meta charset='utf-8'>
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<head>
|
|
6
6
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
7
7
|
|
|
8
|
-
<title>Why you should use bake — bake 2.13.
|
|
8
|
+
<title>Why you should use bake — bake 2.13.1 documentation</title>
|
|
9
9
|
|
|
10
10
|
<link rel="stylesheet" href="../_static/basic.css" type="text/css" />
|
|
11
11
|
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
<script type="text/javascript">
|
|
16
16
|
var DOCUMENTATION_OPTIONS = {
|
|
17
17
|
URL_ROOT: '../',
|
|
18
|
-
VERSION: '2.13.
|
|
18
|
+
VERSION: '2.13.1',
|
|
19
19
|
COLLAPSE_INDEX: false,
|
|
20
20
|
FILE_SUFFIX: '.html',
|
|
21
21
|
HAS_SOURCE: true
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
<script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
|
|
30
30
|
<script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
|
|
31
31
|
<link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
|
|
32
|
-
<link rel="top" title="bake 2.13.
|
|
32
|
+
<link rel="top" title="bake 2.13.1 documentation" href="../index.html" />
|
|
33
33
|
<link rel="next" title="Install bake" href="../install/install_bake.html" />
|
|
34
|
-
<link rel="prev" title="bake 2.13.
|
|
34
|
+
<link rel="prev" title="bake 2.13.1" href="../index.html" />
|
|
35
35
|
<meta charset='utf-8'>
|
|
36
36
|
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
|
|
37
37
|
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
|
|
@@ -108,7 +108,7 @@
|
|
|
108
108
|
|
|
109
109
|
|
|
110
110
|
<li>
|
|
111
|
-
<a href="../index.html" title="Previous Chapter: bake 2.13.
|
|
111
|
+
<a href="../index.html" title="Previous Chapter: bake 2.13.1"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">« bake 2.13.1</span>
|
|
112
112
|
</a>
|
|
113
113
|
</li>
|
|
114
114
|
<li>
|
data/lib/bake/mergeConfig.rb
CHANGED
|
@@ -79,7 +79,8 @@ module Bake
|
|
|
79
79
|
end
|
|
80
80
|
|
|
81
81
|
def clone(obj)
|
|
82
|
-
|
|
82
|
+
return obj.map {|o| o.dup} if Array === obj
|
|
83
|
+
return obj.dup
|
|
83
84
|
end
|
|
84
85
|
|
|
85
86
|
def merge()
|
|
@@ -104,7 +105,7 @@ module Bake
|
|
|
104
105
|
@child.setExLib(cExLib + @child.exLib)
|
|
105
106
|
@child.setExLibSearchPath(cExLibSearchPath + @child.exLibSearchPath)
|
|
106
107
|
@child.setUserLibrary(cUserLibrary + @child.userLibrary)
|
|
107
|
-
|
|
108
|
+
|
|
108
109
|
if not @parent.startupSteps.nil?
|
|
109
110
|
if (@child.startupSteps.nil?)
|
|
110
111
|
@child.setStartupSteps(clone(@parent.startupSteps))
|
|
@@ -139,7 +140,7 @@ module Bake
|
|
|
139
140
|
|
|
140
141
|
pt = @parent.defaultToolchain
|
|
141
142
|
ct = @child.defaultToolchain
|
|
142
|
-
|
|
143
|
+
|
|
143
144
|
if not pt.nil?
|
|
144
145
|
if (ct.nil?)
|
|
145
146
|
@child.setDefaultToolchain(clone(pt))
|
|
@@ -158,13 +159,13 @@ module Bake
|
|
|
158
159
|
mergeToolchain(pt,ct,false)
|
|
159
160
|
end
|
|
160
161
|
end
|
|
161
|
-
|
|
162
|
+
|
|
162
163
|
# Valid for custom config
|
|
163
164
|
|
|
164
165
|
if (Metamodel::CustomConfig === @child && Metamodel::CustomConfig === @parent)
|
|
165
166
|
@child.setStep(clone(@parent.step)) if @child.step.nil? and not @parent.step.nil?
|
|
166
167
|
end
|
|
167
|
-
|
|
168
|
+
|
|
168
169
|
# Valid for library and exe config
|
|
169
170
|
|
|
170
171
|
if ((Metamodel::LibraryConfig === @child || Metamodel::ExecutableConfig === @child) && (Metamodel::LibraryConfig === @parent || Metamodel::ExecutableConfig === @parent))
|
|
@@ -172,7 +173,7 @@ module Bake
|
|
|
172
173
|
@child.setExcludeFiles(clone(@parent.excludeFiles) + @child.excludeFiles)
|
|
173
174
|
@child.setIncludeDir(clone(@parent.includeDir) + @child.includeDir)
|
|
174
175
|
end
|
|
175
|
-
|
|
176
|
+
|
|
176
177
|
# Valid for exe config
|
|
177
178
|
|
|
178
179
|
if (Metamodel::ExecutableConfig === @child && Metamodel::ExecutableConfig === @parent)
|
data/lib/common/version.rb
CHANGED