bake-toolkit 1.0.22 → 1.0.23
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/bake/util.rb +4 -4
- data/lib/bake/version.rb +2 -2
- data/lib/tocxx.rb +1 -1
- metadata +3 -3
data/lib/bake/util.rb
CHANGED
@@ -6,15 +6,15 @@ require 'cxxproject/utils/exit_helper'
|
|
6
6
|
require 'cxxproject/utils/utils'
|
7
7
|
|
8
8
|
def adjustFlags(orgStr, flags)
|
9
|
-
orgSplitted = Cxxproject::Utils::flagSplit(orgStr)
|
9
|
+
orgSplitted = Cxxproject::Utils::flagSplit(orgStr, false)
|
10
10
|
|
11
11
|
flags.each do |f|
|
12
12
|
if f.overwrite != ""
|
13
|
-
orgSplitted = Cxxproject::Utils::flagSplit(f.overwrite)
|
13
|
+
orgSplitted = Cxxproject::Utils::flagSplit(f.overwrite, false)
|
14
14
|
end
|
15
15
|
|
16
16
|
if f.remove != ""
|
17
|
-
rmSplitted = Cxxproject::Utils::flagSplit(f.remove)
|
17
|
+
rmSplitted = Cxxproject::Utils::flagSplit(f.remove, false)
|
18
18
|
orgSplitted.delete_if {|o| rmSplitted.any? { |r|
|
19
19
|
begin
|
20
20
|
o.match("\\A"+r+"\\Z")
|
@@ -26,7 +26,7 @@ def adjustFlags(orgStr, flags)
|
|
26
26
|
end
|
27
27
|
|
28
28
|
if f.add != ""
|
29
|
-
Cxxproject::Utils::flagSplit(f.add).each do |a|
|
29
|
+
Cxxproject::Utils::flagSplit(f.add, false).each do |a|
|
30
30
|
orgSplitted << a unless orgSplitted.any? { |o| o==a }
|
31
31
|
end
|
32
32
|
end
|
data/lib/bake/version.rb
CHANGED
data/lib/tocxx.rb
CHANGED
@@ -240,7 +240,7 @@ module Cxxproject
|
|
240
240
|
potentialProjs.concat(Dir.glob(r+"/**{,/*/**}/Project.meta"))
|
241
241
|
end
|
242
242
|
|
243
|
-
potentialProjs.uniq
|
243
|
+
potentialProjs = potentialProjs.uniq.sort unless potentialProjs.empty?
|
244
244
|
|
245
245
|
while project2config_pending.length > 0
|
246
246
|
|
metadata
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
name: bake-toolkit
|
3
3
|
version: !ruby/object:Gem::Version
|
4
4
|
prerelease:
|
5
|
-
version: 1.0.
|
5
|
+
version: 1.0.23
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Alexander Schaal
|
@@ -10,7 +10,7 @@ autorequire:
|
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
12
|
|
13
|
-
date: 2013-
|
13
|
+
date: 2013-09-09 00:00:00 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: cxxproject
|
@@ -20,7 +20,7 @@ dependencies:
|
|
20
20
|
requirements:
|
21
21
|
- - "="
|
22
22
|
- !ruby/object:Gem::Version
|
23
|
-
version: 0.5.
|
23
|
+
version: 0.5.68
|
24
24
|
type: :runtime
|
25
25
|
version_requirements: *id001
|
26
26
|
- !ruby/object:Gem::Dependency
|