dev 2.1.141 → 2.1.142

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a460fa5550930d2899ac1d6b1e3e4dff7a98f0414a5eac1d318ac35db1a4f3dc
-  data.tar.gz: 37dd47c4dc960a331e6eaeb78ca9e99f23480763eab12516dc025e0457256cc6
+  metadata.gz: 12250afee504c82a8b62e9d964fae6056c11c155f750047d5158b9eea94b3682
+  data.tar.gz: 5bc0897b33e9201b8b2d062edf05f35f0d846c0121572980ed57fc1ca7cae0b4
 SHA512:
-  metadata.gz: c8332d58b70296a39e8e3b8ab5751329486f91cc71082b9833e31f0310a0e98d48c8e8accc4560fa13549c24452078fc03e35b27678785aef67aadf9ba375d3f
-  data.tar.gz: 33da601f0ead56727ebc083738713a180caca1e95581cfc7a91351ceefd2299b21a4c5c7c1fd0415c7b2d3836df4222370dcbedb7cd7053ae861e75ef4e991bf
+  metadata.gz: 4af0f09e30f57fc8e3f22d6f749df321c866fac4d04a3df77e2943afb6c2fc215a3b23277a5459818a13ce5ba276e2836e8324fa4487e29e2791a26e40b6c619
+  data.tar.gz: aaaa3051d87f40612fd9f4c6c791cce0d79c7aa593a09acff35d1f6f0e349d9b88b8b825096f0980412d9a39fc9147c4c1fda5aea523f9207cfa4e52bba0c067

data/lib/apps/wix.rb

@@ -11,26 +11,46 @@ if defined?(DEBUG)
 # 
 #
 class Wix
-	def self.get_build_commands wxs_file
-      build_commands=nil
-      if(File.exists?(wxs_file) && !defined?(NO_WIX))
-         if(Environment.windows?)
-            ext='msi'
-            ext='exe' if(IO.read(wxs_file).include?('<Bundle'))
-            extensions=''
-            ['WixNetFxExtension','WixBalExtension','WixUtilExtension','WixUiExtension'].each{|e|
-                  extensions="#{extensions}-ext #{e} "
+      def self.get_build_commands wxs_file
+            build_commands=nil
+            if(File.exists?(wxs_file) && !defined?(NO_WIX))
+            if(Environment.windows?)
+                  ext='msi'
+                  ext='exe' if(IO.read(wxs_file).include?('<Bundle'))
+                  extensions=''
+                  ['WixNetFxExtension','WixBalExtension','WixUtilExtension','WixUiExtension'].each{|e|
+                        extensions="#{extensions}-ext #{e} "
+                  }
+                  build_commands=Array.new if build_commands.nil?
+                  build_commands << "candle #{wxs_file} #{extensions}"
+                  
+                  if(defined?(VERSION))
+                        build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.#{ext} #{extensions}"
+                  else
+                        build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj #{extensions}"
+                  end
+            end
+            end
+            build_commands
+      end
+
+      def self.get_wix_with_files wxs_template_text, component_id, filenames
+            # <Component[-\s\w="]+Id="ApplicationFiles"[-"\s\w=]+>([-<="\/.>\s\w]+)<\/C
+            search=wxs_template_text.scan(/<Component[-\s\w="]+Id="ApplicationFiles"[-"\s\w=]+>([-<="\/.>\s\w]+)<\/C/)[0][0]
+            replace='\r\n'
+            index = 0
+            filenames.each{|f|
+                  replace += "<File Id=\"#{component_id}#{index}\" Source=\"#{f}\"/>\r\n"
+                  index += 1
             }
-      	build_commands=Array.new if build_commands.nil?
-      	build_commands << "candle #{wxs_file} #{extensions}"
-            
-      	if(defined?(VERSION))
-      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.#{ext} #{extensions}"
-      	else
-      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj #{extensions}"
-      	end
-         end
+            wxs_template_text.gsub(search,replace)
+      end
+      
+      def self.update_wix_files wxs_filename, component_id, filenames
+            wix_text = IO.read(wxs_filename)
+            new_text = get_wix_with_files(wix_text, component_id,filenames)
+            if(wix_text != new_text)
+                  File.open(wxs_filename,'w'){|f| f.write(new_text) }
+            end
       end
-      build_commands
-    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.1.141
+  version: 2.1.142
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-26 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,8 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: dev