diff options
author | Dave Cramer <davec@fastcrypt.com> | 2002-03-19 01:32:48 +0000 |
---|---|---|
committer | Dave Cramer <davec@fastcrypt.com> | 2002-03-19 01:32:48 +0000 |
commit | 525b19399c629455bdcd63c9879f7c75f7ae3d25 (patch) | |
tree | 2e6325e7ab091360c39347523dbc7450553d1ab6 | |
parent | 1f0e5f679259598217e381f1d039f29af40ce016 (diff) | |
download | postgresql-525b19399c629455bdcd63c9879f7c75f7ae3d25.tar.gz postgresql-525b19399c629455bdcd63c9879f7c75f7ae3d25.zip |
applied patch from Liam Stewart
If one is trying to compile a JDBC 1 driver and junit.jar is in the
CLASSPATH, then the build fails as ant tries to build the JDBC 2 test
classes. This patch fixes this problem by excluding the jdbc 2 files
unless the jdk1.2+ property is set.
-rw-r--r-- | src/interfaces/jdbc/build.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml index a7126825368..5ada43147e0 100644 --- a/src/interfaces/jdbc/build.xml +++ b/src/interfaces/jdbc/build.xml @@ -4,7 +4,7 @@ build file to allow ant (http://jakarta.apache.org/ant/) to be used to build the PostgreSQL JDBC Driver - $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.21 2002/03/05 17:55:23 momjian Exp $ + $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.22 2002/03/19 01:32:48 davec Exp $ --> @@ -99,6 +99,8 @@ <exclude name="${package}/xa/**" unless="datasource" /> <exclude name="${package}/test/**" unless="junit" /> + <exclude name="${package}/test/jdbc2/**" unless="jdbc2" /> + <exclude name="${package}/test/JDBC2Tests.java" unless="jdbc2" /> </javac> </target> |