dev 2.0.177 → 2.0.178

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cceca907d9b48c3d9ab1eb54b9fdf56afe24062
-  data.tar.gz: 030d854e622f7824c69856c6cb6f8877dad51027
+  metadata.gz: 92fb08120b4e87298b76a2a39f5ebd6643cbabbc
+  data.tar.gz: 1849a0a2dbd29632317ae1de1178994ef0a7b4bc
 SHA512:
-  metadata.gz: f2c59b0ba0b0497993bec50952a84516e284b811f97667dd2f2e8f1b0c9daa5585bc93956a65db32a87eec6ca6496ae407d27b7d09c7bd28ace28e8541f68a65
-  data.tar.gz: d202629a5bd60b809b9665f0b226e0f0984ac3c71c1dde2f6d2e72daf5207c73b2336ff53b4fb41ed7df340f2ae4e8d3a35f9f870702591feadd0ebe75a54418
+  metadata.gz: 9a6cf9ca0fc8d9659adb0fce7095a2beb363bd313b8e179360ddb778b9a8f0248b6963d569f8c183188f7400a6d811af47141d74c453286316c59690294bf52b
+  data.tar.gz: 68b3fc625506ebab17f13c132fe7cfe6b7eaa0966ab3ab84c0858db771742ddef45d1d0e30a58325f3ba7b1c870269a29cb0f706b395fc5ca5e76aeca7611168

data/lib/apps/wix.rb

@@ -10,21 +10,20 @@ class Wix
       	build_commands=Array.new if build_commands.nil?
       	build_commands << "candle #{wxs_file}"
 
-      	if(wxs_file.include?('.Bundle.'))
+      	if(IO.read(wxs_file).include?('<Project'))
       		if(defined?(VERSION))
-      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.exe -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
-      	  else
-      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
-      	  end
-      	else
-      	  if(defined?(VERSION))
-      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.msi"
-      	  else
-      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj"
-      	  end
-        end
-      #	 puts `"#{candle}" HelloConsole.wxs`
-	  #puts `"#{light}" HelloConsole.wixobj`
+      		  build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.msi"
+      	    else
+      		  build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj"
+      	    end
+      	end
+      	if(IO.read(wxs_file).include?('<Bundle'))
+      		if(defined?(VERSION))
+      		  build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.exe -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
+      	    else
+      		  build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
+      	    end
+      	end
       end
       build_commands
     end

data/lib/tasks/build.rb

@@ -36,12 +36,24 @@ class Build < Array
 	    	}
 
 	    	WXS_FILES.each{|wxs_file|
-	    		build_commands = Wix.get_build_commands wxs_file
-	    		if(!build_commands.nil?)
+	    		if(IO.read(wxs_file).include?('<Project'))
+	    		  build_commands = Wix.get_build_commands wxs_file
+	    		  if(!build_commands.nil?)
 	    			build_commands.each{|c|
 	    				self.add c
 	    			}
-	    		end
+	    		  end
+	    	    end
+	    	}
+	    	WXS_FILES.each{|wxs_file|
+	    		if(IO.read(wxs_file).include?('<Bundle'))
+	    		  build_commands = Wix.get_build_commands wxs_file
+	    		  if(!build_commands.nil?)
+	    			build_commands.each{|c|
+	    				self.add c
+	    			}
+	    		  end
+	    	    end
 	    	}
 	    end
 	end

data/lib/tasks/commit.rb

@@ -1,7 +1,11 @@
 puts __FILE__ if defined?(DEBUG)
 
 desc 'commits source files to git or subversion'
-task :commit do Tasks.execute_task :commit;end
+if(File.exists?('git'))
+  task :commit=>[:add] do Tasks.execute_task :commit; end
+else
+  task :commit do Tasks.execute_task :commit;end
+end
 
 class Commit < Array
 	def update

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.177
+  version: 2.0.178
 platform: ruby
 authors:
 - Lou Parslow