bake-toolkit 2.28.1 → 2.29.0

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 (22) hide show
  1. checksums.yaml +4 -4
  2. data/documentation/_build/html/_sources/changelog.txt +5 -0
  3. data/documentation/_build/html/_sources/index.txt +1 -1
  4. data/documentation/_build/html/_sources/syntax/adapt_configs.txt +21 -0
  5. data/documentation/_build/html/_static/syntax.html +10 -0
  6. data/documentation/_build/html/changelog.html +1161 -1154
  7. data/documentation/_build/html/genindex.html +152 -152
  8. data/documentation/_build/html/index.html +246 -246
  9. data/documentation/_build/html/search.html +174 -174
  10. data/documentation/_build/html/searchindex.js +1 -1
  11. data/documentation/_build/html/syntax/adapt_configs.html +388 -370
  12. data/documentation/_build/html/syntax/project_meta_syntax.html +933 -923
  13. data/documentation/_build/html/syntax/syntax.html +197 -196
  14. data/lib/bake/config/loader.rb +24 -9
  15. data/lib/bake/model/metamodel.rb +5 -0
  16. data/lib/bake/options/usage.rb +2 -2
  17. data/lib/blocks/block.rb +10 -1
  18. data/lib/blocks/commandLine.rb +11 -5
  19. data/lib/blocks/makefile.rb +16 -6
  20. data/lib/common/version.rb +1 -1
  21. data/lib/tocxx.rb +3 -2
  22. metadata +1 -1
data/documentation/_build/html/syntax/syntax.html CHANGED
@@ -1,197 +1,198 @@
1
- <!DOCTYPE html>
2
-
3
-
4
- <html xmlns="http://www.w3.org/1999/xhtml">
5
- <head>
6
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
7
-
8
- <title>Syntax &mdash; bake documentation</title>
9
-
10
- <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
11
- <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
12
- <link rel="stylesheet" href="../_static/bootswatch-3.3.4/sandstone/bootstrap.min.css" type="text/css" />
13
- <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
14
-
15
- <script type="text/javascript">
16
- var DOCUMENTATION_OPTIONS = {
17
- URL_ROOT: '../',
18
- VERSION: '',
19
- COLLAPSE_INDEX: false,
20
- FILE_SUFFIX: '.html',
21
- HAS_SOURCE: true
22
- };
23
- </script>
24
- <script type="text/javascript" src="../_static/jquery.js"></script>
25
- <script type="text/javascript" src="../_static/underscore.js"></script>
26
- <script type="text/javascript" src="../_static/doctools.js"></script>
27
- <script type="text/javascript" src="../_static/js/jquery-1.11.0.min.js"></script>
28
- <script type="text/javascript" src="../_static/js/jquery-fix.js"></script>
29
- <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
30
- <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
31
- <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
32
- <link rel="top" title="bake documentation" href="../index.html" />
33
- <link rel="next" title="The Syntax of the Project.meta file" href="project_meta_syntax.html" />
34
- <link rel="prev" title="Injection and inheritance of IncludeDir and Dependency" href="../concepts/inject.html" />
35
- <meta charset='utf-8'>
36
- <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
37
- <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
38
- <meta name="apple-mobile-web-app-capable" content="yes">
39
-
40
- </head>
41
- <body role="document">
42
-
43
- <div id="navbar" class="navbar navbar-default navbar-fixed-top">
44
- <div class="container">
45
- <div class="navbar-header">
46
- <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
47
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
48
- <span class="icon-bar"></span>
49
- <span class="icon-bar"></span>
50
- <span class="icon-bar"></span>
51
- </button>
52
- <a class="navbar-brand" href="../index.html"><img src="../_static/logo_tiny_48.png">
53
- </a>
54
- <span class="navbar-text navbar-version pull-left"><b></b></span>
55
- </div>
56
-
57
- <div class="collapse navbar-collapse nav-collapse">
58
- <ul class="nav navbar-nav">
59
-
60
-
61
- <li class="dropdown globaltoc-container">
62
- <a role="button"
63
- id="dLabelGlobalToc"
64
- data-toggle="dropdown"
65
- data-target="#"
66
- href="../index.html">Section <b class="caret"></b></a>
67
- <ul class="dropdown-menu globaltoc"
68
- role="menu"
69
- aria-labelledby="dLabelGlobalToc"><ul class="current">
70
- <li class="toctree-l1"><a class="reference internal" href="../why_bake/why_bake.html">Why you should use bake</a></li>
71
- <li class="toctree-l1"><a class="reference internal" href="../install/install_bake.html">Install bake</a></li>
72
- <li class="toctree-l1"><a class="reference internal" href="../quickstart/quickstart.html">Quickstart</a></li>
73
- <li class="toctree-l1"><a class="reference internal" href="../concepts/concepts.html">Concepts</a></li>
74
- <li class="toctree-l1 current"><a class="current reference internal" href="">Syntax</a></li>
75
- <li class="toctree-l1"><a class="reference internal" href="../commandline/commandline.html">Commandline</a></li>
76
- <li class="toctree-l1"><a class="reference internal" href="../ide/ide_integrations.html">IDE Support</a></li>
77
- <li class="toctree-l1"><a class="reference internal" href="../tips_and_tricks/tips_and_tricks.html">Additional features</a></li>
78
- <li class="toctree-l1"><a class="reference internal" href="../performance/performance.html">Performance</a></li>
79
- <li class="toctree-l1"><a class="reference internal" href="../known_issues.html">Known Issues</a></li>
80
- <li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
81
- <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
82
- </ul>
83
- <ul>
84
- <li class="toctree-l1"><a class="reference internal" href="../internal.html">Internal developing notes</a></li>
85
- </ul>
86
- </ul>
87
- </li>
88
-
89
- <li class="dropdown">
90
- <a role="button"
91
- id="dLabelLocalToc"
92
- data-toggle="dropdown"
93
- data-target="#"
94
- href="#">SubSections <b class="caret"></b></a>
95
- <ul class="dropdown-menu localtoc"
96
- role="menu"
97
- aria-labelledby="dLabelLocalToc"><ul>
98
- <li><a class="reference internal" href="#">Syntax</a></li>
99
- </ul>
100
- </ul>
101
- </li>
102
-
103
-
104
-
105
-
106
-
107
- <li>
108
- <a href="../concepts/inject.html" title="Previous Chapter: Injection and inheritance of IncludeDir and Dependency"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; Injection and...</span>
109
- </a>
110
- </li>
111
- <li>
112
- <a href="project_meta_syntax.html" title="Next Chapter: The Syntax of the Project.meta file"><span class="glyphicon glyphicon-chevron-right visible-sm"></span><span class="hidden-sm hidden-tablet">The Syntax of... &raquo;</span>
113
- </a>
114
- </li>
115
-
116
-
117
-
118
-
119
-
120
- </ul>
121
-
122
-
123
-
124
- <form class="navbar-form navbar-right" action="../search.html" method="get">
125
- <div class="form-group">
126
- <input type="text" name="q" class="form-control" placeholder="Search" />
127
- </div>
128
- <input type="hidden" name="check_keywords" value="yes" />
129
- <input type="hidden" name="area" value="default" />
130
- </form>
131
-
132
- </div>
133
- </div>
134
- </div>
135
-
136
- <div class="container">
137
- <div class="row">
138
- <div class="col-md-12">
139
-
140
- <div class="section" id="syntax">
141
- <h1>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">¶</a></h1>
142
- <div class="toctree-wrapper compound">
143
- <ul>
144
- <li class="toctree-l1"><a class="reference internal" href="project_meta_syntax.html">The Syntax of the Project.meta file</a><ul>
145
- <li class="toctree-l2"><a class="reference internal" href="project_meta_syntax.html#instructions-for-the-interactive-syntax-viewer">Instructions for the Interactive Syntax Viewer</a></li>
146
- </ul>
147
- </li>
148
- <li class="toctree-l1"><a class="reference internal" href="variable_substitutions.html">Variables in Project.meta</a><ul>
149
- <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#using-variables">Using variables</a></li>
150
- <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#user-defined-variables">User defined variables</a></li>
151
- <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#predefined-bake-environment-variables">Predefined bake environment variables</a></li>
152
- <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#environment-variables">Environment variables</a></li>
153
- <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#nested-variables">Nested variables</a></li>
154
- <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#complex-variables">Complex variables</a></li>
155
- <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#notes-and-warnings">Notes and warnings</a></li>
156
- </ul>
157
- </li>
158
- <li class="toctree-l1"><a class="reference internal" href="derive_configs.html">Derive configs</a><ul>
159
- <li class="toctree-l2"><a class="reference internal" href="derive_configs.html#deriving-a-config">Deriving a config</a></li>
160
- <li class="toctree-l2"><a class="reference internal" href="derive_configs.html#inheritance-implications">Inheritance implications</a></li>
161
- <li class="toctree-l2"><a class="reference internal" href="derive_configs.html#multiple-inheritance">Multiple inheritance</a></li>
162
- </ul>
163
- </li>
164
- <li class="toctree-l1"><a class="reference internal" href="adapt_configs.html">Adapt configs</a><ul>
165
- <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#introduction">Introduction</a></li>
166
- <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#from-command-line">From command line</a></li>
167
- <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#from-project-meta">From Project.meta</a></li>
168
- <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#conditions-and-effectiveness">Conditions and effectiveness</a></li>
169
- <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#occurrences">Occurrences</a></li>
170
- <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#apply-order">Apply order</a></li>
171
- <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#types">Types</a></li>
172
- </ul>
173
- </li>
174
- <li class="toctree-l1"><a class="reference internal" href="auto_adjustment.html">Auto-adjustment of paths to existing projects</a></li>
175
- </ul>
176
- </div>
177
- </div>
178
-
179
-
180
- </div>
181
-
182
- </div>
183
- </div>
184
- <footer class="footer">
185
- <div class="container">
186
- <p class="pull-right">
187
- <a href="#">Back to top</a>
188
-
189
- </p>
190
- <p>
191
- &copy; Copyright 2016, E.S.R.Labs AG.<br/>
192
- Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.3.1.<br/>
193
- </p>
194
- </div>
195
- </footer>
196
- </body>
1
+ <!DOCTYPE html>
2
+
3
+
4
+ <html xmlns="http://www.w3.org/1999/xhtml">
5
+ <head>
6
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
7
+
8
+ <title>Syntax &mdash; bake documentation</title>
9
+
10
+ <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
11
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
12
+ <link rel="stylesheet" href="../_static/bootswatch-3.3.4/sandstone/bootstrap.min.css" type="text/css" />
13
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
14
+
15
+ <script type="text/javascript">
16
+ var DOCUMENTATION_OPTIONS = {
17
+ URL_ROOT: '../',
18
+ VERSION: '',
19
+ COLLAPSE_INDEX: false,
20
+ FILE_SUFFIX: '.html',
21
+ HAS_SOURCE: true
22
+ };
23
+ </script>
24
+ <script type="text/javascript" src="../_static/jquery.js"></script>
25
+ <script type="text/javascript" src="../_static/underscore.js"></script>
26
+ <script type="text/javascript" src="../_static/doctools.js"></script>
27
+ <script type="text/javascript" src="../_static/js/jquery-1.11.0.min.js"></script>
28
+ <script type="text/javascript" src="../_static/js/jquery-fix.js"></script>
29
+ <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
30
+ <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
31
+ <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
32
+ <link rel="top" title="bake documentation" href="../index.html" />
33
+ <link rel="next" title="The Syntax of the Project.meta file" href="project_meta_syntax.html" />
34
+ <link rel="prev" title="Injection and inheritance of IncludeDir and Dependency" href="../concepts/inject.html" />
35
+ <meta charset='utf-8'>
36
+ <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
37
+ <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
38
+ <meta name="apple-mobile-web-app-capable" content="yes">
39
+
40
+ </head>
41
+ <body role="document">
42
+
43
+ <div id="navbar" class="navbar navbar-default navbar-fixed-top">
44
+ <div class="container">
45
+ <div class="navbar-header">
46
+ <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
47
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
48
+ <span class="icon-bar"></span>
49
+ <span class="icon-bar"></span>
50
+ <span class="icon-bar"></span>
51
+ </button>
52
+ <a class="navbar-brand" href="../index.html"><img src="../_static/logo_tiny_48.png">
53
+ </a>
54
+ <span class="navbar-text navbar-version pull-left"><b></b></span>
55
+ </div>
56
+
57
+ <div class="collapse navbar-collapse nav-collapse">
58
+ <ul class="nav navbar-nav">
59
+
60
+
61
+ <li class="dropdown globaltoc-container">
62
+ <a role="button"
63
+ id="dLabelGlobalToc"
64
+ data-toggle="dropdown"
65
+ data-target="#"
66
+ href="../index.html">Section <b class="caret"></b></a>
67
+ <ul class="dropdown-menu globaltoc"
68
+ role="menu"
69
+ aria-labelledby="dLabelGlobalToc"><ul class="current">
70
+ <li class="toctree-l1"><a class="reference internal" href="../why_bake/why_bake.html">Why you should use bake</a></li>
71
+ <li class="toctree-l1"><a class="reference internal" href="../install/install_bake.html">Install bake</a></li>
72
+ <li class="toctree-l1"><a class="reference internal" href="../quickstart/quickstart.html">Quickstart</a></li>
73
+ <li class="toctree-l1"><a class="reference internal" href="../concepts/concepts.html">Concepts</a></li>
74
+ <li class="toctree-l1 current"><a class="current reference internal" href="">Syntax</a></li>
75
+ <li class="toctree-l1"><a class="reference internal" href="../commandline/commandline.html">Commandline</a></li>
76
+ <li class="toctree-l1"><a class="reference internal" href="../ide/ide_integrations.html">IDE Support</a></li>
77
+ <li class="toctree-l1"><a class="reference internal" href="../tips_and_tricks/tips_and_tricks.html">Additional features</a></li>
78
+ <li class="toctree-l1"><a class="reference internal" href="../performance/performance.html">Performance</a></li>
79
+ <li class="toctree-l1"><a class="reference internal" href="../known_issues.html">Known Issues</a></li>
80
+ <li class="toctree-l1"><a class="reference internal" href="../changelog.html">Changelog</a></li>
81
+ <li class="toctree-l1"><a class="reference internal" href="../license.html">License</a></li>
82
+ </ul>
83
+ <ul>
84
+ <li class="toctree-l1"><a class="reference internal" href="../internal.html">Internal developing notes</a></li>
85
+ </ul>
86
+ </ul>
87
+ </li>
88
+
89
+ <li class="dropdown">
90
+ <a role="button"
91
+ id="dLabelLocalToc"
92
+ data-toggle="dropdown"
93
+ data-target="#"
94
+ href="#">SubSections <b class="caret"></b></a>
95
+ <ul class="dropdown-menu localtoc"
96
+ role="menu"
97
+ aria-labelledby="dLabelLocalToc"><ul>
98
+ <li><a class="reference internal" href="#">Syntax</a></li>
99
+ </ul>
100
+ </ul>
101
+ </li>
102
+
103
+
104
+
105
+
106
+
107
+ <li>
108
+ <a href="../concepts/inject.html" title="Previous Chapter: Injection and inheritance of IncludeDir and Dependency"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; Injection and...</span>
109
+ </a>
110
+ </li>
111
+ <li>
112
+ <a href="project_meta_syntax.html" title="Next Chapter: The Syntax of the Project.meta file"><span class="glyphicon glyphicon-chevron-right visible-sm"></span><span class="hidden-sm hidden-tablet">The Syntax of... &raquo;</span>
113
+ </a>
114
+ </li>
115
+
116
+
117
+
118
+
119
+
120
+ </ul>
121
+
122
+
123
+
124
+ <form class="navbar-form navbar-right" action="../search.html" method="get">
125
+ <div class="form-group">
126
+ <input type="text" name="q" class="form-control" placeholder="Search" />
127
+ </div>
128
+ <input type="hidden" name="check_keywords" value="yes" />
129
+ <input type="hidden" name="area" value="default" />
130
+ </form>
131
+
132
+ </div>
133
+ </div>
134
+ </div>
135
+
136
+ <div class="container">
137
+ <div class="row">
138
+ <div class="col-md-12">
139
+
140
+ <div class="section" id="syntax">
141
+ <h1>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">¶</a></h1>
142
+ <div class="toctree-wrapper compound">
143
+ <ul>
144
+ <li class="toctree-l1"><a class="reference internal" href="project_meta_syntax.html">The Syntax of the Project.meta file</a><ul>
145
+ <li class="toctree-l2"><a class="reference internal" href="project_meta_syntax.html#instructions-for-the-interactive-syntax-viewer">Instructions for the Interactive Syntax Viewer</a></li>
146
+ </ul>
147
+ </li>
148
+ <li class="toctree-l1"><a class="reference internal" href="variable_substitutions.html">Variables in Project.meta</a><ul>
149
+ <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#using-variables">Using variables</a></li>
150
+ <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#user-defined-variables">User defined variables</a></li>
151
+ <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#predefined-bake-environment-variables">Predefined bake environment variables</a></li>
152
+ <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#environment-variables">Environment variables</a></li>
153
+ <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#nested-variables">Nested variables</a></li>
154
+ <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#complex-variables">Complex variables</a></li>
155
+ <li class="toctree-l2"><a class="reference internal" href="variable_substitutions.html#notes-and-warnings">Notes and warnings</a></li>
156
+ </ul>
157
+ </li>
158
+ <li class="toctree-l1"><a class="reference internal" href="derive_configs.html">Derive configs</a><ul>
159
+ <li class="toctree-l2"><a class="reference internal" href="derive_configs.html#deriving-a-config">Deriving a config</a></li>
160
+ <li class="toctree-l2"><a class="reference internal" href="derive_configs.html#inheritance-implications">Inheritance implications</a></li>
161
+ <li class="toctree-l2"><a class="reference internal" href="derive_configs.html#multiple-inheritance">Multiple inheritance</a></li>
162
+ </ul>
163
+ </li>
164
+ <li class="toctree-l1"><a class="reference internal" href="adapt_configs.html">Adapt configs</a><ul>
165
+ <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#introduction">Introduction</a></li>
166
+ <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#from-command-line">From command line</a></li>
167
+ <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#from-project-meta">From Project.meta</a></li>
168
+ <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#conditions-and-effectiveness">Conditions and effectiveness</a></li>
169
+ <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#occurrences">Occurrences</a></li>
170
+ <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#apply-order">Apply order</a></li>
171
+ <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#types">Types</a></li>
172
+ <li class="toctree-l2"><a class="reference internal" href="adapt_configs.html#wildcards">Wildcards</a></li>
173
+ </ul>
174
+ </li>
175
+ <li class="toctree-l1"><a class="reference internal" href="auto_adjustment.html">Auto-adjustment of paths to existing projects</a></li>
176
+ </ul>
177
+ </div>
178
+ </div>
179
+
180
+
181
+ </div>
182
+
183
+ </div>
184
+ </div>
185
+ <footer class="footer">
186
+ <div class="container">
187
+ <p class="pull-right">
188
+ <a href="#">Back to top</a>
189
+
190
+ </p>
191
+ <p>
192
+ &copy; Copyright 2016, E.S.R.Labs AG.<br/>
193
+ Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.3.1.<br/>
194
+ </p>
195
+ </div>
196
+ </footer>
197
+ </body>
197
198
  </html>
