wixgem 0.88.0 → 0.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 745cfacea3eddd72db3e6ca74dec7df632fe036a
-  data.tar.gz: 9316c33e98cd047c9aff4838241bd874aea40049
+  metadata.gz: a0a90630daad942ac1209f4eb566081756c0c2a0
+  data.tar.gz: ae14956615634c1da38e9a6997740e823a761aba
 SHA512:
-  metadata.gz: 46db6705df9609faf42f2f9bdb13b2946a18d1342d1b327959626b4eff60c3c8a70cf2633dd3517f8b6a24bbd9ff7c3fea065c61908219670cbda74eeb3f8b1e
-  data.tar.gz: 450825fe9176938fa7a84412a841184580843e98267732c683a50ab3e57fd5358e4e026e79509b265d6179e9b4bfe7b5a078cdfb55f12b11493ad2267c6ffb73
+  metadata.gz: 2004c80f90e911386eb717834d7391190195daa3cbc2ed6c1ccba31668d24182a19097aa56a2f3e71d8af1c8fdbe952bea94c7e91448d2b70134a7edb21c750b
+  data.tar.gz: 73aae6bf95215251e3244fc0ed276cb8c75704cbd31716ebdde3473bd2693baabddc60cf8ade3e5e42d222037c786725f8bee1e5a9315f756799fb04a95b5d51

data/README.md

@@ -54,10 +54,9 @@ small set of optional arguments allowing the developer to customize the generate
                                 installation of the product before installing the product.
 * **all_users**: String value perUser or perMachine. The default is perUser.
 * **suppress_registry_harvesting** Suppress's heat's registry harvesting. Can fix the Runtime Error E6034.		 
-* **suppress_COM_elements** Suppress COM elements.
+* **suppress_COM_elements** Suppress COM elements, Heat's -scom
 * **installer_version** Represents the minimum version of the Windows installer required to install
-                        this package. The default version is 4.5. Other valid versions are 2.0,
-						3.0, 3.5, 4.0, 4.5.
+                        this package. The default version is 4.5 i.e. NETFRAMEWORK45
 * **requires_netframework** Tests to see if the require netframework version is installed on the machine. The
                             associated value specifies the netframework version. The net framework strings can
                             be found at http://wixtoolset.org/documentation/manual/v3/customactions/wixnetfxextension.html							

data/lib/shortcut.rb

@@ -21,6 +21,7 @@ class Shortcut
 	return xml_doc
   end
   
+  private
   def create_shortcut_element(file_element)
     shortcut_element = file_element.add_element 'Shortcut'
 	

data/lib/wixgem.rb

@@ -76,20 +76,33 @@ class Wix
   end
   
   def self.manage_netframework(xml_doc, input)
-    wix = REXML::XPath.match(xml_doc, "/Wix")[0]
-    add_netfx_namespace = false   
     if(input.key?(:requires_netframework))
-	  add_netfx_namespace=true
-	  fragment = wix.add_element 'Fragment'
-	  fragment.add_element 'PropertyRef', { 'Id' => input[:requires_netframework] }
-	  condition = fragment.add_element 'Condition', { 'Message' => "This application requires .NET Framework #{input[:requires_netframework]}. Please install the .NET Framework then run this installer again." }
+	  wix = REXML::XPath.match(xml_doc, "/Wix")[0]
+	  wix.attributes['xmlns:netfx'] = 'https://schemas.microsoft.com/wix/NetFxExtension'
+
+	  product = REXML::XPath.match(xml_doc, "/Wix/Product")[0]
+	  product.add_element 'PropertyRef', { 'Id' => input[:requires_netframework] }
+	  condition = product.add_element 'Condition', { 'Message' => "This application requires .NET Framework #{input[:requires_netframework]}. Please install the .NET Framework then run this installer again." }
 	  condition.text = "<![CDATA[Installed OR #{input[:requires_netframework]}]]>"
     end
 	
-	wix.attributes['xmlns:netfx'] = 'https://schemas.microsoft.com/wix/NetFxExtension' if(add_netfx_namespace)
     return xml_doc 
   end
   
+  def self.manage_win10_crt(xml_doc, input)
+    if(input.key?(:requires_win10_crt))
+	  product = REXML::XPath.match(xml_doc, "/Wix/Product")[0]
+
+	  property = product.add_element 'Property', { 'Id' => 'WIN10_CRT_PRESENT' }
+	  search = property.add_element 'DirectorySearch', { 'Id' => 'SystemFolderDriverVersion', 'Path' => '[SystemFolder]' }
+	  search.add_element 'FileSearch', { 'Name' => 'ucrtbase.dll' }
+	  condition = product.add_element 'Condition', { 'Message' => 'Requires Universal CRT see Windows Update KB2999226' }
+	  condition.text = "<![CDATA[Installed OR WIN10_CRT_PRESENT]]>"
+ 	end
+	
+    return xml_doc 
+  end
+
   def self.manage_ui(xml_doc, input)
     product_elements = REXML::XPath.match(xml_doc, "/Wix/Product")
 
@@ -482,6 +495,7 @@ class Wix
 
 	xml_doc = manage_installdir(xml_doc, input)
 	xml_doc = manage_netframework(xml_doc, input)
+	xml_doc = manage_win10_crt(xml_doc, input)
 	#xml_doc = manage_ui(xml_doc, input)
 	xml_doc = manage_custom_actions(xml_doc, input)
 	xml_doc = manage_upgrade(xml_doc,input)
@@ -495,6 +509,10 @@ class Wix
     formatter = REXML::Formatters::Pretty.new(2)
     formatter.compact = true 
   	File.open(wxs_file, 'w') { |f| formatter.write(xml_doc, f) }	
+	str = File.read(wxs_file)
+	str = str.gsub(/&lt;/,'<')
+	str = str.gsub(/&gt;/,'>')
+  	File.open(wxs_file, 'w') { |f| f.puts(str) }	
   end
 
   def self.create_output(wxs_file, input, output)
@@ -505,7 +523,7 @@ class Wix
 	log_wix_output(candle_cmd)
 	
 	cmd_args = "-nologo -out \"#{output}\" \"#{wixobj_file}\""
-    cmd_args = "-ext WixUIExtension -ext WixUtilExtension -cultures:en-us #{cmd_args}"
+    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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.88.0
+  version: 0.89.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execute