bake-toolkit 1.6.1 → 1.6.2
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/doc/further/change.html +8 -0
- data/doc/index.html +1 -1
- data/lib/bake/subst.rb +24 -6
- data/lib/bake/version.rb +1 -1
- data/lib/tocxx.rb +2 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 86770dcd3c254e91ac9b6565abefd0bed2e233ae
|
|
4
|
+
data.tar.gz: 7f9093b46129744f2fc2d8559e308f0af40eff70
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6574f6498327ce5ec7c935634b88fd520a55e208abc5430c0e044f78b0e6188963b332b05675ea67d0561a03584b096ad9224427630fc0bd5f7dc5062b35c3e4
|
|
7
|
+
data.tar.gz: d2fb32ad2f1a19f98698224db8dc94166d177bdf5eafa213cbe4dd1dde7f9c4fac1bed1be1b7390e7a32a82d546d533372f8c15882cc15bf4a932f0f3d7106b6
|
data/doc/further/change.html
CHANGED
|
@@ -7,6 +7,14 @@
|
|
|
7
7
|
<body>
|
|
8
8
|
<h1>Changelog</h1>
|
|
9
9
|
|
|
10
|
+
August 6, 2014 - bake-toolkit 1.6.2<br>
|
|
11
|
+
<ul>
|
|
12
|
+
<li><b>Fixed: clear clearn- and clobber-lists at startup</b>
|
|
13
|
+
<li><b>Fixed: Variables not substituted in ArtifactName and ArtifactNameBase</b>
|
|
14
|
+
<li><b>Added: Cyclic variable substitution</b>
|
|
15
|
+
</b>
|
|
16
|
+
</ul>
|
|
17
|
+
|
|
10
18
|
August 5, 2014 - bake-toolkit 1.6.1<br>
|
|
11
19
|
<ul>
|
|
12
20
|
<li><b>Added: Fixed variable substitution</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.
|
|
75
|
+
<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 1.6.2</td><td align="right">August 6, 2014</td></tr></table>
|
|
76
76
|
|
|
77
77
|
</body>
|
|
78
78
|
|
data/lib/bake/subst.rb
CHANGED
|
@@ -23,8 +23,9 @@ module Cxxproject
|
|
|
23
23
|
end
|
|
24
24
|
|
|
25
25
|
@@userVarMap = {} if isMainProj
|
|
26
|
+
|
|
26
27
|
config.set.each do |s|
|
|
27
|
-
|
|
28
|
+
|
|
28
29
|
if (s.value != "" and s.cmd != "")
|
|
29
30
|
Printer.printError "Error: #{config.file_name}(#{s.line_number}): value and cmd attributes must be used exclusively"
|
|
30
31
|
ExitHelper.exit(1)
|
|
@@ -41,20 +42,36 @@ module Cxxproject
|
|
|
41
42
|
:err=>wr,
|
|
42
43
|
:out=>wr
|
|
43
44
|
}
|
|
44
|
-
|
|
45
|
+
consoleOutput = ""
|
|
46
|
+
Dir.chdir(@@projDir) do
|
|
47
|
+
cmd_result, consoleOutput = ProcessHelper.safeExecute() { sp = spawn(*cmd); ProcessHelper.readOutput(sp, rd, wr) }
|
|
48
|
+
end
|
|
45
49
|
@@userVarMap[s.name] = consoleOutput.chomp
|
|
46
50
|
rescue
|
|
47
51
|
end
|
|
48
52
|
if (cmd_result == false)
|
|
49
|
-
Printer.printWarning "Warning: #{config.file_name}(#{s.line_number}): command not successful, variable #{s.name} wil be set to \"\""
|
|
53
|
+
Printer.printWarning "Warning: #{config.file_name}(#{s.line_number}): command not successful, variable #{s.name} wil be set to \"\" (#{consoleOutput.chomp})."
|
|
50
54
|
@@userVarMap[s.name] = ""
|
|
51
55
|
end
|
|
52
56
|
end
|
|
53
57
|
|
|
54
|
-
|
|
55
58
|
end
|
|
56
|
-
|
|
57
|
-
|
|
59
|
+
|
|
60
|
+
@@resolvedVars = 0
|
|
61
|
+
3.times {subst(config)}
|
|
62
|
+
|
|
63
|
+
@@resolvedVars = 0
|
|
64
|
+
lastFoundInVar = -1
|
|
65
|
+
100.times do
|
|
66
|
+
subst(config)
|
|
67
|
+
break if @@resolvedVars == 0 or (@@resolvedVars >= lastFoundInVar and lastFoundInVar >= 0)
|
|
68
|
+
lastFoundInVar = @@resolvedVars
|
|
69
|
+
end
|
|
70
|
+
if (@@resolvedVars > 0)
|
|
71
|
+
Printer.printError "Error: #{config.file_name}: cyclic variable substitution detected"
|
|
72
|
+
ExitHelper.exit(1)
|
|
73
|
+
end
|
|
74
|
+
|
|
58
75
|
end
|
|
59
76
|
|
|
60
77
|
def self.substString(str)
|
|
@@ -67,6 +84,7 @@ module Cxxproject
|
|
|
67
84
|
break if posEnd.nil?
|
|
68
85
|
substStr << str[posSubst..posStart-1] if posStart>0
|
|
69
86
|
|
|
87
|
+
@@resolvedVars += 1
|
|
70
88
|
var = str[posStart+2..posEnd-1]
|
|
71
89
|
|
|
72
90
|
if @@userVarMap.has_key?(var)
|
data/lib/bake/version.rb
CHANGED
data/lib/tocxx.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bake-toolkit
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.6.
|
|
4
|
+
version: 1.6.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Alexander Schaal
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-08-
|
|
11
|
+
date: 2014-08-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: cxxproject
|