dev 2.0.257 → 2.0.258
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/apps/wix.rb +3 -1
- data/lib/base/environment.rb +10 -0
- 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: 9c5d3d0f0c93b7a5fe47925dd8c48fc4a6b44f9b
|
|
4
|
+
data.tar.gz: b1234a565c3ff71e0911d80d5266c96810b78df6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3b460ee9b9f6876449bb36f05211cf9c9dcf8bb91f8b9f3eac0390b1324cf20fd608b154999df81b7f560895eb129746433fa50a2d11adb564e37117c0cfc57f
|
|
7
|
+
data.tar.gz: f77051c7b994dc2d5af89590f4541bc5715f31b4f15d572b70139449bd61fc83b55dafaee886259f7b831a5d552980982f1ee0885cc831858b1d7a94c012445a
|
data/lib/apps/wix.rb
CHANGED
|
@@ -7,11 +7,13 @@ class Wix
|
|
|
7
7
|
def self.get_build_commands wxs_file
|
|
8
8
|
build_commands=nil
|
|
9
9
|
if(File.exists?(wxs_file))
|
|
10
|
+
ext='msi'
|
|
11
|
+
ext='exe' if(IO.read(wxs_file).include?('<Bundle'))
|
|
10
12
|
build_commands=Array.new if build_commands.nil?
|
|
11
13
|
build_commands << "candle #{wxs_file} -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
|
|
12
14
|
|
|
13
15
|
if(defined?(VERSION))
|
|
14
|
-
build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}
|
|
16
|
+
build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.#{ext} -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
|
|
15
17
|
else
|
|
16
18
|
build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
|
|
17
19
|
end
|
data/lib/base/environment.rb
CHANGED
|
@@ -46,6 +46,16 @@ class Environment < Hash
|
|
|
46
46
|
return machine.strip
|
|
47
47
|
end
|
|
48
48
|
|
|
49
|
+
def self.remove directory
|
|
50
|
+
if(File.exists?(directory))
|
|
51
|
+
begin
|
|
52
|
+
FileUtils.rm_rf directory
|
|
53
|
+
FileUtils.rm_r directory
|
|
54
|
+
rescue
|
|
55
|
+
end
|
|
56
|
+
end
|
|
57
|
+
end
|
|
58
|
+
|
|
49
59
|
def self.user
|
|
50
60
|
return ENV['USER'] if !ENV['USER'].nil? #on Unix
|
|
51
61
|
ENV['USERNAME']
|