dev 2.0.177 → 2.0.178
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/apps/wix.rb +13 -14
- data/lib/tasks/build.rb +15 -3
- data/lib/tasks/commit.rb +5 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 92fb08120b4e87298b76a2a39f5ebd6643cbabbc
|
4
|
+
data.tar.gz: 1849a0a2dbd29632317ae1de1178994ef0a7b4bc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9a6cf9ca0fc8d9659adb0fce7095a2beb363bd313b8e179360ddb778b9a8f0248b6963d569f8c183188f7400a6d811af47141d74c453286316c59690294bf52b
|
7
|
+
data.tar.gz: 68b3fc625506ebab17f13c132fe7cfe6b7eaa0966ab3ab84c0858db771742ddef45d1d0e30a58325f3ba7b1c870269a29cb0f706b395fc5ca5e76aeca7611168
|
data/lib/apps/wix.rb
CHANGED
@@ -10,21 +10,20 @@ class Wix
|
|
10
10
|
build_commands=Array.new if build_commands.nil?
|
11
11
|
build_commands << "candle #{wxs_file}"
|
12
12
|
|
13
|
-
if(wxs_file.include?('
|
13
|
+
if(IO.read(wxs_file).include?('<Project'))
|
14
14
|
if(defined?(VERSION))
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
#puts `"#{light}" HelloConsole.wixobj`
|
15
|
+
build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.msi"
|
16
|
+
else
|
17
|
+
build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj"
|
18
|
+
end
|
19
|
+
end
|
20
|
+
if(IO.read(wxs_file).include?('<Bundle'))
|
21
|
+
if(defined?(VERSION))
|
22
|
+
build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.exe -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
|
23
|
+
else
|
24
|
+
build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
|
25
|
+
end
|
26
|
+
end
|
28
27
|
end
|
29
28
|
build_commands
|
30
29
|
end
|
data/lib/tasks/build.rb
CHANGED
@@ -36,12 +36,24 @@ class Build < Array
|
|
36
36
|
}
|
37
37
|
|
38
38
|
WXS_FILES.each{|wxs_file|
|
39
|
-
|
40
|
-
|
39
|
+
if(IO.read(wxs_file).include?('<Project'))
|
40
|
+
build_commands = Wix.get_build_commands wxs_file
|
41
|
+
if(!build_commands.nil?)
|
41
42
|
build_commands.each{|c|
|
42
43
|
self.add c
|
43
44
|
}
|
44
|
-
|
45
|
+
end
|
46
|
+
end
|
47
|
+
}
|
48
|
+
WXS_FILES.each{|wxs_file|
|
49
|
+
if(IO.read(wxs_file).include?('<Bundle'))
|
50
|
+
build_commands = Wix.get_build_commands wxs_file
|
51
|
+
if(!build_commands.nil?)
|
52
|
+
build_commands.each{|c|
|
53
|
+
self.add c
|
54
|
+
}
|
55
|
+
end
|
56
|
+
end
|
45
57
|
}
|
46
58
|
end
|
47
59
|
end
|
data/lib/tasks/commit.rb
CHANGED
@@ -1,7 +1,11 @@
|
|
1
1
|
puts __FILE__ if defined?(DEBUG)
|
2
2
|
|
3
3
|
desc 'commits source files to git or subversion'
|
4
|
-
|
4
|
+
if(File.exists?('git'))
|
5
|
+
task :commit=>[:add] do Tasks.execute_task :commit; end
|
6
|
+
else
|
7
|
+
task :commit do Tasks.execute_task :commit;end
|
8
|
+
end
|
5
9
|
|
6
10
|
class Commit < Array
|
7
11
|
def update
|