[Swift-commit] r5287 - in trunk: . libexec

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2011-11-14 01:14:38 -0600 (Mon, 14 Nov 2011)
New Revision: 5287

Added:
   trunk/libexec/release.txt
Modified:
   trunk/build.xml
   trunk/libexec/svn-revision
   trunk/libexec/vdl.k
Log:
Use libexec/release.txt for managing release names


Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2011-11-14 06:56:30 UTC (rev 5286)
+++ trunk/build.xml	2011-11-14 07:14:38 UTC (rev 5287)
@@ -387,7 +387,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: trunk/libexec/release.txt
===================================================================
--- trunk/libexec/release.txt	                        (rev 0)
+++ trunk/libexec/release.txt	2011-11-14 07:14:38 UTC (rev 5287)
@@ -0,0 +1 @@
+trunk

Modified: trunk/libexec/svn-revision
===================================================================
--- trunk/libexec/svn-revision	2011-11-14 06:56:30 UTC (rev 5286)
+++ trunk/libexec/svn-revision	2011-11-14 07:14:38 UTC (rev 5287)
@@ -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
 

Modified: trunk/libexec/vdl.k
===================================================================
--- trunk/libexec/vdl.k	2011-11-14 06:56:30 UTC (rev 5286)
+++ trunk/libexec/vdl.k	2011-11-14 07:14:38 UTC (rev 5287)
@@ -19,9 +19,6 @@
 	once("vdl.k-print-version"
 		log("info",sys:file:read("{swift.home}/libexec/version.txt"))
 		echo(sys:file:read("{swift.home}/libexec/version.txt"))
-
-                log(LOG:INFO, "Swift version: TRUNK")
-
 		log("info","RUNID id=run:{VDL:RUNID}")
 		echo("RunID: {VDL:RUNID}")
 	)