wixgem 0.59.0 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f19f075a64ef471bc3a74d93348d15e9064040a
-  data.tar.gz: e7be58797e3d6eae9ae2f6b95a753e218845008f
+  metadata.gz: 5b6b2f61ea32efb419ef261aba962de55b9dec07
+  data.tar.gz: a6475f9f4c3f836c333ca324cbd0b123eb713e9a
 SHA512:
-  metadata.gz: 82ec730418cdb61d38795c874c6d23c5041c85e7c8a0efe3f5cbf1306e82b6ecc0f5a9fb81d16080636eba2fc511d023d03291bb142a637548e05a0c130b6ae2
-  data.tar.gz: 22858d0fc49d4cfc0e8bd490af0902cb59606ca5d357c37e6b5c19d0670d289d454d2320eb127f14b23e3d92174f2f72358da2100ed3713daaed33f6ba3711a1
+  metadata.gz: 1f00a242f5f8aa952448708b09aaf3044fe20cf12a3bc88f60628bfd2265e0166fef0bbb721fdc9d1b10960fe174a519abdc4556419d7c965ee32e7c0c3f13c8
+  data.tar.gz: 67311a57be6cf3084e23bf0463cc7529a98674c4d3e6d844e38dd32dc9053d6bcfd8c90c854e5b50b940742ae5de3dd15c370285d8a6ca75fa9ad90ded8df839

data/example/example.msi.log

@@ -0,0 +1,15 @@
+------------------------------------ Installation Paths -----------------------------------
+File path               Installation Path
+./example.msm           ./example.msm
+-------------------------------------------------------------------------------------------
+----------------------------------------------------------------------------
+{:output=>"", :error=>"", :exit_code=>0, :ignore_exit_code=>false, :debug=>false, :quiet=>true, :command=>"\"C:\\Development\\dep\\OpenSource\\WixToolset\\3.9/bin/heat.exe\" dir . -template product -cg InstallionFiles -gg -nologo -srd -o  \"example.wxs\""}
+----------------------------------------------------------------------------
+{:output=>"Windows Installer XML Toolset Compiler version 3.9.1006.0\nCopyright (c) Outercurve Foundation. All rights reserved.\n\nexample.wxs\n", :error=>"", :exit_code=>0, :ignore_exit_code=>false, :debug=>false, :quiet=>true, :command=>"\"C:\\Development\\dep\\OpenSource\\WixToolset\\3.9/bin/candle.exe\" -out \"example.wixobj\" \"example.wxs\""}
+--------------------------- std output -----------------------------------
+Windows Installer XML Toolset Compiler version 3.9.1006.0
+Copyright (c) Outercurve Foundation. All rights reserved.
+
+example.wxs
+----------------------------------------------------------------------------
+{:output=>"", :error=>"", :exit_code=>0, :ignore_exit_code=>false, :debug=>false, :quiet=>true, :command=>"\"C:\\Development\\dep\\OpenSource\\WixToolset\\3.9/bin/light.exe\" -nologo -out \"E:/Development/wrk/github/wixgem/example/example.msi\" \"example.wixobj\""}

data/example/example.msi.wxs

@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+    <Product Id='{53554FC3-4143-48A8-82D9-9D39442FABBC}' Language='1033' Manufacturer='Not Set' Name='example' UpgradeCode='{a62c35a7-6a6d-4392-822b-f6aca7eef88b}' Version='0.62.0'>
+        <Package Compressed='yes' InstallerVersion='450'/>
+        <Directory Id='TARGETDIR' Name='SourceDir'><Merge DiskId='1' Id='merge2F9F417DD98EE2C2308398A4A8E9E006' Language='1033' SourceFile='.\example.msm'/></Directory>
+        <Feature Id='ProductFeature' Level='1' Title='Files to Install'>
+            <ComponentGroupRef Id='InstallionFiles'/>
+        <MergeRef Id='merge2F9F417DD98EE2C2308398A4A8E9E006'/></Feature>
+        <Media Cabinet='product.cab' EmbedCab='yes' Id='1'/>
+    <CustomAction Execute='firstSequence' Id='SetTARGETDIR' Property='TARGETDIR' Return='check' Value='[ProgramFilesFolder][ProductName]'/><InstallExecuteSequence><Custom Action='SetTARGETDIR' Before='CostInitialize'/></InstallExecuteSequence><InstallUISequence><Custom Action='SetTARGETDIR' Before='CostInitialize'/></InstallUISequence><AdminExecuteSequence><Custom Action='SetTARGETDIR' Before='CostInitialize'/></AdminExecuteSequence><AdminUISequence><Custom Action='SetTARGETDIR' Before='CostInitialize'/></AdminUISequence></Product>
+    <Fragment>
+        <ComponentGroup Id='InstallionFiles'>
+            
+        </ComponentGroup>
+    </Fragment>
+</Wix>