data/lib/bake/config/loader.rb CHANGED
@@ -79,10 +79,20 @@ module Bake
79
79
 
80
80
  config, configname = getFullProjectInternal(configs, configname, isMain)
81
81
 
82
+ if isMain
83
+ @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
84
+ @mainProjectName = config.parent.name
85
+ @mainConfigName = config.name
86
+ end
87
+
82
88
  # check if config has to be manipulated
83
89
  @adaptConfigs.each do |c|
84
- if c.project == config.parent.name or (isMain and c.project == "__MAIN__") or c.project == "__ALL__"
85
- if c.name == config.name or (isMain and c.name == "__MAIN__") or c.name == "__ALL__"
90
+
91
+ projPattern = /\A#{c.project.gsub("*", "(\\w*)")}\z/
92
+ confPattern = /\A#{c.name.gsub("*", "(\\w*)")}\z/
93
+
94
+ if projPattern.match(config.parent.name) or (isMain and c.project == "__MAIN__") or c.project == "__ALL__"
95
+ if confPattern.match(config.name) or (isMain and c.name == "__MAIN__") or c.name == "__ALL__"
86
96
 
87
97
  if isMain
88
98
  @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
@@ -90,10 +100,13 @@ module Bake
90
100
  @mainConfigName = config.name
91
101
  end
