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

diff --git a/build/build-properties.xml b/build/build-properties.xml
index 69c8f2a3e76536faed4a2550959bde3c0b51d44a..a94410d9d7940521cc4ca647c08078fd232e15b9 100644 (file)
--- 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
index 03438a66cbc608cd98d7a0cbe2627bda1eee1cd3..70385353a4d60bc006e2bea00c72563fc45e7fa0 100644 (file)
--- 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
index 4d82a700b32d8905e8f7212d85af12a6487a6ba9..5a755d0977f41b106ad11278012db8ac93dfd334 100644 (file)
--- 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;
     }