Georges fix to add build date/time info to DEVELOPMENT builds.

andyglick · Mar 4, 2004 · 2239518 · 2239518
1 parent 5e870cf
commit 2239518
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/build/build-properties.xml b/build/build-properties.xml
@@ -36,15 +36,15 @@
       <property name="build.version.eclipse.plugins" value="9.9.9"/>
 
       <!-- formats comply with SimpleDateFormat -->
-      <property name="build.time.format"   value="MM/dd/yy 'at' hh:mm:ss z"/> 
+      <property name="build.time.format"   value="EEEE MMM d, yyyy 'at' HH:mm:ss z"/> 
       <property name="build.date.format"   value="EEEE MMM d, yyyy"/> 
 	  <tstamp>
 		<format property="build.date" 
 		         pattern="${build.date.format}"
-		         timezone="PST"/>
+		         timezone="GMT"/>
 		<format property="build.time" 
 		         pattern="${build.time.format}"
-		         timezone="PST"/>
+		         timezone="GMT"/>
 	  </tstamp>
 
 	  <property name="company.name"         value="aspectj.org"/>

diff --git a/build/build.xml b/build/build.xml
@@ -65,8 +65,7 @@
          <property name="version-uptodate.done" value="done"/>
     </target>
 
-    <target name="init-version" depends="init,init-filters,version-uptodate" 
-         unless="version.uptodate">
+    <target name="init-version" depends="init,init-filters,version-uptodate" >
       <antcall target="init-filters"/>
       <copy file="${aspectj.modules.dir}/build/lib/BridgeVersion.java.txt"
           tofile="${aspectj.modules.dir}/bridge/src/org/aspectj/bridge/Version.java"

diff --git a/build/lib/BridgeVersion.java.txt b/build/lib/BridgeVersion.java.txt
@@ -51,15 +51,13 @@ public class Version {
     // if not DEVELOPMENT version, read time text using format used to set time 
     static {
         long foundTime = NOTIME;
-        if (!DEVELOPMENT.equals(text)) {
-	        try {
-	            SimpleDateFormat format = new SimpleDateFormat(SIMPLE_DATE_FORMAT);
-	            ParsePosition pos = new ParsePosition(0);
-	            Date date = format.parse(time_text, pos);
-	            foundTime = date.getTime();
-	        } catch (Throwable t) {            
-	        }
-        }
+	    try {
+	        SimpleDateFormat format = new SimpleDateFormat(SIMPLE_DATE_FORMAT);
+	        ParsePosition pos = new ParsePosition(0);
+	        Date date = format.parse(time_text, pos);
+	        foundTime = date.getTime();
+	    } catch (Throwable t) {            
+	    }
         time = foundTime;
     }