dev 1.0.212 → 1.0.213
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/dev/Paths.rb +16 -43
- metadata +1 -1
data/lib/dev/Paths.rb
CHANGED
|
@@ -21,55 +21,28 @@ class Paths < Hash
|
|
|
21
21
|
self[:vs10]=dev if File.exists?(dev) && self[:vs10].nil?
|
|
22
22
|
dev="C:/Program Files (x86)/Microsoft Visual Studio 11.0/Common7/IDE/devenv.exe"
|
|
23
23
|
self[:vs11]=dev if File.exists?(dev) && self[:vs11].nil?
|
|
24
|
+
dev="C:/Program Files (x86)/Microsoft Visual Studio 12.0/Common7/IDE/devenv.exe"
|
|
25
|
+
self[:vs12]=dev if File.exists?(dev) && self[:vs12].nil?
|
|
24
26
|
end
|
|
25
27
|
|
|
26
28
|
def initialize_nunit
|
|
29
|
+
puts_debug "Paths::initialize_nunit"
|
|
27
30
|
nunit=""
|
|
28
31
|
nunitx86=""
|
|
29
|
-
nunit_bin=""
|
|
30
|
-
Dir.glob("#{Rake.original_dir()}/**/*.csproj").each { |f|
|
|
31
|
-
text=File.read(f)
|
|
32
|
-
text.scan(/dep\\([\w\d.\-\\]+)\\bin\\[\w\d.\-\\]+\\nunit.framework.dll/).each{ | nunit_bin_match |
|
|
33
|
-
tmp="#{Dev::Environment::dev_root}/dep/#{nunit_bin_match[0].to_s.gsub('\\','/')}"
|
|
34
|
-
nunit_bin=tmp if File.exists?(tmp)
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
nunit="#{nunit_bin}/bin/nunit-console.exe" if nunit_bin.length > 3 && File.exists?("#{nunit_bin}/bin/nunit-console.exe")
|
|
39
|
-
nunitx86="#{nunit_bin}/bin/nunit-console-x86.exe" if nunit_bin.length > 3 && File.exists?("#{nunit_bin}/bin/nunit-console-x86.exe")
|
|
40
|
-
|
|
41
|
-
# Z:\dep\ThirdParty\NUnit\2.5.10.11092\bin\net-2.0
|
|
42
|
-
if nunit.length==0 || !File.exists?(nunit)
|
|
43
|
-
["2.6.0.12051","2.5.10.11092"].each{ |v|
|
|
44
|
-
Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/nunit-console.exe").each{|f|
|
|
45
|
-
nunit=f if File.exists?(f) && self[:nunit].nil?
|
|
46
|
-
}
|
|
47
|
-
if( !self.has_key?(:nunit) )
|
|
48
|
-
Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/*/nunit-console.exe").each{|f|
|
|
49
|
-
self[:nunit]=f if File.exists?(f) && self[:nunit].nil?
|
|
50
|
-
}
|
|
51
|
-
end
|
|
52
32
|
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
nunitx86=f if File.exists?(f) && self[:nunitx86].nil?
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
end
|
|
70
|
-
|
|
71
|
-
nunit=nunitx86 if !File.exists?(nunit)
|
|
72
|
-
self[:nunit_bin]=nunit_bin
|
|
33
|
+
["2.6.0.12051/bin","2.5.10.11092/bin/net-2.0"].each{ |v|
|
|
34
|
+
if nunit.length==0
|
|
35
|
+
Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/nunit-console.exe").each{|f|
|
|
36
|
+
if nunit.length==0
|
|
37
|
+
puts_debug("NUnit file located: #{f}")
|
|
38
|
+
nunitx86=f.gsub("nunit-console.exe","nunit-console-x86.exe")
|
|
39
|
+
nunit=f if(File.exists?(nunitx86))
|
|
40
|
+
nunitx86="" if(!File.exists?(nunitx86))
|
|
41
|
+
end
|
|
42
|
+
}
|
|
43
|
+
end
|
|
44
|
+
}
|
|
45
|
+
|
|
73
46
|
self[:nunit]=nunit
|
|
74
47
|
self[:nunitx86]=nunitx86
|
|
75
48
|
end
|