wixgem 0.99.0 → 0.100.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad604c669315ebac1c9b8b70a76ee956e65b8b3aeec95e92ad952f3b8e185bb7
-  data.tar.gz: 111ab3b46b72aee343a638918dbfce3e6498e5309fe6ceeaa46551f2e1560c5c
+  metadata.gz: f49e74125e346acac818843bed5bdadc06b61d52ef2becf206e879d945c46663
+  data.tar.gz: bfe2da0d978b3c1e13600f6bf5569ded3331b632a9ddcfb8bb4a7def4174a271
 SHA512:
-  metadata.gz: 0b74e4e894a2087ed6f89f8d0ee0b9b5dc03a95f124c7ac9535f40e9847ff7b3cb19cb22deb31329c4e3c68978aa63c94f114f5349cdd9a1e7e2531e0a289a28
-  data.tar.gz: 9da8e9369d947d367d2a704a6aac16ab7f37a96bf790927ef80c77805cff74ff48acf56c682b3b9807f11f142bb9949148ad57d3cddcd3a51ae3da55c8837742
+  metadata.gz: b1bc863cb16f90ed4fb4f6768b9487a225ae7b9fd190bd1295109534b6f6c037982524a4134d09cbce679637c5c4228b50576dbd3124dbdbe9b08abde5315f90
+  data.tar.gz: c241bd8ef6d4693d04b5b85ae111815abe328c5ee694d4f107140d67282c4bcf67bf8f201a5ce7382378cd913c6a87ea2a379055a66f31bb006d5555df92686f

data/lib/wixgem.rb

@@ -191,9 +191,9 @@ class Wix
 
 	    if(File.read_only?(absolute_path))
 	      install_path = ".\\#{self.modify_file_path(input, file).gsub(/\//,'\\')}"
-		    install_path = install_path.gsub(/\.\\\\/,'.\\')
-		    file_elements = REXML::XPath.match(xml_doc, "//File[@Source='#{install_path}']")
-		    file_elements[0].attributes['ReadOnly'] = 'yes' if(file_elements.length == 1)
+		  install_path = install_path.gsub(/\.\\\\/,'.\\')
+		  file_elements = REXML::XPath.match(xml_doc, "//File[@Source='#{install_path}']")
+		  file_elements[0].attributes['ReadOnly'] = 'yes' if(file_elements.length == 1)
 	    end
 	  end
 	
@@ -531,66 +531,71 @@ class Wix
   end
 
   def self.create_output(wxs_file, input, output)
-    wixobj_file = "#{File.basename(wxs_file,'.wxs')}.wixobj"
+	wixobj_file = "#{File.basename(wxs_file,'.wxs')}.wixobj"
 	
-	  candle_cmd = Execute.new("\"#{install_path.gsub(/\\/,'/')}/bin/candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"", { quiet: true })
-	  candle_cmd.execute	
-	  log_wix_output(candle_cmd)
+	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))
+	raise "Unable to locate candle.exe. Expecting to have a sub directory bin or tools in the wix installtion directory: #{wix_install_path}" unless(Dir.exists?(wix_bin_dir))
 	
-	  cmd_args = "-nologo -out \"#{output}\" \"#{wixobj_file}\""
+	candle_cmd = Execute.new("\"#{wix_bin_dir}/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 WixNetfxExtension -ext WixUIExtension -ext WixUtilExtension -cultures:en-us #{cmd_args}"
-	  light_cmd = Execute.new("\"#{install_path.gsub(/\\/,'/')}/bin/light.exe\" #{cmd_args}", { quiet: true })
-	  light_cmd.execute
-	  log_wix_output(light_cmd)
+	light_cmd = Execute.new("\"#{wix_bin_dir}/light.exe\" #{cmd_args}", { quiet: true })
+	light_cmd.execute
+	log_wix_output(light_cmd)
   end
 
   def self.verify_input_keys(input)
-	  input[:files].reject! { |f| File.directory?(f) }
+	input[:files].reject! { |f| File.directory?(f) }
 
     [:files,:ignore_files].each { |key| raise "Hash key #{key} cannot be nil" if(input.has_key?(key) && input[key].nil?)}	
   end
   
   def self.create_package(output, input)
   	raise 'WIX path is not set! Install Wixtoolset or assign with Wixgem::Wix.install_path = <path to wix toolset' if(self.install_path.nil?)
-	  input = { files: input } unless(input.kind_of?(Hash))
-	  verify_input_keys(input)
+	input = { files: input } unless(input.kind_of?(Hash))
+	verify_input_keys(input)
 	  	
-	  @debug = input[:debug] if(!@debug && input.has_key?(:debug))
-	  start_logger if(@debug)
+	@debug = input[:debug] if(!@debug && input.has_key?(:debug))
+	start_logger if(@debug)
 	
-	  FileUtils.mkpath(File.dirname(output)) unless(Dir.exists?(File.dirname(output)))
+	FileUtils.mkpath(File.dirname(output)) unless(Dir.exists?(File.dirname(output)))
 	
-	  ext = File.extname(output)
+	ext = File.extname(output)
   	basename = File.basename(output, ext)
-	  FileUtils.rm(output) if(File.exists?(output))
+	FileUtils.rm(output) if(File.exists?(output))
  
-	  output_absolute_path = File.absolute_path(output)
-	  input[:original_pwd] = Dir.pwd
-	  input[:msi?] = output.include?('.msi')
+	output_absolute_path = File.absolute_path(output)
+	input[:original_pwd] = Dir.pwd
+	input[:msi?] = output.include?('.msi')
 		
-	  modify_binary_files(input)
+	modify_binary_files(input)
 
-	  temp_directory do |dir|
-	    wxs_file = "#{basename}.wxs"	    
-	    begin
-		    copy_install_files(dir, input)
+	temp_directory do |dir|
+	  wxs_file = "#{basename}.wxs"	    
+	  begin
+		copy_install_files(dir, input)
 	  
-		    Dir.chdir(dir) do |current_dir|
-		      create_wxs_file(wxs_file, input, ext)
-	        create_output(wxs_file, input, output_absolute_path)
-		    end
-	    rescue Exception => e
-		    raise e
-	    ensure
-	      FileUtils.cp("#{dir}/#{wxs_file}", "#{output_absolute_path}.wxs") if(File.exists?("#{dir}/#{wxs_file}") && @debug)
-	      File.open("#{output_absolute_path}.log", 'w') { |f| f.puts(@logger) } if(@debug &!@logger.nil?)
-	    end	  
-	  end
+		Dir.chdir(dir) do |current_dir|
+		  create_wxs_file(wxs_file, input, ext)
+	      create_output(wxs_file, input, output_absolute_path)
+		end
+	  rescue Exception => e
+		raise e
+	  ensure
+	    FileUtils.cp("#{dir}/#{wxs_file}", "#{output_absolute_path}.wxs") if(File.exists?("#{dir}/#{wxs_file}") && @debug)
+	    File.open("#{output_absolute_path}.log", 'w') { |f| f.puts(@logger) } if(@debug &!@logger.nil?)
+	  end	  
+	end
 	
-	  pdb_file = output_absolute_path.gsub(ext,'.wixpdb')
-	  FileUtils.rm(pdb_file) if(File.exists?(pdb_file))
+	pdb_file = output_absolute_path.gsub(ext,'.wixpdb')
+	FileUtils.rm(pdb_file) if(File.exists?(pdb_file))
 	
-	  end_logger if(@debug)
+	end_logger if(@debug)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.99.0
+  version: 0.100.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execute
@@ -131,8 +131,6 @@ 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