bake-toolkit 1.2.1 → 1.3.0
Sign up to get free protection for your applications and to get access to all the features.
- data/doc/further/change.html +5 -0
- data/doc/index.html +1 -1
- data/doc/syntax/syntax.html +18 -2
- data/lib/bake/model/metamodel.rb +2 -0
- data/lib/bake/options.rb +2 -2
- data/lib/bake/util.rb +8 -0
- data/lib/bake/version.rb +1 -1
- metadata +2 -2
data/doc/further/change.html
CHANGED
|
@@ -7,6 +7,11 @@
|
|
|
7
7
|
<body>
|
|
8
8
|
<h1>Changelog</h1>
|
|
9
9
|
|
|
10
|
+
May 23, 2014 - bake-toolkit 1.3.0<br>
|
|
11
|
+
<ul>
|
|
12
|
+
<li><b>Added: defines can be filtered now via command line</b>
|
|
13
|
+
</ul>
|
|
14
|
+
|
|
10
15
|
May 2, 2014 - bake-toolkit 1.2.1<br>
|
|
11
16
|
<ul>
|
|
12
17
|
<li><b>Added: Set keyword for defining variables</b>
|
data/doc/index.html
CHANGED
|
@@ -72,7 +72,7 @@ bake is used to build software <font color="#009900"><b>fast</b></font> and <fon
|
|
|
72
72
|
|
|
73
73
|
<p>
|
|
74
74
|
<hr>
|
|
75
|
-
<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 1.
|
|
75
|
+
<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 1.3.0</td><td align="right">May 23, 2014</td></tr></table>
|
|
76
76
|
|
|
77
77
|
</body>
|
|
78
78
|
|
data/doc/syntax/syntax.html
CHANGED
|
@@ -106,7 +106,9 @@ z-index: 100;
|
|
|
106
106
|
<span class="help" onMouseover="showDefaultCompiler()" onMouseout="notip()">Compiler</span> ASM | CPP | C,
|
|
107
107
|
<span class="help" onMouseover="showCommand()" onMouseout="notip()">command</span>: <cmd> {</i><br>
|
|
108
108
|
<span class="help" onMouseover="showDefaultFlags()" onMouseout="notip()">Flags</span> <flags><br>
|
|
109
|
-
<span class="help" onMouseover="showDefaultDefine()" onMouseout="notip()">Define</span> <define>
|
|
109
|
+
<span class="help" onMouseover="showDefaultDefine()" onMouseout="notip()">Define</span> <define>,
|
|
110
|
+
<span class="help" onMouseover="showDefineDefault()" onMouseout="notip()">default</span>: on|off,
|
|
111
|
+
<span class="help" onMouseover="showDefineFilter()" onMouseout="notip()">filter</span>: <name><br>
|
|
110
112
|
}<br>
|
|
111
113
|
<span class="help" onMouseover="showDefaultArchiver()" onMouseout="notip()">Archiver</span>
|
|
112
114
|
<span class="help" onMouseover="showCommand()" onMouseout="notip()">command</span>: <cmd> {</i><br>
|
|
@@ -133,7 +135,9 @@ z-index: 100;
|
|
|
133
135
|
<span class="help" onMouseover="showCompiler()" onMouseout="notip()">Compiler</span> ASM | CPP | C,
|
|
134
136
|
<span class="help" onMouseover="showCommand()" onMouseout="notip()">command</span>: <cmd> {</i><br>
|
|
135
137
|
<span class="help" onMouseover="showFlags()" onMouseout="notip()">Flags</span> <flags>, add: <flags>, remove: <flags><br>
|
|
136
|
-
<span class="help" onMouseover="showDefine()" onMouseout="notip()">Define</span> <define>
|
|
138
|
+
<span class="help" onMouseover="showDefine()" onMouseout="notip()">Define</span> <define>,
|
|
139
|
+
<span class="help" onMouseover="showDefineDefault()" onMouseout="notip()">default</span>: on|off,
|
|
140
|
+
<span class="help" onMouseover="showDefineFilter()" onMouseout="notip()">filter</span>: <name><br>
|
|
137
141
|
}<br>
|
|
138
142
|
<span class="help" onMouseover="showArchiver()" onMouseout="notip()">Archiver</span>
|
|
139
143
|
<span class="help" onMouseover="showCommand()" onMouseout="notip()">command</span>: <cmd> {</i><br>
|
|
@@ -300,6 +304,18 @@ function showStepFilter() {
|
|
|
300
304
|
ddrivetip("filter", "No","-","-",str)
|
|
301
305
|
}
|
|
302
306
|
|
|
307
|
+
function showDefineDefault() {
|
|
308
|
+
str = 'Specifies if a define shall be added to compiler command by default.'
|
|
309
|
+
ddrivetip("default", "No","-","on",str)
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
function showDefineFilter() {
|
|
313
|
+
str = 'A define argument for the compiler can be switched on or off explicitly regardless of the "default" attribute with the command line options<br>'+
|
|
314
|
+
'<i> --include_filter <filter name></i><br>'+
|
|
315
|
+
'<i> --exclude_filter <filter name></i><br>'
|
|
316
|
+
ddrivetip("filter", "No","-","-",str)
|
|
317
|
+
}
|
|
318
|
+
|
|
303
319
|
function getMakefileDesc() {
|
|
304
320
|
return 'Makefile to be started, e.g.:<br>'+
|
|
305
321
|
'<i> Makefile "subDir/makefile"</i><br>'
|
data/lib/bake/model/metamodel.rb
CHANGED
data/lib/bake/options.rb
CHANGED
|
@@ -116,9 +116,9 @@ module Cxxproject
|
|
|
116
116
|
puts " --socket <num> Set SOCKET for sending errors, receiving commands, etc. - used by e.g. Eclipse."
|
|
117
117
|
puts " --toolchain_info <name> Prints default values of a toolchain."
|
|
118
118
|
puts " --toolchain_names Prints available toolchains."
|
|
119
|
-
puts " --include_filter <name> Includes steps with this filter name (can be used multiple times)."
|
|
119
|
+
puts " --include_filter <name> Includes steps/defines with this filter name (can be used multiple times)."
|
|
120
120
|
puts " 'PRE' or 'POST' includes all PreSteps respectively PostSteps."
|
|
121
|
-
puts " --exclude_filter <name> Excludes steps with this filter name (can be used multiple times)."
|
|
121
|
+
puts " --exclude_filter <name> Excludes steps/defines with this filter name (can be used multiple times)."
|
|
122
122
|
puts " 'PRE' or 'POST' excludes all PreSteps respectively PostSteps."
|
|
123
123
|
puts " --show_abs_paths Compiler prints absolute filename paths instead of relative paths."
|
|
124
124
|
puts " --no_autodir Disable auto completion of paths like in IncludeDir"
|
data/lib/bake/util.rb
CHANGED
|
@@ -74,6 +74,14 @@ def integrateCompiler(tcs, compiler, type)
|
|
|
74
74
|
end
|
|
75
75
|
tcs[:COMPILER][type][:FLAGS] = adjustFlags(tcs[:COMPILER][type][:FLAGS], compiler.flags)
|
|
76
76
|
compiler.define.each do |d|
|
|
77
|
+
checkDefault = true
|
|
78
|
+
if d.filter != ""
|
|
79
|
+
next if @options.exclude_filter.include?d.filter
|
|
80
|
+
checkDefault = false if @options.include_filter.include?d.filter
|
|
81
|
+
end
|
|
82
|
+
if checkDefault
|
|
83
|
+
next if d.default == "off"
|
|
84
|
+
end
|
|
77
85
|
tcs[:COMPILER][type][:DEFINES] << d.str
|
|
78
86
|
end
|
|
79
87
|
end
|
data/lib/bake/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bake-toolkit
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.3.0
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2014-05-
|
|
12
|
+
date: 2014-05-23 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: cxxproject
|