data/example/rakefile.rb

@@ -1,7 +1,7 @@
 require 'wixgem'
 	
-#Wixgem::Wix.install_path = 'E:\Development\dep\OpenSource\WixToolset\3.9'
-Wixgem::Wix.install_path = '<Path to the root directory of the wix toolset>'
+Wixgem::Wix.install_path = 'C:\Development\dep\OpenSource\WixToolset\3.9'
+#Wixgem::Wix.install_path = '<Path to the root directory of the wix toolset>'
 
 task :create_installation_files do
   FileUtils.mkpath('./install_files/directory')
@@ -20,7 +20,7 @@ desc "Generate an installation msi file"
 task :installation => [:mergemodule] do	  
   installation_files = Dir.glob('./example.msm')
   Wixgem::Wix.make_installation("./example.msi",  
-    { upgrade_code: '{a62c35a7-6a6d-4392-822b-f6aca7eef88b}', 
+    { upgrade_code: '{a62c35a7-6a6d-4392-822b-f6aca7eef88b}', debug: true,
 	  files: installation_files } 
   )
 end

data/lib/shortcut.rb

@@ -28,18 +28,15 @@ class Shortcut
 	shortcut_element.attributes['Arguments'] = @hash[:arguments] if(@hash.has_key?(:arguments))
 	
 	shortcut_name = File.basename(@file)
-	shortcut_name = @hash[:name] if(@hash.has_key?(:name))
+	if(@hash.has_key?(:name))
+	  shortcut_name = @hash[:name] 
+	else
+	  @hash[:name] = shortcut_name
+	end
 	shortcut_element.attributes['Name'] = shortcut_name
 
 	shortcut_element.attributes['Description'] = @hash[:description] if(@hash.has_key?(:description))
-	if(@hash.has_key?(:directory)) 
-	  case @hash[:directory]
-	  when :desktop
-		shortcut_element.attributes['Directory'] = 'DesktopFolder'
-	  else
-	    shortcut_element.attributes['Directory'] = @hash[:directory] 
-	  end
-	end
+	shortcut_element.attributes['Directory'] = 'DesktopFolder'
 	
 	shortcut_element.attributes['Advertise']="yes"
 	shortcut_element.attributes['Advertise'] = "no" if(@hash.has_key?(:advertise) && !@hash[:advertise])

data/lib/shortcut.rb.kev

@@ -0,0 +1,129 @@
+require 'rexml/document'
+require 'SecureRandom'
+
+module Wixgem
+
+class Shortcut
+  
+  def initialize(file, hash)
+    @file = file
+	@hash = hash
+  end
+  
+  def create(xml_doc)
+	raise "Shortcut #{@file} does not exist" unless(File.exists?(@file))
+	
+	file_elements = REXML::XPath.match(xml_doc, "//File[@Source='.\\#{@file.gsub(/\//,'\\')}']")
+	raise "Shortcut #{@file} does not match an installation file" if(file_elements.length == 0)
+	
+	case @hash[:directory]
+	when :desktop  
+	  create_file_shortcut(file_elements[0])
+	  xml_doc = create_desktop_folder(xml_doc)
+#	when :start_menu
+#	  program_files_element = create_start_menu_shortcut(xml_doc)
+#	  create_start_menu_item(program_files_element)
+	else
+	  raise 'Support for #{:directory}  shortcut has not been added'	  
+	end
+	
+	return xml_doc
+  end
+  
+  def create_file_shortcut(file_element)
+    shortcut_element = file_element.add_element 'Shortcut'
+	
+	shortcut_element.attributes['Id'] = "Shortcut_#{SecureRandom.uuid.gsub(/-/,'')}"
+	shortcut_element.attributes['Arguments'] = @hash[:arguments] if(@hash.has_key?(:arguments))
+	
+	shortcut_name = File.basename(@file)
+	if(@hash.has_key?(:name))
+	  shortcut_name = @hash[:name] 
+	else
+	  @hash[:name] = shortcut_name
+	end
+	shortcut_element.attributes['Name'] = shortcut_name
+
+	shortcut_element.attributes['Description'] = @hash[:description] if(@hash.has_key?(:description))
+	shortcut_element.attributes['Directory'] = 'DesktopFolder'
+	
+	shortcut_element.attributes['Advertise']="yes"
+	shortcut_element.attributes['Advertise'] = "no" if(@hash.has_key?(:advertise) && !@hash[:advertise])
+	create_icon_element(shortcut_element) if(@hash.has_key?(:icon))
+	
+	return shortcut_element
+  end
+
+  def create_icon_element(shortcut_element)
+    icon_element = shortcut_element.add_element 'Icon'	
+	icon_element.attributes['Id'] = File.basename(@hash[:icon])
+    icon_element.attributes['SourceFile'] = ".\\#{@hash[:icon].gsub(/\//, '\\')}"
+	return icon_element
+  end
+
+  def create_desktop_folder(xml_doc)
+    desktop_elements = REXML::XPath.match(xml_doc, "//DesktopFolder")
+	if(desktop_elements.length == 0)
+      wix_elements = REXML::XPath.match(xml_doc, "//Wix")
+	  fragment_element = wix_elements[0].add_element 'Fragment'
+	  target_dir = fragment_element.add_element 'DirectoryRef', { 'Id' => 'TARGETDIR' }
+	  target_dir.add_element 'Directory', { 'Id' => 'DesktopFolder', 'Name' => 'Desktop' }
+	end
+	return xml_doc
+  end
+
+#  def create_start_menu_shortcut(program_folder_element)
+#    puts "1"
+#    shortcut_element = program_folder_element.add_element 'Shortcut'
+#	
+#	shortcut_element.attributes['Id'] = 'ApplicationStartMenuShortcut'
+#	
+#	shortcut_name = File.basename(@file)
+#	ext = File.extname(@file)
+#	if(@hash.has_key?(:name))
+#	  shortcut_name = @hash[:name] 
+#	else
+#	  shortcut_name = File.basename(shortcut_name, ext) if(ext != '')
+#	  @hash[:name] = shortcut_name
+#	end
+#	shortcut_element.attributes['Name'] = shortcut_name
+
+#    puts "2"
+#	shortcut_element.attributes['Description'] = @hash[:description] if(@hash.has_key?(:description))
+#	shortcut_element.attributes['Target'] = @file
+#
+#    puts "3"
+#	remove_folder_element = program_folder_element.add_element 'RemoveFolder'
+#	remove_folder_element.attributes['Id'] = 'ApplicationProgramsFolder'
+#	remove_folder_element.attributes['On'] = 'uninstall'
+
+#    puts "4"
+#	registry_folder_element = program_folder_element.add_element 'RegistryValue'
+#	remove_folder_element.attributes['Root'] = 'HKCU'
+#	remove_folder_element.attributes['Key'] = "Software\\Microsoft\\#{shortcut_name.gsub(/ /,'')}"
+#	remove_folder_element.attributes['Name'] = 'installed'
+#	remove_folder_element.attributes['Type'] = 'integer'
+#	remove_folder_element.attributes['Value'] = '1'
+#	remove_folder_element.attributes['KeyPath'] = 'yes'
+
+#	return shortcut_element
+#  end
+  
+#  def create_start_menu_component(xml_doc)
+#    app_programs_elements = REXML::XPath.match(xml_doc, "//ApplicationProgramsFolder")
+#	app_programs_element = nil
+#	if(app_programs_elements.length == 0)
+#      wix_elements = REXML::XPath.match(xml_doc, "//Wix")
+#	  fragment_element = wix_elements[0].add_element 'Fragment'
+#	  app_programs_element = fragment_element.add_element 'DirectoryRef', { 'Id' => 'ApplicationProgramsFolder' }
+#	else if(app_programs_elements.length == 1)
+#	  app_programs_element = app_programs_elements[0]
+#	else
+#	  raise "Wix file contains multiple ApplicationProgramsFolder's"
+#	end
+
+#	return app_programs_element.add_element 'Component', { 'Id' => 'ApplicationShortcut', 'Guid' => '{a9e94876-60b5-4038-8baa-ea76a3f9ebe1}' }
+#  end  
+end
+
+#end

data/lib/wixgem.rb

@@ -80,6 +80,7 @@ class Wix
 	product = REXML::XPath.match(xml_doc, '//Wix/Product')
 	return xml_doc if(product.length == 0)
 	
+	product[0].add_element 'SetProperty', { 'Id' => 'ARPINSTALLLOCATION', 'Value' => '#{install_path}', 'After' => 'CostFinalize', 'Sequence' => 'both' }	
 	product[0].add_element 'CustomAction', { 'Id' => 'SetTARGETDIR', 'Property' => 'TARGETDIR', 'Value' => "#{install_path}", 'Execute' => 'firstSequence', 'Return' => 'check'}
 
 	install_execute_sequence = product[0].add_element 'InstallExecuteSequence'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.62.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,6 +76,8 @@ files:
 - LICENSE
 - README.md
 - example/example.msi
+- example/example.msi.log
+- example/example.msi.wxs
 - example/example.msm
 - example/install_files/directory/file2.txt
 - example/install_files/file1.txt
@@ -84,6 +86,7 @@ files:
 - lib/command.rb
 - lib/file.rb
 - lib/shortcut.rb
+- lib/shortcut.rb.kev
 - lib/wixgem.rb
 homepage: http://rubygems.org/gems/wixgem
 licenses: