|
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.25 2002/07/23 03:59:54 barry Exp $ |
| 9 | + $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.26 2002/07/30 11:38:13 davec Exp $ |
10 | 10 |
|
11 | 11 | --> |
12 | 12 |
|
|
21 | 21 | <propertyname="jardir"value="jars" /> |
22 | 22 | <propertyname="builddir"value="build" /> |
23 | 23 | <propertyname="package"value="org/postgresql" /> |
24 | | - <propertyname="debug"value="off" /> |
25 | | -
|
| 24 | + <propertyname="debug"value="on" /> |
| 25 | + |
26 | 26 | <!-- |
27 | 27 | This is a simpler method than utils.CheckVersion |
28 | 28 | It defaults to jdbc1, but builds jdbc2 if the java.lang.Byte class is |
|
40 | 40 | <equals arg1="${ant.java.version}" arg2="1.2"/> |
41 | 41 | <equals arg1="${ant.java.version}" arg2="1.3"/> |
42 | 42 | </or> |
43 | | - </condition> |
| 43 | + </condition> |
44 | 44 | <conditionproperty="jdbc3"> |
45 | 45 | <equals arg1="${ant.java.version}" arg2="1.4"/> |
46 | | - </condition> |
| 46 | + </condition> |
47 | 47 | <availableproperty="datasource"classname="javax.sql.DataSource"/> |
48 | 48 | <availableproperty="junit"classname="junit.framework.Test" /> |
49 | 49 | </target> |
|
88 | 88 | <excludename="${package}/jdbc1/**"unless="jdbc1"/> |
89 | 89 | <excludename="${package}/jdbc2/**"unless="jdbc2"/> |
90 | 90 | <excludename="${package}/jdbc3/**"unless="jdbc3"/> |
91 | | -
|
| 91 | + |
92 | 92 | <excludename="${package}/largeobject/PGblob.java"if="jdbc1" /> |
93 | 93 | <excludename="${package}/largeobject/PGclob.java"if="jdbc1" /> |
94 | 94 |
|
95 | | - <excludename="${package}/PostgresqlDataSource.java"unless="datasource" /> |
96 | | - <excludename="${package}/xa/**"unless="datasource" /> |
| 95 | + <excludename="${package}/jdbc2/optional/**"unless="datasource" /> |
| 96 | + |
| 97 | + <excludename="${package}/PostgresqlDataSource.java" /> |
| 98 | + <excludename="${package}/xa/**" /> |
97 | 99 |
|
98 | 100 | <excludename="${package}/test/**"unless="junit" /> |
99 | 101 | <excludename="${package}/test/jdbc2/**"if="jdbc1" /> |
| 102 | + <excludename="${package}/test/jdbc2/optional/**"unless="datasource" /> |
100 | 103 | <excludename="${package}/test/JDBC2Tests.java"if="jdbc1" /> |
101 | 104 | </javac> |
102 | 105 | </target> |
|
115 | 118 | <equals arg1="${jdbc2}" arg2="true"/> |
116 | 119 | </condition> |
117 | 120 | <conditionproperty="edition"value="JDBC3"> |
118 | | - <equals arg1="${jdbc3}" arg2="true"/> |
| 121 | + <equals arg1="${jdbc3}" arg2="true"/> |
119 | 122 | </condition> |
120 | 123 | <conditionproperty="edition"value="JDBC2 Enterprise"> |
121 | 124 | <and> |
|
212 | 215 |
|
213 | 216 | <!-- defaults for the tests - override these if required--> |
214 | 217 | <propertyname="database"value="jdbc:postgresql:test" /> |
215 | | - <propertyname="username"value="test" /> |
| 218 | + <propertyname="username"value="postgres" /> |
216 | 219 | <!-- Password must be something. Doesn't matter if trust is used!--> |
217 | 220 | <propertyname="password"value="password" /> |
218 | 221 | <!-- junit.ui is one of textui, awtui, or swingui--> |
|
