|
6 | 6 |
|
7 | 7 | This file now requires Ant 1.4.1. 2002-04-18 |
8 | 8 |
|
9 | | - $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.23 2002/04/18 04:58:13 momjian Exp $ |
| 9 | + $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.24 2002/06/27 04:38:01 barry Exp $ |
10 | 10 |
|
11 | 11 | --> |
12 | 12 |
|
|
42 | 42 | <equals arg1="${ant.java.version}" arg2="1.4"/> |
43 | 43 | </or> |
44 | 44 | </condition> |
| 45 | + <conditionproperty="jdbc3"> |
| 46 | + <equals arg1="${ant.java.version}" arg2="1.4"/> |
| 47 | + </condition> |
45 | 48 | <conditionproperty="datasource"> |
46 | 49 | <and> |
47 | 50 | <or> |
48 | 51 | <equals arg1="${ant.java.version}" arg2="1.2"/> |
49 | 52 | <equals arg1="${ant.java.version}" arg2="1.3"/> |
| 53 | + <equals arg1="${ant.java.version}" arg2="1.4"/> |
50 | 54 | </or> |
51 | 55 | <availableclassname="javax.sql.DataSource"/> |
52 | 56 | </and> |
|
113 | 117 | --> |
114 | 118 | <targetname="driver"depends="prepare,check_versions"> |
115 | 119 | <!-- determine the edition text--> |
116 | | - <propertyname="edition"value="JDBC1" /> |
| 120 | + <conditionproperty="edition"value="JDBC1"> |
| 121 | + <equals arg1="${jdbc1}" arg2="true"/> |
| 122 | + </condition> |
117 | 123 | <conditionproperty="edition"value="JDBC2"> |
118 | 124 | <or> |
119 | 125 | <equals arg1="${jdbc2}" arg2="true"/> |
120 | 126 | <equals arg1="${jdbc3}" arg2="true"/><!-- fake it for now--> |
121 | | - |
122 | 127 | </or> |
123 | 128 | </condition> |
124 | | - |
125 | 129 | <conditionproperty="edition"value="JDBC2 Enterprise"> |
126 | 130 | <and> |
127 | 131 | <availableclassname="javax.sql.DataSource" /> |
|
