Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f66f7a5

Browse files
author
Dave Cramer
committed
compiles correctly but still doesn't work with jdk 1.4
1 parent 87675fa commit f66f7a5

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/interfaces/jdbc/build.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
build file to allow ant (http://jakarta.apache.org/ant/) to be used
55
to build the PostgreSQL JDBC Driver
66
7-
$Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.19 2002/02/22 02:07:30 davec Exp $
7+
$Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.20 2002/02/24 16:12:51 davec Exp $
88
99
-->
1010

@@ -37,14 +37,15 @@
3737
<or>
3838
<equals arg1="${ant.java.version}" arg2="1.2"/>
3939
<equals arg1="${ant.java.version}" arg2="1.3"/>
40+
<equals arg1="${ant.java.version}" arg2="1.4"/>
4041
</or>
4142
</condition>
42-
<condition property="jdbc3">
43-
<equals arg1="${ant.java.version}" arg2="1.4"/>
44-
</condition>
4543
<condition property="datasource">
4644
<and>
47-
<equals arg1="${jdbc2}" arg2="true" />
45+
<or>
46+
<equals arg1="${ant.java.version}" arg2="1.2"/>
47+
<equals arg1="${ant.java.version}" arg2="1.3"/>
48+
</or>
4849
<available classname="javax.sql.DataSource"/>
4950
</and>
5051
</condition>
@@ -90,7 +91,7 @@
9091

9192
<exclude name="${package}/jdbc1/**" unless="jdbc1"/>
9293
<exclude name="${package}/jdbc2/**" unless="jdbc2"/>
93-
94+
9495
<exclude name="${package}/largeobject/PGblob.java" unless="jdbc2" />
9596
<exclude name="${package}/largeobject/PGclob.java" unless="jdbc2" />
9697

0 commit comments

Comments
 (0)