Skip to content

Commit 42d26fb

Browse files
author
Peter Mount
committed
Finally created ant build.xml file
1 parent e34d442 commit 42d26fb

File tree

3 files changed

+68
-6
lines changed

3 files changed

+68
-6
lines changed

src/interfaces/jdbc/CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Tue Dec 19 17:30:00 GMT 2000 peter@retep.org.uk
2+
- Finally created ant build.xml file
3+
14
Mon Nov 20 08:12:00 GMT 2000 peter@retep.org.uk
25
- Encoding patch to Connection by wrobell@posexperts.com.pl
36

src/interfaces/jdbc/build.xml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<!--
2+
3+
build file to allow ant (http://jakarta.apache.org/ant/) to be used
4+
to build the PostgreSQL JDBC Driver.
5+
6+
$Id: build.xml,v 1.1 2000/12/19 17:33:39 peter Exp $
7+
8+
-->
9+
10+
<project name="postgresqlJDBC" default="jar" basedir=".">
11+
12+
13+
<!-- set global properties for this build -->
14+
<property name="src" value="." />
15+
<property name="dest" value="build" />
16+
<property name="package" value="org/postgresql" />
17+
18+
<!--
19+
This is a simpler method than utils.CheckVersion
20+
It defaults to jdbc1, but builds jdbc2 if the java.lang.Byte class is
21+
in the CLASSPATH (ie JDK1.2 or later), and then enterprise if the
22+
javax.sql.DataSource class is present.
23+
24+
Important: This must have the following order: jdbc1, jdbc2, enterprise
25+
-->
26+
<target name="check_versions">
27+
<available property="jdk1.2+" classname="java.lang.ThreadLocal" />
28+
<available property="jdk1.3+" classname="java.lang.StrictMath" />
29+
<available property="jdk1.2e+" classname="javax.sql.DataSource" />
30+
31+
<mkdir dir="${dest}" />
32+
</target>
33+
34+
<target name="clean">
35+
<delete dir="${dest}" />
36+
</target>
37+
38+
<!-- This is the core of the driver. It is common for all three versions -->
39+
<target name="compile" depends="check_versions">
40+
<javac srcdir="${src}" destdir="${dest}">
41+
<include name="${package}/**" />
42+
<exclude name="${package}/jdbc1/**" if="jdk1.2+" />
43+
<exclude name="${package}/jdbc2/**" unless="jdk1.2+" />
44+
<exclude name="${package}/largeobject/PGBlob.java" unless="jdk1.2+" />
45+
<exclude name="${package}/PostgresqlDataSource.java" unless="jdk1.2e+" />
46+
<exclude name="${package}/xa/**" unless="jdk1.2e+" />
47+
</javac>
48+
<copy todir="${dest}">
49+
<fileset dir="${src}">
50+
<include name="**/*.properties" />
51+
</fileset>
52+
</copy>
53+
</target>
54+
55+
<target name="jar" depends="compile">
56+
<jar jarfile="postgresql.jar" basedir="${dest}" includes="org/**" />
57+
</target>
58+
59+
</project>

src/interfaces/jdbc/utils/CheckVersion.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@ public static void main(String args[])
4141
{
4242
String vmversion = System.getProperty("java.vm.version");
4343

44+
System.out.println("postgresql.jdbc="+System.getProperty("postgresql.jdbc"));
45+
4446
// We are running a 1.1 JVM
4547
if(vmversion.startsWith("1.1")) {
4648
System.out.println("jdbc1");
47-
System.exit(0);
49+
//System.exit(0);
4850
}
49-
51+
else
5052
// We are running a 1.2 or 1.3 JVM
5153
if(vmversion.startsWith("1.2") ||
5254
vmversion.startsWith("1.3") ||
@@ -59,10 +61,8 @@ public static void main(String args[])
5961
System.out.println("enterprise");
6062
else
6163
System.out.println("jdbc2");
62-
System.exit(0);
64+
//System.exit(0);
6365
}
64-
65-
System.out.println("huho");
66-
System.exit(0);
66+
System.setProperty("postgresql.jdbc","yoyo");
6767
}
6868
}

0 commit comments

Comments
 (0)