wixgem 0.84.0 → 0.85.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f903e98ba851435dde4f9a8d002455b1f85341d
-  data.tar.gz: 0579fd5fb3f257d9bf7d172cebd9f2463dc55f99
+  metadata.gz: 1e9fba9df10db66dcd5cc373c926a1a5f8276a84
+  data.tar.gz: 9e8f3ff5377249c08b63ee3c7682b591b4cdeb76
 SHA512:
-  metadata.gz: 84d696956ef7cb66ee5e711f7ab24b45aa212ccbbdab504a7ef196bc7714b4c4981844b6c350fb7b18e43af74ff38af5c9f30bfaa4f6106839e6059fe417cfde
-  data.tar.gz: 313a096755a6b651314c8e91fbef7dcec01ec7ca616decd5184b5c7bb432733cb4292cb670c60abc1f496a9fcf487c088b49b69804f1502b50ac77f046bc011a
+  metadata.gz: f50950b69eaed75f1f183123ad5cd208b01f7b22e3a90d8fa09ecabd19392e2fbc31e390c93c5d46b60d149572e801ae3b884bb4c7cb4b8ea6303ca6a456ee0d
+  data.tar.gz: 41bfa1938cde20507f44220e1cf76745bcfbb626863a3e6ca0b7f1d859fc13dd1801ac7b333224cf9ce0cf5cf968600b12c4191b5cc59ada375a9f5d07883b4d

data/lib/custom_action.rb

@@ -9,8 +9,8 @@ class CustomAction
     @input = input
   end
   def add(custom_action)
-    unless(custom_action.key?(:file) || custom_action.key?(:binary_key))
-      raise 'Currently, only supported custom actions work with installed executable or binary key' 
+    unless(custom_action.key?(:file) || custom_action.key?(:binary_key) || custom_action.key?(:property))
+      raise 'Currently, only supported custom actions work with installed executable, binary key, or property' 
 	end
 	
 	file_key=nil
@@ -44,13 +44,25 @@ class CustomAction
 	wix_element = REXML::XPath.match(@xml_doc, "/Wix")[0]
 	fragment = wix_element.add_element 'Fragment'
 	
-	action = fragment.add_element 'CustomAction', { 'Id' => id, 'ExeCommand' =>  cmd_line, 'Impersonate' => impersonate, 'Return' => ret, 'HideTarget' => 'no', 'Execute' => execute }
+	action = fragment.add_element 'CustomAction', { 'Id' => id, 'Impersonate' => impersonate, 'Return' => ret, 'HideTarget' => 'no', 'Execute' => execute }
 	if(custom_action.key?(:binary_key))
 	  action.attributes['BinaryKey'] = custom_action[:binary_key]
 	else
 	  action.attributes['FileKey'] = file_key
 	end
+	
+	action.attributes['ExeCommand'] = cmd_line if(custom_action.key?(:exe_command))
+
+	action.attributes['DllEntry'] = custom_action[:dll_entry] if(custom_action.key?(:dll_entry))
 
+	if(custom_action.key?(:property))
+	  raise "Custom action property '#{custom_action[:property]} must have a value!" unless(custom_action.key?(:value))
+	  action.attributes.delete('ExeCommand')
+	  action.attributes.delete('Return')
+	  action.attributes['Property'] = custom_action[:property]
+	  action.attributes['Value'] = custom_action[:value]	  
+	end
+	
     install_execute_sequence = fragment.add_element 'InstallExecuteSequence'
 
 	custom_action[:before] = 'InstallFinalize' if(!custom_action.key?(:after) && !custom_action.key?(:before))

data/lib/wixgem.rb

@@ -339,7 +339,7 @@ class Wix
   end
 
   def self.execute_heat(input, cmd_line_options)		  
-	heat_cmd = CMD.new("\"#{install_path}/bin/heat.exe\" #{modify_heat_commandline(input, cmd_line_options)}", { quiet: true })
+	heat_cmd = CMD.new("\"#{install_path.gsub(/\\/,'/')}/bin/heat.exe\" #{modify_heat_commandline(input, cmd_line_options)}", { quiet: true })
 	heat_cmd.execute	
 	log_wix_output(heat_cmd)
   end
@@ -500,13 +500,13 @@ class Wix
   def self.create_output(wxs_file, input, output)
     wixobj_file = "#{File.basename(wxs_file,'.wxs')}.wixobj"
 	
-	candle_cmd = CMD.new("\"#{install_path}/bin/candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"", { quiet: true })
+	candle_cmd = CMD.new("\"#{install_path.gsub(/\\/,'/')}/bin/candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"", { quiet: true })
 	candle_cmd.execute	
 	log_wix_output(candle_cmd)
 	
 	cmd_args = "-nologo -out \"#{output}\" \"#{wixobj_file}\""
-    cmd_args = "-ext WixUIExtension -cultures:en-us #{cmd_args}" if(input.key?(:ui))
-	light_cmd = CMD.new("\"#{install_path}/bin/light.exe\" #{cmd_args}", { quiet: true })
+    cmd_args = "-ext WixUIExtension -ext WixUtilExtension -cultures:en-us #{cmd_args}"
+	light_cmd = CMD.new("\"#{install_path.gsub(/\\/,'/')}/bin/light.exe\" #{cmd_args}", { quiet: true })
 	light_cmd.execute
 	log_wix_output(light_cmd)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.84.0
+  version: 0.85.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler