dev 2.0.180 → 2.0.181

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/apps/wix.rb +9 -9
  3. data/lib/tasks/build.rb +1 -1
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bfc1a1de44135ae7eff23f2b999f04a789ce0b25
4
- data.tar.gz: 5e7e8e418209547648187d9d63ab7942a89c7f79
3
+ metadata.gz: 08366890959c0a5edff73dde736754f008a3b1c9
4
+ data.tar.gz: e5669bbbe481f46a6a0a1cfdb5f08b9dd4daac0c
5
5
  SHA512:
6
- metadata.gz: 521521c48d789fa028f4531fba47a365b7139d77979816655f9d31d89cf9fc06568095ace31d1f388c8124e827a732adccb883d74c7e5f8376c93e1a4205221f
7
- data.tar.gz: 55fe31217a31b6dddc8d8b4d982dafb1d0e151833cf1f6ff9dac214ffe6494f95347cbcea4e9b1749a15471f6ab0026353503ca72c1125438fd8a76cb34a751c
6
+ metadata.gz: 91c36446f773c83bab2ce7e7395aacc3a4e7f60c1c7e0abf504d517e76edc83bf4d6bcafb3d17cc6926f3b84de78fd67786b67fd89dbb81dec213ec13f277fa3
7
+ data.tar.gz: b17644f875034b1e82d333c503e7607b5054d975d665f9b90d71f78585c39220e3cd230c8bc3f03a6bd5c1f20ee4eda539b4644f9da1c7ef2417c23297fc1c4a
data/lib/apps/wix.rb CHANGED
@@ -10,20 +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(IO.read(wxs_file).include?('<Product'))
13
+ #if(IO.read(wxs_file).include?('<Product'))
14
14
  if(defined?(VERSION))
15
15
  build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.msi -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
16
16
  else
17
17
  build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
18
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
19
+ #end
20
+ #elsif(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
27
27
  end
28
28
  build_commands
29
29
  end
data/lib/tasks/build.rb CHANGED
@@ -36,7 +36,7 @@ class Build < Array
36
36
  }
37
37
 
38
38
  WXS_FILES.each{|wxs_file|
39
- if(IO.read(wxs_file).include?('<Project'))
39
+ if(IO.read(wxs_file).include?('<Product'))
40
40
  build_commands = Wix.get_build_commands wxs_file
41
41
  if(!build_commands.nil?)
42
42
  build_commands.each{|c|
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: 2.0.180
4
+ version: 2.0.181
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lou Parslow