dev 1.0.23 → 1.0.24
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/dev/Dep.rb +1 -1
- data/lib/dev/MsBuild.rb +4 -0
- data/lib/dev/Project.rb +20 -2
- data/lib/dev/Scm.rb +4 -4
- metadata +8 -7
data/lib/dev/Dep.rb
CHANGED
@@ -48,7 +48,7 @@ class Dep < Hash
|
|
48
48
|
def get_export_command(local_dir)
|
49
49
|
unless self[:uri].nil?
|
50
50
|
uri=Dev::Environment.expand_string_variables(self.get_value("uri"))
|
51
|
-
return "<%Dev::Scm::export('#{uri}','#{local_dir}') unless File.exists?('#{local_dir}')%>"
|
51
|
+
return "<%Dev::Scm::export('#{uri}','#{local_dir}','svn') unless File.exists?('#{local_dir}')%>"
|
52
52
|
end # unless
|
53
53
|
end
|
54
54
|
|
data/lib/dev/MsBuild.rb
ADDED
@@ -0,0 +1,4 @@
|
|
1
|
+
#
|
2
|
+
# C:\WINDOWS\Microsoft.NET\Framework\v3.5\MSBuild.exe vc9/mci.sln /toolsversion:3.5 /property:Configuration=Release /property:Platform=Win32 /l:FileLogger,Microsoft.Build.Engine;logfile=.\log\mci.sln-Release-Build.log
|
3
|
+
# C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe
|
4
|
+
#
|
data/lib/dev/Project.rb
CHANGED
@@ -252,11 +252,12 @@ class Project < Hash
|
|
252
252
|
hash=Hash.new
|
253
253
|
|
254
254
|
if(key=="paths")
|
255
|
-
if(self[:type]=="C#")
|
255
|
+
#if(self[:type]=="C#")
|
256
|
+
hash.set_value("msbuild_vs9","C:/WINDOWS/Microsoft.NET/Framework/v3.5/MSBuild.exe")
|
256
257
|
hash.set_value("msbuild","C:/WINDOWS/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe")
|
257
258
|
nunit_version="2.5.10.11092"
|
258
259
|
hash.set_value("nunit","#{Dev::Environment.dev_root}/dep/ThirdParty/NUnit/#{nunit_version}/bin/net-2.0/nunit-console-x86.exe")
|
259
|
-
end
|
260
|
+
#end
|
260
261
|
end
|
261
262
|
value=hash if hash.length > 0
|
262
263
|
|
@@ -304,6 +305,21 @@ class Project < Hash
|
|
304
305
|
end
|
305
306
|
end
|
306
307
|
Dir.glob("*.csproj").each{|cs|array<<"<paths,msbuild> #{cs} <x86_release_compile_flags>"}
|
308
|
+
|
309
|
+
if self[:type]=="c++"
|
310
|
+
if(!has_key?(:win32_release_compile_flags))
|
311
|
+
self[:win32_release_compile_flags]="/property:Configuration=Release /property:Platform=\"win32\""
|
312
|
+
end
|
313
|
+
Dir.glob("*.sln").each{|sln|
|
314
|
+
slntext=File.read(sln)
|
315
|
+
if(slntext.include?("Format Version 10.00"))
|
316
|
+
array<<"<paths,msbuild_vs9> #{sln} <win32_release_compile_flags>"
|
317
|
+
else
|
318
|
+
array<<"<paths,msbuild> #{sln} <win32_release_compile_flags>"
|
319
|
+
end
|
320
|
+
}
|
321
|
+
end
|
322
|
+
|
307
323
|
end
|
308
324
|
if(key=="test")
|
309
325
|
|
@@ -319,6 +335,8 @@ class Project < Hash
|
|
319
335
|
array << "<paths,nunit> /nologo #{dll_name} /xml:#{dll_name}.nunit-results.xml"
|
320
336
|
}
|
321
337
|
end
|
338
|
+
|
339
|
+
|
322
340
|
end
|
323
341
|
if(key=="features")
|
324
342
|
array << "cucumber features" if File.exists?("features") && Dir.glob("features/**/*.rb").length > 0
|
data/lib/dev/Scm.rb
CHANGED
@@ -3,7 +3,7 @@ class Scm
|
|
3
3
|
attr_accessor :scm_type
|
4
4
|
|
5
5
|
def initialize
|
6
|
-
@scm_type="
|
6
|
+
@scm_type="svn"
|
7
7
|
@scm_type="svn" if File.exists?(".svn")
|
8
8
|
@scm_type="git" if File.exists?(".git")
|
9
9
|
end
|
@@ -16,9 +16,9 @@ class Scm
|
|
16
16
|
false
|
17
17
|
end
|
18
18
|
|
19
|
-
def self.export(remote,local)
|
20
|
-
puts_debug "Scm.export,
|
21
|
-
if remote.include?("svn:")
|
19
|
+
def self.export(remote,local,scm)
|
20
|
+
puts_debug "Scm.export, scm=#{scm}"
|
21
|
+
if remote.include?("svn:") || scm=="svn"
|
22
22
|
local_tmp=local.gsub('@','-')
|
23
23
|
call=Dev::SystemCall.new("svn export #{remote} #{local_tmp}")
|
24
24
|
File.rename(local_tmp,local) if File.exist?(local_tmp)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dev
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.24
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ date: 2012-02-03 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rake
|
16
|
-
requirement: &
|
16
|
+
requirement: &27218292 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *27218292
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: semver
|
27
|
-
requirement: &
|
27
|
+
requirement: &27217740 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *27217740
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: countloc
|
38
|
-
requirement: &
|
38
|
+
requirement: &27217380 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,7 +43,7 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *27217380
|
47
47
|
description: development tasks
|
48
48
|
email: lou.parslow@gmail.com
|
49
49
|
executables:
|
@@ -56,6 +56,7 @@ files:
|
|
56
56
|
- lib/dev/Dep.rb
|
57
57
|
- lib/dev/Environment.rb
|
58
58
|
- lib/dev/Hash.rb
|
59
|
+
- lib/dev/MsBuild.rb
|
59
60
|
- lib/dev/Project.rb
|
60
61
|
- lib/dev/Scm.rb
|
61
62
|
- lib/dev/Svn.rb
|