wixgem 0.100.0 → 0.101.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f49e74125e346acac818843bed5bdadc06b61d52ef2becf206e879d945c46663
-  data.tar.gz: bfe2da0d978b3c1e13600f6bf5569ded3331b632a9ddcfb8bb4a7def4174a271
+  metadata.gz: 70fff3f2b7853ffbf998291a4f42b17dea04115ed8780547f34d98cc29ed4272
+  data.tar.gz: 3128cf0f064cb38343715c3800b4314411b67ac81e538ac1d4f92eb334aca71d
 SHA512:
-  metadata.gz: b1bc863cb16f90ed4fb4f6768b9487a225ae7b9fd190bd1295109534b6f6c037982524a4134d09cbce679637c5c4228b50576dbd3124dbdbe9b08abde5315f90
-  data.tar.gz: c241bd8ef6d4693d04b5b85ae111815abe328c5ee694d4f107140d67282c4bcf67bf8f201a5ce7382378cd913c6a87ea2a379055a66f31bb006d5555df92686f
+  metadata.gz: 2d15118a3c65ce4a52f380e37bfb31168292b0b0f0591cfd5961013151af9edab44d33e8d08e03f9bf054bbc732053b125e854d17f871485d08292d4c750d825
+  data.tar.gz: 7c9e359a26d982dc88293eada688751ad4e3df3d3746f4df44bc1f409fa5cacbb0a2a22c23b931dd40c86b7ad4e8a9f9f07c53939d8702f84b624d167b6769a9

data/lib/wixgem.rb

@@ -356,20 +356,24 @@ class Wix
   
   def self.modify_heat_commandline(input, cmd)
   	cmd = cmd.gsub(/-srd/, '-svb6 -srd') if(input.has_key?(:has_vb6_files) && input[:has_vb6_files])
-	  cmd = cmd.gsub(/-srd/, '-sreg -srd') if(input.has_key?(:suppress_registry_harvesting) && input[:suppress_registry_harvesting])
-	  cmd = cmd.gsub(/-srd/, '-scom -srd') if(input.has_key?(:suppress_COM_elements) && input[:suppress_COM_elements])
-	  if(input[:msi?])
-	    cmd = cmd.gsub(/-srd/, '-dr INSTALLDIR -srd') 
-	  else
-	    cmd = cmd.gsub(/-srd/, '-dr MergeRedirectFolder -srd') 
-	  end
-	  return cmd
+	cmd = cmd.gsub(/-srd/, '-sreg -srd') if(input.has_key?(:suppress_registry_harvesting) && input[:suppress_registry_harvesting])
+	cmd = cmd.gsub(/-srd/, '-scom -srd') if(input.has_key?(:suppress_COM_elements) && input[:suppress_COM_elements])
+	if(input[:msi?])
+	  cmd = cmd.gsub(/-srd/, '-dr INSTALLDIR -srd') 
+	else
+	  cmd = cmd.gsub(/-srd/, '-dr MergeRedirectFolder -srd') 
+	end
+	return cmd
   end
 
-  def self.execute_heat(input, cmd_line_options)		  
-	  heat_cmd = Execute.new("\"#{install_path.gsub(/\\/,'/')}/bin/heat.exe\" #{modify_heat_commandline(input, cmd_line_options)}", { quiet: true })
-	  heat_cmd.execute	
-	  log_wix_output(heat_cmd)
+  def self.execute_heat(input, cmd_line_options)	
+	wix_install_path=install_path.gsub(/\\/,'/');
+	wix_bin_dir = "#{wix_install_path}/bin"
+	wix_bin_dir = "#{wix_install_path}/tools" unless(Dir.exists?(wix_bin_dir))
+
+	heat_cmd = Execute.new("\"#{wix_bin_dir}/heat.exe\" #{modify_heat_commandline(input, cmd_line_options)}", { quiet: true })
+	heat_cmd.execute	
+	log_wix_output(heat_cmd)
   end
   
   def self.execute_heat_file(wxs_file, input, template_option)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.100.0
+  version: 0.101.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-06 00:00:00.000000000 Z
+date: 2019-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execute
@@ -131,6 +131,8 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- example/example.msi
+- example/example.msm
 - example/install_files/directory/file2.txt
 - example/install_files/file1.txt
 - example/rakefile.rb