Ant version detection

From: Johann Uhrmann <johann(dot)uhrmann(at)xpecto(dot)com>
To: pgsql-patches(at)postgresql(dot)org
Subject: Ant version detection
Date: 2003-10-22 14:11:52
Message-ID: 3F969028.2030507@xpecto.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-patches

Hello,

this is the first time I am dealing with the Postgres source.
Therefore, I am hoping this is the right place to propose
a patch.

The patch is to be applied to the current CVS source.

This is it:

Index: configure
===================================================================
RCS file: /projects/cvsroot/pgsql-server/configure,v
retrieving revision 1.306
diff -r1.306 configure
3190c3190
< if "$ANT" -version | sed q | egrep -v ' 1\.[5-9]| [2-9]\.' >/dev/null ; then
---
> if "$ANT" -version | egrep '^Apache Ant version' | sed q | egrep -v ' 1\.[5-9]| [2-9]\.' >/dev/null ; then
Index: src/interfaces/ecpg/preproc/preproc.y
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/ecpg/preproc/preproc.y,v
retrieving revision 1.262
diff -r1.262 preproc.y
5250a5251
> ;

The first one is a fix in the detection of the ant version. Some newer
versions of ant echo the CLASSPATH variable before printing the version
number. That behaviour breaks the version detection. Therefore, only lines
beginning with "Apache Ant version" should be considered.

The second one is a missing semicolon. I am not familiar with the bison
syntax - but imho that semicolon _is_ missing.

Kind regards,

Johann Uhrmann

--
Johann Uhrmann
xpecto AG | Lindenstrasse 81 | D-84030 Ergolding
Telefon: 0700 xpecto 00 (0700 973286 00)
Telefax: 0700 xpecto 10 (0700 973286 10)
Internet: http://www.xpecto.com

Responses

Browse pgsql-patches by date

  From Date Subject
Next Message Tom Lane 2003-10-22 16:46:33 Re: Ant version detection
Previous Message Tom Lane 2003-10-22 13:53:34 Re: Timestamp docs weirdness