dev 1.0.103 → 1.0.104
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/dev/Defaults.rb +6 -0
- data/lib/dev/Project.rb +3 -2
- metadata +1 -1
data/lib/dev/Defaults.rb
CHANGED
@@ -4,11 +4,17 @@ class Defaults
|
|
4
4
|
|
5
5
|
def get_default_value(key)
|
6
6
|
return get_default_value_src_glob if key=="src_glob"
|
7
|
+
return get_default_value_toolset if key=="toolset"
|
7
8
|
end
|
8
9
|
|
9
10
|
def get_default_value_src_glob
|
10
11
|
value="**/{*.{rb,feature,spec,cs,c,cpp,h,hpp,csproj,vcproj,snk,vcxproj,sln,filters,xaml,xml,resx,settings,txt,png,bmp,ico},Jamfile,.semver,Gemfile,README,LICENSE}"
|
11
12
|
return value
|
12
13
|
end
|
14
|
+
|
15
|
+
def get_default_value_toolset
|
16
|
+
return Dev::BoostBuild.defaultToolset
|
17
|
+
end
|
18
|
+
|
13
19
|
end # class Defaults
|
14
20
|
end # module Dev
|
data/lib/dev/Project.rb
CHANGED
@@ -291,7 +291,8 @@ class Project < Hash
|
|
291
291
|
|
292
292
|
defaults = Defaults.new
|
293
293
|
value=defaults.get_default_value(key) if key=="src_glob"
|
294
|
-
|
294
|
+
value=defaults.get_default_value(key) if key=="toolset"
|
295
|
+
|
295
296
|
value=loc_total if key=="loc"
|
296
297
|
value="svn" if key=="scm_type" && File.exists?(".svn")
|
297
298
|
value="git" if key=="scm_type" && File.exists?(".git")
|
@@ -464,7 +465,7 @@ class Project < Hash
|
|
464
465
|
self[:type]="C#" if self[:type].nil?
|
465
466
|
|
466
467
|
[ "version","dev_root","src_glob","scm_type",
|
467
|
-
"paths","add","pull","setup","compile","test","features","commit","update" ].each do |k|
|
468
|
+
"paths","add","pull","setup","compile","test","features","commit","update", "toolset" ].each do |k|
|
468
469
|
puts_debug "set_default_value(#{k})"
|
469
470
|
set_default_value(k)
|
470
471
|
end
|