From a7f66bb74228e359fcb8badb3ca3098726511dda Mon Sep 17 00:00:00 2001
From: vspader <unknown>
Date: Mon, 21 May 2007 13:40:45 +0000
Subject: [PATCH] Fixed bug in nightly build script. Fixed up formatting in
 nightly build script.

---
 Scripts/build_nightly.rb | 95 +++++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 46 deletions(-)

diff --git a/Scripts/build_nightly.rb b/Scripts/build_nightly.rb
index e7bc5335c..dcfbcd893 100755
--- a/Scripts/build_nightly.rb
+++ b/Scripts/build_nightly.rb
@@ -12,12 +12,15 @@ appcastdoc = Document.new(appcast)
 #Get the latest revision from the appcast
 appcast_revision = Regexp.new('\d+$').match(appcastdoc.elements['//channel/item/title'].text.to_s()).to_s().to_i() || 0
 
+#Remove modified files that may cause conflicts.
+%x[rm -f Info.plist]
+
 #Update to the latest revision
 latest_revision = %x[svn update | tail -n 1].gsub(/[^\d]+/, '').to_i()
 
 if appcast_revision < latest_revision
-	#Get the changelog
-	changelog = %x[svn log -r #{latest_revision}:#{appcast_revision+1}]
+  #Get the changelog
+  changelog = %x[svn log -r #{latest_revision}:#{appcast_revision+1}]
 
   description = ''
   ignore_next = false
@@ -35,8 +38,8 @@ if appcast_revision < latest_revision
     description += line
   end
   
-	#Remove the previous build directories
-	%x[find . -type d -name build -print0 | xargs -0 rm -r ]
+  #Remove the previous build directories
+  %x[find . -type d -name build -print0 | xargs -0 rm -r ]
 
   #Update the version in the plist
   plist = open('Info.plist')
@@ -50,55 +53,55 @@ if appcast_revision < latest_revision
   plistdoc.write(newplist, 0)
   newplist.close()
 
-	#Build Cog!
-	%x[./Scripts/build_cog.sh 2>&1].each_line do |line|
-		if line.match(/\*\* BUILD FAILED \*\*/)
-			exit
-		end
-	end
+  #Build Cog!
+  %x[./Scripts/build_cog.sh 2>&1].each_line do |line|
+    if line.match(/\*\* BUILD FAILED \*\*/)
+      exit
+    end
+  end
 
-	filename = "Cog-r#{latest_revision}.tbz"
+  filename = "Cog-r#{latest_revision}.tbz"
 
-	#Zip the app!
-	%x[rm -f build/Release/nightly.tar.bz2]
-	%x[tar -C build/Release -cjf build/Release/nightly.tar.bz2 Cog.app]
+  #Zip the app!
+  %x[rm -f build/Release/nightly.tar.bz2]
+  %x[tar -C build/Release -cjf build/Release/nightly.tar.bz2 Cog.app]
 
-	filesize = File.size("build/Release/nightly.tar.bz2")
+  filesize = File.size("build/Release/nightly.tar.bz2")
 
-	#Send the new build to the server
-	%x[scp build/Release/nightly.tar.bz2 cogx@cogx.org:~/cogx.org/nightly_builds/#{filename}]
+  #Send the new build to the server
+  %x[scp build/Release/nightly.tar.bz2 cogx@cogx.org:~/cogx.org/nightly_builds/#{filename}]
 
-	#Add new entry to appcast
-	new_item = Element.new('item')
-	
-	new_item.add_element('title')
-	new_item.elements['title'].text = "Cog r#{latest_revision}"
-	
-	new_item.add_element('description')
-	new_item.elements['description'].text = description
+  #Add new entry to appcast
+  new_item = Element.new('item')
+  
+  new_item.add_element('title')
+  new_item.elements['title'].text = "Cog r#{latest_revision}"
+  
+  new_item.add_element('description')
+  new_item.elements['description'].text = description
 
-	new_item.add_element('pubDate')
-	new_item.elements['pubDate'].text = Time.now().strftime("%a, %d %b %Y %H:%M:%S %Z") #RFC 822
-	
-	new_item.add_element('enclosure')
-	new_item.elements['enclosure'].add_attribute('url', "http://cogx.org/nightly_builds/#{filename}")
-	new_item.elements['enclosure'].add_attribute('length', filesize)
-	new_item.elements['enclosure'].add_attribute('type', 'application/octet-stream')
-	new_item.elements['enclosure'].add_attribute('sparkle:version', "r#{latest_revision}")
-	
-	appcastdoc.insert_before('//channel/item', new_item)
-	
-	#Limit number of entries to 5
-	appcastdoc.delete_element('//channel/item[position()>5]')
-	
-	new_xml = Tempfile.new('appcast.xml')
-	appcastdoc.write(new_xml, 0)
-	new_xml.close()
-	appcast.close()
+  new_item.add_element('pubDate')
+  new_item.elements['pubDate'].text = Time.now().strftime("%a, %d %b %Y %H:%M:%S %Z") #RFC 822
+  
+  new_item.add_element('enclosure')
+  new_item.elements['enclosure'].add_attribute('url', "http://cogx.org/nightly_builds/#{filename}")
+  new_item.elements['enclosure'].add_attribute('length', filesize)
+  new_item.elements['enclosure'].add_attribute('type', 'application/octet-stream')
+  new_item.elements['enclosure'].add_attribute('sparkle:version', "r#{latest_revision}")
+  
+  appcastdoc.insert_before('//channel/item', new_item)
+  
+  #Limit number of entries to 5
+  appcastdoc.delete_element('//channel/item[position()>5]')
+  
+  new_xml = Tempfile.new('appcast.xml')
+  appcastdoc.write(new_xml, 0)
+  new_xml.close()
+  appcast.close()
 
-	#Send the updated appcast to the server
-	%x[scp #{new_xml.path} cogx@cogx.org:~/cogx.org/appcast/nightly.xml]
-	
+  #Send the updated appcast to the server
+  %x[scp #{new_xml.path} cogx@cogx.org:~/cogx.org/appcast/nightly.xml]
+  
 end