92
102
 
93
- next if c.parent.toolchain != "" && c.parent.toolchain != @defaultToolchainName
94
- next if c.parent.os != "" && c.parent.os != Utils::OS.name
95
- next if c.parent.mainProject != "" && c.parent.mainProject != @mainProjectName
96
- next if c.parent.mainConfig != "" && c.parent.mainConfig != @mainConfigName
103
+ conditionProjPattern = /\A#{c.parent.mainProject.gsub("*", "(\\w*)")}\z/
104
+ conditionConfPattern = /\A#{c.parent.mainConfig.gsub("*", "(\\w*)")}\z/
105
+
106
+ next if c.parent.toolchain != "" && c.parent.toolchain != @defaultToolchainName
107
+ next if c.parent.os != "" && c.parent.os != Utils::OS.name
108
+ next if c.parent.mainProject != "" && !conditionProjPattern.match(@mainProjectName)
109
+ next if c.parent.mainConfig != "" && !conditionConfPattern.match(@mainConfigName)
97
110
 
98
111
  MergeConfig.new(c, config).merge(c.type.to_sym)
99
112
  end
@@ -195,6 +208,7 @@ module Bake
195
208
  adaptRoots = f.root_elements.select { |re| Metamodel::Adapt === re }
196
209
  if adaptRoots.length > 0
