1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed build.xml to echo correct jdbc version under ant1.6

Browse Source
This commit is contained in:
Barry Lind 2002-06-27 04:38:01 +00:00
parent ca4ca0b098
commit 23e5da8a48
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/interfaces/jdbc/build.xml
View File

@ -6,7 +6,7 @@
This file now requires Ant 1.4.1. 2002-04-18 This file now requires Ant 1.4.1. 2002-04-18
$Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.23 2002/04/18 04:58:13 momjian Exp $ $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.24 2002/06/27 04:38:01 barry Exp $
--> -->
@ -42,11 +42,15 @@
<equals arg1="${ant.java.version}" arg2="1.4"/> <equals arg1="${ant.java.version}" arg2="1.4"/>
</or> </or>
</condition> </condition>
<condition property="jdbc3">
<equals arg1="${ant.java.version}" arg2="1.4"/>
</condition>
<condition property="datasource"> <condition property="datasource">
<and> <and>
<or> <or>
<equals arg1="${ant.java.version}" arg2="1.2"/> <equals arg1="${ant.java.version}" arg2="1.2"/>
<equals arg1="${ant.java.version}" arg2="1.3"/> <equals arg1="${ant.java.version}" arg2="1.3"/>
<equals arg1="${ant.java.version}" arg2="1.4"/>
</or> </or>
<available classname="javax.sql.DataSource"/> <available classname="javax.sql.DataSource"/>
</and> </and>
@ -113,15 +117,15 @@
--> -->
<target name="driver" depends="prepare,check_versions"> <target name="driver" depends="prepare,check_versions">
<!-- determine the edition text --> <!-- determine the edition text -->
<property name="edition" value="JDBC1" /> <condition property="edition" value="JDBC1">
<equals arg1="${jdbc1}" arg2="true"/>
</condition>
<condition property="edition" value="JDBC2"> <condition property="edition" value="JDBC2">
<or> <or>
<equals arg1="${jdbc2}" arg2="true"/> <equals arg1="${jdbc2}" arg2="true"/>
<equals arg1="${jdbc3}" arg2="true"/> <!-- fake it for now --> <equals arg1="${jdbc3}" arg2="true"/> <!-- fake it for now -->
</or> </or>
</condition> </condition>
<condition property="edition" value="JDBC2 Enterprise"> <condition property="edition" value="JDBC2 Enterprise">
<and> <and>
<available classname="javax.sql.DataSource" /> <available classname="javax.sql.DataSource" />