bake-toolkit 1.6.0 → 1.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +7 -0
  2. data/doc/further/change.html +6 -0
  3. data/doc/index.html +1 -1
  4. data/lib/bake/subst.rb +25 -27
  5. data/lib/bake/version.rb +1 -1
  6. metadata +16 -25
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 528fdd8db5b541372fabca90485f962eab0a43a5
4
+ data.tar.gz: 46a3be5cd8de89d0bbc0a624edf9141c622df717
5
+ SHA512:
6
+ metadata.gz: f5dd480ee77273d201f25832ba4c016e0764faf37055ad4499a24ca1225b4e5e4e5f344e977fcf3ff97339b415c8f520279755266a5c5d9400c658d22109fd98
7
+ data.tar.gz: bfb49e32c7b7906af63618f7931359d4c249012994a1d645a30fd428cbab1dc204ae1d3ad8430d9b84426bf1f62713b67e186a3a7fe3c643d3eff7cd1fd6d954
data/doc/further/change.html CHANGED
@@ -7,6 +7,12 @@
7
7
  <body>
8
8
  <h1>Changelog</h1>
9
9
 
10
+ August 5, 2014 - bake-toolkit 1.6.1<br>
11
+ <ul>
12
+ <li><b>Added: Fixed variable substitution</b>
13
+ </b>
14
+ </ul>
15
+
10
16
  August 1, 2014 - bake-toolkit 1.6.0<br>
11
17
  <ul>
12
18
  <li><b>Added: The value of a variable can be the result of a command line</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.6.0</td><td align="right">August 1, 2014</td></tr></table>
75
+ <table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 1.6.1</td><td align="right">August 5, 2014</td></tr></table>
76
76
 
77
77
  </body>
78
78
 
data/lib/bake/subst.rb CHANGED
@@ -25,33 +25,31 @@ module Cxxproject
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
28
+ if (s.value != "" and s.cmd != "")
29
+ Printer.printError "Error: #{config.file_name}(#{s.line_number}): value and cmd attributes must be used exclusively"
30
+ ExitHelper.exit(1)
31
+ end
32
+
33
+ if (s.value != "")
34
+ @@userVarMap[s.name] = substString(s.value)
35
+ else
36
+ cmd_result = false
37
+ begin
38
+ rd, wr = IO.pipe
39
+ cmd = [s.cmd]
40
+ cmd << {
41
+ :err=>wr,
42
+ :out=>wr
43
+ }
44
+ cmd_result, consoleOutput = ProcessHelper.safeExecute() { sp = spawn(*cmd); ProcessHelper.readOutput(sp, rd, wr) }
45
+ @@userVarMap[s.name] = consoleOutput.chomp
46
+ rescue
47
+ end
48
+ if (cmd_result == false)
49
+ Printer.printWarning "Warning: #{config.file_name}(#{s.line_number}): command not successful, variable #{s.name} wil be set to \"\""
50
+ @@userVarMap[s.name] = ""
51
+ end
52
+ end
55
53
 
56
54
 
57
55
  end
data/lib/bake/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Cxxproject
2
2
  class Version
3
3
  def self.bake
4
- "1.6.0"
4
+ "1.6.1"
5
5
  end
6
6
  end
7
7
 
metadata CHANGED
@@ -1,20 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bake-toolkit
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.0
5
- prerelease:
4
+ version: 1.6.1
6
5
  platform: ruby
7
6
  authors:
8
7
  - Alexander Schaal
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2014-08-01 00:00:00.000000000 Z
11
+ date: 2014-08-05 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: cxxproject
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - '='
20
18
  - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - '='
28
25
  - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: rtext
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
31
  - - '='
36
32
  - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
38
  - - '='
44
39
  - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: rgen
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
45
  - - '='
52
46
  - !ruby/object:Gem::Version
@@ -54,14 +48,12 @@ dependencies:
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
52
  - - '='
60
53
  - !ruby/object:Gem::Version
61
54
  version: 0.6.0