197
210
  adaptRoots.each do |adapt|
211
+ adapt.mainProject = @mainProjectName if adapt.mainProject == "__THIS__"
198
212
  adaptConfigs = adapt.getConfig
199
213
  AdaptConfig.checkSyntax(adaptConfigs, filename)
200
214
  adaptConfigs.each do |ac|
@@ -351,9 +365,10 @@ module Bake
351
365
  @referencedConfigs.each do |projName, configs|
352
366
  configs.each do |config|
353
367
  config.startupSteps.step = config.startupSteps.step.delete_if { |step| filterStep(step, "STARTUP") } if config.startupSteps
354
- config.preSteps.step = config.preSteps.step.delete_if { |step| filterStep(step, "PRE") } if config.preSteps
355
- config.postSteps.step = config.postSteps.step.delete_if { |step| filterStep(step, "POST") } if config.postSteps
356
- config.exitSteps.step = config.exitSteps.step.delete_if { |step| filterStep(step, "EXIT") } if config.exitSteps
368
+ config.preSteps.step = config.preSteps.step.delete_if { |step| filterStep(step, "PRE") } if config.preSteps
369
+ config.postSteps.step = config.postSteps.step.delete_if { |step| filterStep(step, "POST") } if config.postSteps
370
+ config.exitSteps.step = config.exitSteps.step.delete_if { |step| filterStep(step, "EXIT") } if config.exitSteps
371
+ config.cleanSteps.step = config.cleanSteps.step.delete_if { |step| filterStep(step, "CLEAN") } if config.cleanSteps
357
372
  if Metamodel::CustomConfig === config and config.step
358
373
  config.step = nil if filterStep(config.step, nil)
359
374
  end