wixgem 0.100.0 → 0.101.0

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f49e74125e346acac818843bed5bdadc06b61d52ef2becf206e879d945c46663
4
- data.tar.gz: bfe2da0d978b3c1e13600f6bf5569ded3331b632a9ddcfb8bb4a7def4174a271
3
+ metadata.gz: 70fff3f2b7853ffbf998291a4f42b17dea04115ed8780547f34d98cc29ed4272
4
+ data.tar.gz: 3128cf0f064cb38343715c3800b4314411b67ac81e538ac1d4f92eb334aca71d
5
5
  SHA512:
6
- metadata.gz: b1bc863cb16f90ed4fb4f6768b9487a225ae7b9fd190bd1295109534b6f6c037982524a4134d09cbce679637c5c4228b50576dbd3124dbdbe9b08abde5315f90
7
- data.tar.gz: c241bd8ef6d4693d04b5b85ae111815abe328c5ee694d4f107140d67282c4bcf67bf8f201a5ce7382378cd913c6a87ea2a379055a66f31bb006d5555df92686f
6
+ metadata.gz: 2d15118a3c65ce4a52f380e37bfb31168292b0b0f0591cfd5961013151af9edab44d33e8d08e03f9bf054bbc732053b125e854d17f871485d08292d4c750d825
7
+ data.tar.gz: 7c9e359a26d982dc88293eada688751ad4e3df3d3746f4df44bc1f409fa5cacbb0a2a22c23b931dd40c86b7ad4e8a9f9f07c53939d8702f84b624d167b6769a9
Binary file
Binary file
data/lib/wixgem.rb CHANGED
@@ -356,20 +356,24 @@ class Wix
356
356
 
357
357
  def self.modify_heat_commandline(input, cmd)
358
358
  cmd = cmd.gsub(/-srd/, '-svb6 -srd') if(input.has_key?(:has_vb6_files) && input[:has_vb6_files])
359
- cmd = cmd.gsub(/-srd/, '-sreg -srd') if(input.has_key?(:suppress_registry_harvesting) && input[:suppress_registry_harvesting])
360
- cmd = cmd.gsub(/-srd/, '-scom -srd') if(input.has_key?(:suppress_COM_elements) && input[:suppress_COM_elements])
361
- if(input[:msi?])
362
- cmd = cmd.gsub(/-srd/, '-dr INSTALLDIR -srd')
363
- else
364
- cmd = cmd.gsub(/-srd/, '-dr MergeRedirectFolder -srd')
365
- end
366
- return cmd
359
+ cmd = cmd.gsub(/-srd/, '-sreg -srd') if(input.has_key?(:suppress_registry_harvesting) && input[:suppress_registry_harvesting])
360
+ cmd = cmd.gsub(/-srd/, '-scom -srd') if(input.has_key?(:suppress_COM_elements) && input[:suppress_COM_elements])
361
+ if(input[:msi?])
362
+ cmd = cmd.gsub(/-srd/, '-dr INSTALLDIR -srd')
363
+ else
364
+ cmd = cmd.gsub(/-srd/, '-dr MergeRedirectFolder -srd')
365
+ end
366
+ return cmd
367
367
  end
368
368
 
369
- def self.execute_heat(input, cmd_line_options)
370
- heat_cmd = Execute.new("\"#{install_path.gsub(/\\/,'/')}/bin/heat.exe\" #{modify_heat_commandline(input, cmd_line_options)}", { quiet: true })
371
- heat_cmd.execute
372
- log_wix_output(heat_cmd)
369
+ def self.execute_heat(input, cmd_line_options)
370
+ wix_install_path=install_path.gsub(/\\/,'/');
371
+ wix_bin_dir = "#{wix_install_path}/bin"
372
+ wix_bin_dir = "#{wix_install_path}/tools" unless(Dir.exists?(wix_bin_dir))
373
+
374
+ heat_cmd = Execute.new("\"#{wix_bin_dir}/heat.exe\" #{modify_heat_commandline(input, cmd_line_options)}", { quiet: true })
375
+ heat_cmd.execute
376
+ log_wix_output(heat_cmd)
373
377
  end
374
378
 
375
379
  def self.execute_heat_file(wxs_file, input, template_option)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wixgem
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.100.0
4
+ version: 0.101.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kevin Marshall
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-07-06 00:00:00.000000000 Z
11
+ date: 2019-07-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: execute
@@ -131,6 +131,8 @@ extra_rdoc_files: []
131
131
  files:
132
132
  - LICENSE
133
133
  - README.md
134
+ - example/example.msi
135
+ - example/example.msm
134
136
  - example/install_files/directory/file2.txt
135
137
  - example/install_files/file1.txt
136
138
  - example/rakefile.rb