62
- description: ! ' This build tool is used to compile projects fast and easy.
63
-
64
- '
55
+ description: |2
56
+ This build tool is used to compile projects fast and easy.
65
57
  email: alexander.schaal@esrlabs.com
66
58
  executables:
67
59
  - bake
@@ -112,24 +104,24 @@ files:
112
104
  - doc/eclipse/build/buildMain.png
113
105
  - doc/eclipse/build/console.png
114
106
  - doc/eclipse/build/problem.png
107
+ - doc/eclipse/export.html
115
108
  - doc/eclipse/export/Script.png
116
109
  - doc/eclipse/export/Select.png
117
- - doc/eclipse/export.html
110
+ - doc/eclipse/import.html
118
111
  - doc/eclipse/import/Import.png
119
112
  - doc/eclipse/import/Select.png
120
- - doc/eclipse/import.html
113
+ - doc/eclipse/install.html
121
114
  - doc/eclipse/install/AddRepository.png
122
115
  - doc/eclipse/install/AvailableSoftware.png
123
116
  - doc/eclipse/install/InstallNewSoftware.png
124
117
  - doc/eclipse/install/Licenses.png
125
118
  - doc/eclipse/install/Restart.png
126
119
  - doc/eclipse/install/TrustMe.png
127
- - doc/eclipse/install.html
128
120
  - doc/eclipse/misc/pref.png
121
+ - doc/eclipse/new.html
129
122
  - doc/eclipse/new/New.png
130
123
  - doc/eclipse/new/Result.png
131
124
  - doc/eclipse/new/Select.png
132
- - doc/eclipse/new.html
133
125
  - doc/eclipse/select/FirstSelect.png
134
126
  - doc/eclipse/select/SecondSelect.png
135
127
  - doc/eclipse/select/WrongSelect.png
@@ -147,19 +139,19 @@ files:
147
139
  - doc/syntax/derive.html
148
140
  - doc/syntax/subst.html
149
141
  - doc/syntax/syntax.html
150
- - doc/vs/create/cvsp.png
151
142
  - doc/vs/create.html
143
+ - doc/vs/create/cvsp.png
144
+ - doc/vs/install.html
152
145
  - doc/vs/install/install1.png
153
146
  - doc/vs/install/install2010.png
154
147
  - doc/vs/install/installed.png
155
148
  - doc/vs/install/site.png
156
149
  - doc/vs/install/update.png
157
- - doc/vs/install.html
150
+ - doc/vs/use.html
158
151
  - doc/vs/use/error.png
159
152
  - doc/vs/use/options.png
160
153
  - doc/vs/use/select.png
161
154
  - doc/vs/use/show.png
162
- - doc/vs/use.html
163
155
  - license.txt
164
156
  - bin/bake
165
157
  - bin/bakery
@@ -168,6 +160,7 @@ files:
168
160
  homepage: http://www.esrlabs.com
169
161
  licenses:
170
162
  - MIT
163
+ metadata: {}
171
164
  post_install_message:
172
165
  rdoc_options:
173
166
  - -x
@@ -175,21 +168,19 @@ rdoc_options:
175
168
  require_paths:
176
169
  - lib
177
170
  required_ruby_version: !ruby/object:Gem::Requirement
178
- none: false
179
171
  requirements:
180
- - - ! '>='
172
+ - - '>='
181
173
  - !ruby/object:Gem::Version
182
174
  version: '0'
183
175
  required_rubygems_version: !ruby/object:Gem::Requirement
184
- none: false
185
176
  requirements:
186
- - - ! '>='
177
+ - - '>='
187
178
  - !ruby/object:Gem::Version
188
179
  version: '0'
189
180
  requirements: []
190
181
  rubyforge_project:
191
- rubygems_version: 1.8.24
182
+ rubygems_version: 2.0.14
192
183
  signing_key:
193
- specification_version: 3
184
+ specification_version: 4
194
185
  summary: Frontend for cxxproject.
195
186
  test_files: []