dev 1.0.124 → 1.0.125
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/dev/Defaults.rb +37 -22
- data/lib/dev/Project.rb +33 -6
- metadata +1 -1
data/lib/dev/Defaults.rb
CHANGED
@@ -1,27 +1,42 @@
|
|
1
1
|
module Dev
|
2
|
-
class Defaults
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
begin
|
7
|
-
return get_default_value_src_glob if key=="src_glob"
|
8
|
-
return get_default_value_toolset if key=="toolset"
|
9
|
-
return get_default_value_name if key=="name"
|
10
|
-
return get_default_value_directory if key=="directory"
|
11
|
-
return get_default_value_type if key=="type"
|
12
|
-
rescue
|
13
|
-
return nil
|
14
|
-
end
|
2
|
+
class Defaults < Hash
|
3
|
+
|
4
|
+
def initialize(args)
|
5
|
+
args = defaults.merge(args)
|
15
6
|
end
|
16
7
|
|
17
|
-
def
|
18
|
-
|
19
|
-
|
8
|
+
def defaults
|
9
|
+
{
|
10
|
+
:src_glob => "**/{*.{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
|
+
:toolset => Dev::BoostBuild.defaultToolset,
|
12
|
+
:name => get_default_value_name,
|
13
|
+
:directory => Rake.original_dir(),
|
14
|
+
:type => get_default_value_type
|
15
|
+
}
|
20
16
|
end
|
21
17
|
|
22
|
-
|
23
|
-
|
24
|
-
|
18
|
+
#attr_accessor :project
|
19
|
+
|
20
|
+
# def get_default_value(key)
|
21
|
+
# begin
|
22
|
+
# return get_default_value_src_glob if key=="src_glob"
|
23
|
+
# return get_default_value_toolset if key=="toolset"
|
24
|
+
# return get_default_value_name if key=="name"
|
25
|
+
# return get_default_value_directory if key=="directory"
|
26
|
+
# return get_default_value_type if key=="type"
|
27
|
+
# rescue
|
28
|
+
# return nil
|
29
|
+
# end
|
30
|
+
# end
|
31
|
+
|
32
|
+
#def get_default_value_src_glob
|
33
|
+
#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}"
|
34
|
+
#return value
|
35
|
+
#end
|
36
|
+
|
37
|
+
#def get_default_value_toolset
|
38
|
+
# return Dev::BoostBuild.defaultToolset
|
39
|
+
#end
|
25
40
|
|
26
41
|
def get_default_value_name
|
27
42
|
dirs=Rake.original_dir().split('/')
|
@@ -29,9 +44,9 @@ class Defaults
|
|
29
44
|
return nil
|
30
45
|
end
|
31
46
|
|
32
|
-
def get_default_value_directory
|
33
|
-
|
34
|
-
end
|
47
|
+
#def get_default_value_directory
|
48
|
+
# return Rake.original_dir()
|
49
|
+
#end
|
35
50
|
|
36
51
|
def get_default_value_type
|
37
52
|
Dir.glob("**/*.{cpp,hpp}").each { |f| return "c++" }
|
data/lib/dev/Project.rb
CHANGED
@@ -7,11 +7,37 @@ module Dev
|
|
7
7
|
class Project < Hash
|
8
8
|
|
9
9
|
def initialize(hash,init_defaults=true)
|
10
|
+
hash = Hash.new if hash.nil?
|
11
|
+
hash = defaults.merge(hash)
|
10
12
|
puts_debug "initialize, copying hash values"
|
11
13
|
hash.each { |name,value| self[name]=value } if !hash.nil?
|
12
14
|
update_default_values if init_defaults
|
13
15
|
end
|
14
16
|
|
17
|
+
def defaults
|
18
|
+
{
|
19
|
+
:src_glob => "**/{*.{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}",
|
20
|
+
:toolset => Dev::BoostBuild.defaultToolset,
|
21
|
+
:name => get_default_value_name,
|
22
|
+
:directory => Rake.original_dir(),
|
23
|
+
:type => get_default_value_type
|
24
|
+
}
|
25
|
+
end
|
26
|
+
|
27
|
+
def get_default_value_name
|
28
|
+
dirs=Rake.original_dir().split('/')
|
29
|
+
return dirs[dirs.length-2] if(dirs.length > 3)
|
30
|
+
return nil
|
31
|
+
end
|
32
|
+
|
33
|
+
def get_default_value_type
|
34
|
+
Dir.glob("**/*.{cpp,hpp}").each { |f| return "c++" }
|
35
|
+
Dir.glob("**/*.{c,h}").each { |f| return "c" }
|
36
|
+
Dir.glob("**/*.{cs}").each { |f| return "C#" }
|
37
|
+
Dir.glob("**/*.{gemspec}").each { |f| return "gem" }
|
38
|
+
return "ruby"
|
39
|
+
end
|
40
|
+
|
15
41
|
def update_keys
|
16
42
|
self.each{ |name,value| self[name]=value }
|
17
43
|
end
|
@@ -296,12 +322,13 @@ class Project < Hash
|
|
296
322
|
value="#{Dev::Environment.dev_root}" if key=="dev_root"
|
297
323
|
#value="C#" if key=="type"
|
298
324
|
|
299
|
-
defaults = Defaults.new
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
value=defaults.get_default_value(key) if key=="
|
304
|
-
value=defaults.get_default_value(key) if key=="
|
325
|
+
#defaults = Defaults.new
|
326
|
+
#merge(defaults)
|
327
|
+
#value=defaults.get_default_value(key) if key=="src_glob"
|
328
|
+
#value=defaults.get_default_value(key) if key=="toolset"
|
329
|
+
#value=defaults.get_default_value(key) if key=="name"
|
330
|
+
#value=defaults.get_default_value(key) if key=="directory"
|
331
|
+
#value=defaults.get_default_value(key) if key=="type"
|
305
332
|
|
306
333
|
value=loc_total if key=="loc"
|
307
334
|
value="svn" if key=="scm_type" && File.exists?(".svn")
|