diff options
| author | aclement <aclement> | 2004-03-04 15:18:46 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2004-03-04 15:18:46 +0000 |
| commit | 223951856673c27ebec5ffb61b929fadb4b6f567 (patch) | |
| tree | aa0d43b322884ddfeadc48c2f270befe94e0e6a0 /build | |
| parent | 5e870cf13b87452e0a79a737706e59c8323722cb (diff) | |
| download | aspectj-223951856673c27ebec5ffb61b929fadb4b6f567.tar.gz aspectj-223951856673c27ebec5ffb61b929fadb4b6f567.zip | |
Georges fix to add build date/time info to DEVELOPMENT builds.
Diffstat (limited to 'build')
| -rw-r--r-- | build/build-properties.xml | 6 | ||||
| -rw-r--r-- | build/build.xml | 3 | ||||
| -rw-r--r-- | build/lib/BridgeVersion.java.txt | 16 |
3 files changed, 11 insertions, 14 deletions
diff --git a/build/build-properties.xml b/build/build-properties.xml index 69c8f2a3e..a94410d9d 100644 --- 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 03438a66c..70385353a 100644 --- 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 4d82a700b..5a755d097 100644 --- 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; } |