[Swift-commit] r5286 - in branches/release-0.93: . libexec

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-11-14 00:56:30 -0600 (Mon, 14 Nov 2011)
New Revision: 5286

Added:
   branches/release-0.93/libexec/release.txt
Modified:
   branches/release-0.93/build.xml
   branches/release-0.93/libexec/svn-revision
Log:
Use release.txt for managing release name to be displayed/logged at Swift start-up


Modified: branches/release-0.93/build.xml
===================================================================
--- branches/release-0.93/build.xml	2011-11-14 02:29:22 UTC (rev 5285)
+++ branches/release-0.93/build.xml	2011-11-14 06:56:30 UTC (rev 5286)
@@ -385,7 +385,7 @@
 	</target>
 
 	<target name="generateVersion">
-		<echo file="libexec/version.txt">Swift ${version} </echo>
+		<echo file="libexec/version.txt">Swift </echo>
 		<exec os="Linux, Mac OS X" executable="libexec/svn-revision" append="true" output="libexec/version.txt"/>
 		<exec os="Linux, Mac OS X" executable="libexec/generate-buildid" append="false" output="libexec/buildid.txt"/>
 	</target>

Added: branches/release-0.93/libexec/release.txt
===================================================================
--- branches/release-0.93/libexec/release.txt	                        (rev 0)
+++ branches/release-0.93/libexec/release.txt	2011-11-14 06:56:30 UTC (rev 5286)
@@ -0,0 +1 @@
+0.93RC5

Modified: branches/release-0.93/libexec/svn-revision
===================================================================
--- branches/release-0.93/libexec/svn-revision	2011-11-14 02:29:22 UTC (rev 5285)
+++ branches/release-0.93/libexec/svn-revision	2011-11-14 06:56:30 UTC (rev 5286)
@@ -16,6 +16,7 @@
 }
 
 # Determine Swift revision
+RELEASE=$(cat libexec/release.txt)
 
 SWIFTVER=$(hereversion swift)
 
@@ -23,5 +24,5 @@
 
 COGVER=$(hereversion cog)
 
-echo $SWIFTVER $COGVER
+echo $RELEASE $SWIFTVER $COGVER