bake-toolkit 1.5.0 → 1.6.0
Sign up to get free protection for your applications and to get access to all the features.
- data/doc/further/change.html +6 -0
- data/doc/index.html +1 -1
- data/doc/syntax/syntax.html +3 -2
- data/lib/bake/model/metamodel.rb +1 -0
- data/lib/bake/options.rb +8 -1
- data/lib/bake/subst.rb +29 -0
- data/lib/bake/version.rb +1 -1
- data/lib/tocxx.rb +9 -0
- metadata +25 -16
- checksums.yaml +0 -7
data/doc/further/change.html
CHANGED
|
@@ -7,6 +7,12 @@
|
|
|
7
7
|
<body>
|
|
8
8
|
<h1>Changelog</h1>
|
|
9
9
|
|
|
10
|
+
August 1, 2014 - bake-toolkit 1.6.0<br>
|
|
11
|
+
<ul>
|
|
12
|
+
<li><b>Added: The value of a variable can be the result of a command line</b>
|
|
13
|
+
</b>
|
|
14
|
+
</ul>
|
|
15
|
+
|
|
10
16
|
July 18, 2014 - bake-toolkit 1.5.0<br>
|
|
11
17
|
<ul>
|
|
12
18
|
<li><b>Added: Dependencies can be overwritten in inherited projects</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.6.0</td><td align="right">August 1, 2014</td></tr></table>
|
|
76
76
|
|
|
77
77
|
</body>
|
|
78
78
|
|
data/doc/syntax/syntax.html
CHANGED
|
@@ -79,7 +79,7 @@ z-index: 100;
|
|
|
79
79
|
|
|
80
80
|
<span><span style="background-color:#EEEEEE;" class="show">
|
|
81
81
|
<span class="mycomment"># Valid for all config types</span><br><br>
|
|
82
|
-
<span class="help" onMouseover="showSet()" onMouseout="notip()">Set</span> <variable>, value: <value><br>
|
|
82
|
+
<span class="help" onMouseover="showSet()" onMouseout="notip()">Set</span> <variable>, value: <value> | cmd: <line><br>
|
|
83
83
|
<span class="help" onMouseover="showDependency()" onMouseout="notip()">Dependency</span> <project>,
|
|
84
84
|
<span class="help" onMouseover="showDependencyConfig()" onMouseout="notip()">config</span>: <name><br>
|
|
85
85
|
<span class="help" onMouseover="showExternalLibrary()" onMouseout="notip()">ExternalLibrary</span> <lib>,
|
|
@@ -384,7 +384,8 @@ function showIncludeDir() {
|
|
|
384
384
|
}
|
|
385
385
|
|
|
386
386
|
function showSet() {
|
|
387
|
-
str = 'Sets a variable for this and all dependent projects
|
|
387
|
+
str = 'Sets a variable for this and all dependent projects.<br>'+
|
|
388
|
+
'The variable can be a simple value or the result of a cmd, e.g. \"cat myVar.txt\".'
|
|
388
389
|
ddrivetip("Set", "No","0..n","-",str)
|
|
389
390
|
}
|
|
390
391
|
|
data/lib/bake/model/metamodel.rb
CHANGED
|
@@ -160,6 +160,7 @@ module Cxxproject
|
|
|
160
160
|
class Set < ModelElement
|
|
161
161
|
has_attr 'name', String, :defaultValueLiteral => ""
|
|
162
162
|
has_attr 'value', String, :defaultValueLiteral => ""
|
|
163
|
+
has_attr 'cmd', String, :defaultValueLiteral => ""
|
|
163
164
|
end
|
|
164
165
|
|
|
165
166
|
class BaseConfig_INTERNAL < ModelElement
|
data/lib/bake/options.rb
CHANGED
|
@@ -8,7 +8,7 @@ module Cxxproject
|
|
|
8
8
|
class Options < Parser
|
|
9
9
|
attr_reader :build_config, :main_dir, :project, :filename, :eclipse_version, :alias_filename # String
|
|
10
10
|
attr_reader :roots, :include_filter, :exclude_filter # String List
|
|
11
|
-
attr_reader :clean, :rebuild, :single, :verbose, :nocache, :color, :show_includes, :linkOnly, :check_uninc, :printLess, :no_autodir, :clobber, :lint, :debug # Boolean
|
|
11
|
+
attr_reader :clean, :rebuild, :single, :verbose, :nocache, :color, :show_includes, :linkOnly, :check_uninc, :printLess, :no_autodir, :clobber, :lint, :debug, :cmake # Boolean
|
|
12
12
|
attr_reader :threads, :socket, :lint_min, :lint_max # Fixnum
|
|
13
13
|
|
|
14
14
|
def initialize(argv)
|
|
@@ -32,6 +32,7 @@ module Cxxproject
|
|
|
32
32
|
@linkOnly = false
|
|
33
33
|
@printLess = false
|
|
34
34
|
@no_autodir = false
|
|
35
|
+
@cmake = false
|
|
35
36
|
@threads = 8
|
|
36
37
|
@lint_min = -1
|
|
37
38
|
@lint_max = -1
|
|
@@ -85,6 +86,7 @@ module Cxxproject
|
|
|
85
86
|
add_option(Option.new("--show_license",false) { show_license })
|
|
86
87
|
add_option(Option.new("--version",false) { ExitHelper.exit(0) })
|
|
87
88
|
add_option(Option.new("--check_uninc",false) { set_check_uninc })
|
|
89
|
+
add_option(Option.new("--cmake",false) { set_cmake })
|
|
88
90
|
add_option(Option.new("--alias",true) { |x| set_alias_filename(x) })
|
|
89
91
|
|
|
90
92
|
end
|
|
@@ -126,6 +128,8 @@ module Cxxproject
|
|
|
126
128
|
puts " --version Print version."
|
|
127
129
|
puts " -h, --help Print this help."
|
|
128
130
|
puts " --show_license Print the license."
|
|
131
|
+
puts ""
|
|
132
|
+
puts " --cmake Temporary switch for BSW."
|
|
129
133
|
|
|
130
134
|
end
|
|
131
135
|
|
|
@@ -234,6 +238,9 @@ module Cxxproject
|
|
|
234
238
|
def set_check_uninc()
|
|
235
239
|
@check_uninc = true
|
|
236
240
|
end
|
|
241
|
+
def set_cmake()
|
|
242
|
+
@cmake = true
|
|
243
|
+
end
|
|
237
244
|
def set_prepro()
|
|
238
245
|
Rake::application.preproFlags = true
|
|
239
246
|
end
|
data/lib/bake/subst.rb
CHANGED
|
@@ -24,7 +24,36 @@ module Cxxproject
|
|
|
24
24
|
|
|
25
25
|
@@userVarMap = {} if isMainProj
|
|
26
26
|
config.set.each do |s|
|
|
27
|
+
|
|
27
28
|
@@userVarMap[s.name] = substString(s.value)
|
|
29
|
+
|
|
30
|
+
# if (s.value != "" and s.cmd != "")
|
|
31
|
+
# Printer.printError "Error: #{config.file_name}(#{s.line_number}): value and cmd attributes must be used exclusively"
|
|
32
|
+
# ExitHelper.exit(1)
|
|
33
|
+
# end
|
|
34
|
+
#
|
|
35
|
+
# if (s.value != "")
|
|
36
|
+
# @@userVarMap[s.name] = substString(s.value)
|
|
37
|
+
# else
|
|
38
|
+
# cmd_result = false
|
|
39
|
+
# begin
|
|
40
|
+
# rd, wr = IO.pipe
|
|
41
|
+
# cmd = [s.cmd]
|
|
42
|
+
# cmd << {
|
|
43
|
+
# :err=>wr,
|
|
44
|
+
# :out=>wr
|
|
45
|
+
# }
|
|
46
|
+
# cmd_result, consoleOutput = ProcessHelper.safeExecute() { sp = spawn(*cmd); ProcessHelper.readOutput(sp, rd, wr) }
|
|
47
|
+
# @@userVarMap[s.name] = consoleOutput.chomp
|
|
48
|
+
# rescue
|
|
49
|
+
# end
|
|
50
|
+
# if (cmd_result == false)
|
|
51
|
+
# Printer.printWarning "Warning: #{config.file_name}(#{s.line_number}): command not successful, variable #{s.name} wil be set to \"\""
|
|
52
|
+
# @@userVarMap[s.name] = ""
|
|
53
|
+
# end
|
|
54
|
+
# end
|
|
55
|
+
|
|
56
|
+
|
|
28
57
|
end
|
|
29
58
|
|
|
30
59
|
subst(config)
|
data/lib/bake/version.rb
CHANGED
data/lib/tocxx.rb
CHANGED
|
@@ -378,6 +378,9 @@ module Cxxproject
|
|
|
378
378
|
|
|
379
379
|
end
|
|
380
380
|
|
|
381
|
+
def writeCMake
|
|
382
|
+
Printer.printError "Error: --cmake not supported by this version."
|
|
383
|
+
end
|
|
381
384
|
|
|
382
385
|
def substVars
|
|
383
386
|
@mainConfig = @project2config[@mainProjectName]
|
|
@@ -678,6 +681,12 @@ module Cxxproject
|
|
|
678
681
|
end
|
|
679
682
|
|
|
680
683
|
substVars
|
|
684
|
+
|
|
685
|
+
if (@options.cmake)
|
|
686
|
+
writeCMake
|
|
687
|
+
ExitHelper.exit(0)
|
|
688
|
+
end
|
|
689
|
+
|
|
681
690
|
convert2bb
|
|
682
691
|
|
|
683
692
|
#################################################
|
metadata
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bake-toolkit
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.6.0
|
|
5
|
+
prerelease:
|
|
5
6
|
platform: ruby
|
|
6
7
|
authors:
|
|
7
8
|
- Alexander Schaal
|
|
8
9
|
autorequire:
|
|
9
10
|
bindir: bin
|
|
10
11
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
12
|
+
date: 2014-08-01 00:00:00.000000000 Z
|
|
12
13
|
dependencies:
|
|
13
14
|
- !ruby/object:Gem::Dependency
|
|
14
15
|
name: cxxproject
|
|
15
16
|
requirement: !ruby/object:Gem::Requirement
|
|
17
|
+
none: false
|
|
16
18
|
requirements:
|
|
17
19
|
- - '='
|
|
18
20
|
- !ruby/object:Gem::Version
|
|
@@ -20,6 +22,7 @@ dependencies:
|
|
|
20
22
|
type: :runtime
|
|
21
23
|
prerelease: false
|
|
22
24
|
version_requirements: !ruby/object:Gem::Requirement
|
|
25
|
+
none: false
|
|
23
26
|
requirements:
|
|
24
27
|
- - '='
|
|
25
28
|
- !ruby/object:Gem::Version
|
|
@@ -27,6 +30,7 @@ dependencies:
|
|
|
27
30
|
- !ruby/object:Gem::Dependency
|
|
28
31
|
name: rtext
|
|
29
32
|
requirement: !ruby/object:Gem::Requirement
|
|
33
|
+
none: false
|
|
30
34
|
requirements:
|
|
31
35
|
- - '='
|
|
32
36
|
- !ruby/object:Gem::Version
|
|
@@ -34,6 +38,7 @@ dependencies:
|
|
|
34
38
|
type: :runtime
|
|
35
39
|
prerelease: false
|
|
36
40
|
version_requirements: !ruby/object:Gem::Requirement
|
|
41
|
+
none: false
|
|
37
42
|
requirements:
|
|
38
43
|
- - '='
|
|
39
44
|
- !ruby/object:Gem::Version
|
|
@@ -41,6 +46,7 @@ dependencies:
|
|
|
41
46
|
- !ruby/object:Gem::Dependency
|
|
42
47
|
name: rgen
|
|
43
48
|
requirement: !ruby/object:Gem::Requirement
|
|
49
|
+
none: false
|
|
44
50
|
requirements:
|
|
45
51
|
- - '='
|
|
46
52
|
- !ruby/object:Gem::Version
|
|
@@ -48,12 +54,14 @@ dependencies:
|
|
|
48
54
|
type: :runtime
|
|
49
55
|
prerelease: false
|
|
50
56
|
version_requirements: !ruby/object:Gem::Requirement
|
|
57
|
+
none: false
|
|
51
58
|
requirements:
|
|
52
59
|
- - '='
|
|
53
60
|
- !ruby/object:Gem::Version
|
|
54
61
|
version: 0.6.0
|
|
55
|
-
description:
|
|
56
|
-
|
|
62
|
+
description: ! ' This build tool is used to compile projects fast and easy.
|
|
63
|
+
|
|
64
|
+
'
|
|
57
65
|
email: alexander.schaal@esrlabs.com
|
|
58
66
|
executables:
|
|
59
67
|
- bake
|
|
@@ -104,24 +112,24 @@ files:
|
|
|
104
112
|
- doc/eclipse/build/buildMain.png
|
|
105
113
|
- doc/eclipse/build/console.png
|
|
106
114
|
- doc/eclipse/build/problem.png
|
|
107
|
-
- doc/eclipse/export.html
|
|
108
115
|
- doc/eclipse/export/Script.png
|
|
109
116
|
- doc/eclipse/export/Select.png
|
|
110
|
-
- doc/eclipse/
|
|
117
|
+
- doc/eclipse/export.html
|
|
111
118
|
- doc/eclipse/import/Import.png
|
|
112
119
|
- doc/eclipse/import/Select.png
|
|
113
|
-
- doc/eclipse/
|
|
120
|
+
- doc/eclipse/import.html
|
|
114
121
|
- doc/eclipse/install/AddRepository.png
|
|
115
122
|
- doc/eclipse/install/AvailableSoftware.png
|
|
116
123
|
- doc/eclipse/install/InstallNewSoftware.png
|
|
117
124
|
- doc/eclipse/install/Licenses.png
|
|
118
125
|
- doc/eclipse/install/Restart.png
|
|
119
126
|
- doc/eclipse/install/TrustMe.png
|
|
127
|
+
- doc/eclipse/install.html
|
|
120
128
|
- doc/eclipse/misc/pref.png
|
|
121
|
-
- doc/eclipse/new.html
|
|
122
129
|
- doc/eclipse/new/New.png
|
|
123
130
|
- doc/eclipse/new/Result.png
|
|
124
131
|
- doc/eclipse/new/Select.png
|
|
132
|
+
- doc/eclipse/new.html
|
|
125
133
|
- doc/eclipse/select/FirstSelect.png
|
|
126
134
|
- doc/eclipse/select/SecondSelect.png
|
|
127
135
|
- doc/eclipse/select/WrongSelect.png
|
|
@@ -139,19 +147,19 @@ files:
|
|
|
139
147
|
- doc/syntax/derive.html
|
|
140
148
|
- doc/syntax/subst.html
|
|
141
149
|
- doc/syntax/syntax.html
|
|
142
|
-
- doc/vs/create.html
|
|
143
150
|
- doc/vs/create/cvsp.png
|
|
144
|
-
- doc/vs/
|
|
151
|
+
- doc/vs/create.html
|
|
145
152
|
- doc/vs/install/install1.png
|
|
146
153
|
- doc/vs/install/install2010.png
|
|
147
154
|
- doc/vs/install/installed.png
|
|
148
155
|
- doc/vs/install/site.png
|
|
149
156
|
- doc/vs/install/update.png
|
|
150
|
-
- doc/vs/
|
|
157
|
+
- doc/vs/install.html
|
|
151
158
|
- doc/vs/use/error.png
|
|
152
159
|
- doc/vs/use/options.png
|
|
153
160
|
- doc/vs/use/select.png
|
|
154
161
|
- doc/vs/use/show.png
|
|
162
|
+
- doc/vs/use.html
|
|
155
163
|
- license.txt
|
|
156
164
|
- bin/bake
|
|
157
165
|
- bin/bakery
|
|
@@ -160,7 +168,6 @@ files:
|
|
|
160
168
|
homepage: http://www.esrlabs.com
|
|
161
169
|
licenses:
|
|
162
170
|
- MIT
|
|
163
|
-
metadata: {}
|
|
164
171
|
post_install_message:
|
|
165
172
|
rdoc_options:
|
|
166
173
|
- -x
|
|
@@ -168,19 +175,21 @@ rdoc_options:
|
|
|
168
175
|
require_paths:
|
|
169
176
|
- lib
|
|
170
177
|
required_ruby_version: !ruby/object:Gem::Requirement
|
|
178
|
+
none: false
|
|
171
179
|
requirements:
|
|
172
|
-
- - '>='
|
|
180
|
+
- - ! '>='
|
|
173
181
|
- !ruby/object:Gem::Version
|
|
174
182
|
version: '0'
|
|
175
183
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
184
|
+
none: false
|
|
176
185
|
requirements:
|
|
177
|
-
- - '>='
|
|
186
|
+
- - ! '>='
|
|
178
187
|
- !ruby/object:Gem::Version
|
|
179
188
|
version: '0'
|
|
180
189
|
requirements: []
|
|
181
190
|
rubyforge_project:
|
|
182
|
-
rubygems_version:
|
|
191
|
+
rubygems_version: 1.8.24
|
|
183
192
|
signing_key:
|
|
184
|
-
specification_version:
|
|
193
|
+
specification_version: 3
|
|
185
194
|
summary: Frontend for cxxproject.
|
|
186
195
|
test_files: []
|
checksums.yaml
DELETED
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
---
|
|
2
|
-
SHA1:
|
|
3
|
-
metadata.gz: aac0fb5688d93436adc9183abda75aede5b267dd
|
|
4
|
-
data.tar.gz: 423c557d0d3d3cdbb74cda380ec17676168187f3
|
|
5
|
-
SHA512:
|
|
6
|
-
metadata.gz: d66ba309a587ba345d9d78379dd35f37e5888a569bc06faab4ce97ab8ed5625d2a6d19bfae9cbd94e7ee1b124be9530fcf1d3b52fef97a72338aecdc98eb834e
|
|
7
|
-
data.tar.gz: 038cbff1aca1e4db12fe6e1cbf52164ea348939da95c2d592c668b22c6efc9f5e4253df96e292bff4d70c435d3774d1ccde826e9d6161ed309c79dbb7737b62f
|