[Bigdata-commit] SF.net SVN: bigdata:[4839] branches

[<tho...@us...>]

Revision: 4839
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4839&view=rev
Author:   thompsonbry
Date:     2011-07-05 15:48:58 +0000 (Tue, 05 Jul 2011)

Log Message:
-----------
Changed the name of the build timestamp variable in the ant file to avoid a conflict with the existing "today" property.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/build.xml
    branches/TERMS_REFACTOR_BRANCH/build.xml

Modified: branches/QUADS_QUERY_BRANCH/build.xml
===================================================================
--- branches/QUADS_QUERY_BRANCH/build.xml	2011-07-05 13:57:21 UTC (rev 4838)
+++ branches/QUADS_QUERY_BRANCH/build.xml	2011-07-05 15:48:58 UTC (rev 4839)
@@ -129,7 +129,7 @@
 			</filterchain>
 		</loadfile>
 		<tstamp>
-		    <format property="TODAY" pattern="yyyy/MM/dd HH:mm:ss z" locale="en,US" />
+		    <format property="build.timestamp" pattern="yyyy/MM/dd HH:mm:ss z" locale="en,US" />
 		</tstamp>
 		<property environment="env" />
 		<echo file="${buildinfo.file}">
@@ -139,7 +139,7 @@
     public static final String buildVersionOSGI="${build.ver.osgi}";
 	public static final String svnRevision="${svn.revision}";
     public static final String svnURL="${svn.url}";
-	public static final String buildTimestamp="${TODAY}";
+	public static final String buildTimestamp="${build.timestamp}";
 	public static final String buildUser="${user.name}";
 	public static final String buildHost="${env.COMPUTERNAME}";
 	public static final String osArch="${os.arch}";

Modified: branches/TERMS_REFACTOR_BRANCH/build.xml
===================================================================
--- branches/TERMS_REFACTOR_BRANCH/build.xml	2011-07-05 13:57:21 UTC (rev 4838)
+++ branches/TERMS_REFACTOR_BRANCH/build.xml	2011-07-05 15:48:58 UTC (rev 4839)
@@ -129,7 +129,7 @@
 			</filterchain>
 		</loadfile>
 		<tstamp>
-		    <format property="TODAY" pattern="yyyy/MM/dd HH:mm:ss z" locale="en,US" />
+		    <format property="build.timestamp" pattern="yyyy/MM/dd HH:mm:ss z" locale="en,US" />
 		</tstamp>
 		<property environment="env" />
 		<echo file="${buildinfo.file}">
@@ -139,7 +139,7 @@
     public static final String buildVersionOSGI="${build.ver.osgi}";
 	public static final String svnRevision="${svn.revision}";
     public static final String svnURL="${svn.url}";
-	public static final String buildTimestamp="${TODAY}";
+	public static final String buildTimestamp="${build.timestamp}";
 	public static final String buildUser="${user.name}";
 	public static final String buildHost="${env.COMPUTERNAME}";
 	public static final String osArch="${os.arch}";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.