head	1.40;
access;
symbols
	REL7_4_29:1.38
	REL7_4_28:1.38
	REL7_4_27:1.38
	REL7_4_26:1.38
	REL7_4_25:1.38
	REL7_4_24:1.38
	REL7_4_23:1.38
	REL7_4_22:1.38
	REL7_4_21:1.38
	REL7_4_20:1.38
	REL7_3_21:1.36
	REL7_4_19:1.38
	REL7_3_20:1.36
	REL7_4_18:1.38
	REL7_3_19:1.36
	REL7_4_17:1.38
	REL7_3_18:1.36
	REL7_4_16:1.38
	REL7_4_15:1.38
	REL7_3_17:1.36
	REL7_4_14:1.38
	REL7_3_16:1.36
	REL7_3_15:1.36
	REL7_4_13:1.38
	REL7_3_14:1.36
	REL7_4_12:1.38
	REL7_3_13:1.36
	REL7_4_11:1.38
	REL7_3_12:1.36
	REL7_4_10:1.38
	REL7_3_11:1.36
	REL7_4_9:1.38
	REL7_2_8:1.33
	REL7_3_10:1.36
	REL7_4_8:1.38
	REL7_2_7:1.33
	REL7_3_9:1.36
	REL7_4_7:1.38
	REL7_4_6:1.38
	REL7_3_8:1.36
	REL7_2_6:1.33
	REL7_2_5:1.33
	REL7_4_5:1.38
	REL7_3_7:1.36
	REL7_4_4:1.38
	REL7_4_3:1.38
	REL7_4_2:1.38
	REL7_3_6:1.36
	REL7_4_1:1.38
	REL7_3_5:1.36
	REL7_4:1.38
	REL7_4_RC2:1.38
	REL7_4_STABLE:1.38.0.4
	REL7_4_RC1:1.38
	REL7_4_BETA5:1.38
	REL7_4_BETA4:1.38
	REL7_4_BETA3:1.38
	REL7_4_BETA2:1.38
	WIN32_DEV:1.38.0.2
	REL7_4_BETA1:1.38
	REL7_3_4:1.36
	REL7_3_2:1.36
	REL7_2_4:1.33
	REL7_3_STABLE:1.36.0.2
	REL7_2_3:1.33
	REL7_2_STABLE:1.33.0.2
	REL7_2:1.33
	REL7_2_RC2:1.33
	REL7_2_RC1:1.33
	REL7_2_BETA5:1.33
	REL7_2_BETA4:1.33
	REL7_2_BETA3:1.33
	REL7_2_BETA2:1.33
	REL7_2_BETA1:1.33
	REL7_1_2:1.28
	REL7_1_STABLE:1.28.0.2
	REL7_1_BETA:1.25
	REL7_1_BETA3:1.25
	REL7_1_BETA2:1.25
	REL7_1:1.28
	REL7_0_PATCHES:1.22.0.2
	REL7_0:1.21
	REL6_5_PATCHES:1.14.0.2
	REL6_5:1.14
	REL6_4:1.10.0.2
	release-6-3:1.6;
locks; strict;
comment	@# @;


1.40
date	2004.01.19.20.07.05;	author pgsql;	state dead;
branches;
next	1.39;

1.39
date	2003.11.29.19.52.09;	author pgsql;	state Exp;
branches;
next	1.38;

1.38
date	2003.02.12.06.13.04;	author barry;	state Exp;
branches;
next	1.37;

1.37
date	2002.12.11.12.27.47;	author davec;	state Exp;
branches;
next	1.36;

1.36
date	2002.10.20.02.55.50;	author barry;	state Exp;
branches;
next	1.35;

1.35
date	2002.07.23.03.59.54;	author barry;	state Exp;
branches;
next	1.34;

1.34
date	2002.03.05.17.55.23;	author momjian;	state Exp;
branches;
next	1.33;

1.33
date	2001.07.06.23.07.20;	author petere;	state Exp;
branches;
next	1.32;

1.32
date	2001.06.07.20.24.54;	author momjian;	state Exp;
branches;
next	1.31;

1.31
date	2001.05.25.14.28.58;	author momjian;	state Exp;
branches;
next	1.30;

1.30
date	2001.05.17.03.22.53;	author momjian;	state Exp;
branches;
next	1.29;

1.29
date	2001.05.17.00.29.52;	author momjian;	state Exp;
branches;
next	1.28;

1.28
date	2001.03.11.11.07.00;	author petere;	state Exp;
branches;
next	1.27;

1.27
date	2001.03.05.09.39.53;	author peter;	state Exp;
branches;
next	1.26;

1.26
date	2001.01.18.14.50.14;	author peter;	state Exp;
branches;
next	1.25;

1.25
date	2000.10.12.08.55.23;	author peter;	state Exp;
branches;
next	1.24;

1.24
date	2000.09.12.04.58.46;	author momjian;	state Exp;
branches;
next	1.23;

1.23
date	2000.06.06.11.05.56;	author peter;	state Exp;
branches;
next	1.22;

1.22
date	2000.05.15.21.32.51;	author peter;	state Exp;
branches
	1.22.2.1;
next	1.21;

1.21
date	2000.05.05.07.35.29;	author peter;	state Exp;
branches;
next	1.20;

1.20
date	2000.05.03.15.58.08;	author peter;	state Exp;
branches;
next	1.19;

1.19
date	2000.04.26.14.19.29;	author momjian;	state Exp;
branches;
next	1.18;

1.18
date	2000.03.14.15.55.17;	author momjian;	state Exp;
branches;
next	1.17;

1.17
date	2000.03.08.01.58.25;	author momjian;	state Exp;
branches;
next	1.16;

1.16
date	99.09.15.21.56.16;	author peter;	state Exp;
branches;
next	1.15;

1.15
date	99.09.14.05.50.27;	author peter;	state Exp;
branches;
next	1.14;

1.14
date	99.06.23.05.56.17;	author peter;	state Exp;
branches;
next	1.13;

1.13
date	99.05.17.22.58.18;	author peter;	state Exp;
branches;
next	1.12;

1.12
date	99.01.25.21.22.02;	author scrappy;	state Exp;
branches;
next	1.11;

1.11
date	99.01.17.04.51.49;	author momjian;	state Exp;
branches;
next	1.10;

1.10
date	98.10.08.00.38.18;	author momjian;	state Exp;
branches;
next	1.9;

1.9
date	98.09.03.02.29.41;	author momjian;	state Exp;
branches;
next	1.8;

1.8
date	98.06.03.18.56.09;	author scrappy;	state Exp;
branches;
next	1.7;

1.7
date	98.04.06.00.30.36;	author momjian;	state Exp;
branches;
next	1.6;

1.6
date	98.02.09.03.22.30;	author scrappy;	state Exp;
branches;
next	1.5;

1.5
date	98.02.02.13.16.38;	author scrappy;	state Exp;
branches;
next	1.4;

1.4
date	98.01.13.02.19.10;	author scrappy;	state Exp;
branches;
next	1.3;

1.3
date	98.01.11.21.14.29;	author scrappy;	state Exp;
branches;
next	1.2;

1.2
date	97.09.29.20.11.42;	author scrappy;	state Exp;
branches;
next	1.1;

1.1
date	97.09.26.08.22.21;	author scrappy;	state Exp;
branches;
next	;

1.22.2.1
date	2000.06.15.04.12.23;	author momjian;	state Exp;
branches;
next	;


desc
@@


1.40
log
@
JDBC is now on GBorg
@
text
@#-------------------------------------------------------------------------
#
# Makefile for JDBC driver
#
# Copyright (c) 2001, PostgreSQL Global Development Group
#
# $PostgreSQL: pgsql-server/src/interfaces/jdbc/Makefile,v 1.39 2003/11/29 19:52:09 pgsql Exp $
#
#-------------------------------------------------------------------------

subdir = src/interfaces/jdbc
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global

majorversion:= $(shell echo $(VERSION) | sed 's/^\([0-9][0-9]*\)\..*$$/\1/')
minorversion:= $(shell echo $(VERSION) | sed 's/^[0-9][0-9]*\.\([0-9][0-9]*\).*$$/\1/')

build.properties: $(top_builddir)/src/Makefile.global
	@@echo "# This file was created by 'make build.properties'." > build.properties
	@@echo major=$(majorversion) >> build.properties
	@@echo minor=$(minorversion) >> build.properties
	@@echo fullversion=$(VERSION) >> build.properties
	@@echo def_pgport=$(DEF_PGPORT) >> build.properties
	@@echo enable_debug=$(enable_debug) >> build.properties

all: build.properties
	$(ANT) -buildfile $(srcdir)/build.xml all

install: installdirs build.properties
	$(ANT) -buildfile $(srcdir)/build.xml install \
	  -Dinstall.directory=$(javadir)

installdirs:
	$(mkinstalldirs) $(javadir) 

uninstall:
	$(ANT) -buildfile $(srcdir)/build.xml uninstall \
	  -Dinstall.directory=$(javadir)

clean distclean maintainer-clean:
	$(ANT) -buildfile $(srcdir)/build.xml clean_all

check: build.properties
	$(ANT) -buildfile $(srcdir)/build.xml test
@


1.39
log
@
$Header: -> $PostgreSQL Changes ...
@
text
@d7 1
a7 1
# $PostgreSQL: /cvsroot/pgsql-server/src/interfaces/jdbc/Makefile,v 1.38 2003/02/12 06:13:04 barry Exp $
@


1.38
log
@Patch to messages file from Holger Klawitter to add a missing message.
Patch to makefile to clean up some of the output

 Modified Files:
 	jdbc/Makefile jdbc/org/postgresql/errors.properties
 	jdbc/org/postgresql/errors_de.properties
@
text
@d7 1
a7 1
# $Header: /cvsroot/pgsql-server/src/interfaces/jdbc/Makefile,v 1.37 2002/12/11 12:27:47 davec Exp $
@


1.37
log
@Mike Beachy's build patch to allow ant builds without make
@
text
@d7 1
a7 1
# $Header: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/Makefile,v 1.36 2002/10/20 02:55:50 barry Exp $
d19 6
a24 6
	echo "# This file was created by 'make build.properties'." > build.properties
	echo major=$(majorversion) >> build.properties
	echo minor=$(minorversion) >> build.properties
	echo fullversion=$(VERSION) >> build.properties
	echo def_pgport=$(DEF_PGPORT) >> build.properties
	echo enable_debug=$(enable_debug) >> build.properties
@


1.36
log
@Applied patch from Teofilis Martisius to improve performance.
Also removed some unused files and fixed the which needed a small change
after the previous patch to build.xml.

 Modified Files:
 	jdbc/Makefile jdbc/org/postgresql/core/Encoding.java
 	jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
 Removed Files:
 	jdbc/utils/CheckVersion.java jdbc/utils/buildDriver
 	jdbc/utils/changelog.pl
@
text
@d7 1
a7 1
# $Header: /cvsroot/pgsql-server/src/interfaces/jdbc/Makefile,v 1.35 2002/07/23 03:59:54 barry Exp $
d15 2
a16 2
majorversion := $(shell echo $(VERSION) | sed 's/^\([0-9][0-9]*\)\..*$$/\1/')
minorversion := $(shell echo $(VERSION) | sed 's/^[0-9][0-9]*\.\([0-9][0-9]*\).*$$/\1/')
d18 7
a24 8
properties := -Dmajor=$(majorversion) -Dminor=$(minorversion) \
		-Dfullversion=$(VERSION) \
		-Ddef_pgport=$(DEF_PGPORT) \
		-Denable_debug=$(enable_debug)

all:
	$(ANT) -buildfile $(srcdir)/build.xml all \
	  $(properties)
d26 4
a29 1
install: installdirs
d31 1
a31 1
	  -Dinstall.directory=$(javadir) $(properties)
d41 1
a41 1
	$(ANT) -buildfile $(srcdir)/build.xml clean
d43 2
a44 2
check: all
	$(ANT) -buildfile $(srcdir)/build.xml test $(properties)
@


1.35
log
@Initial restructuring to add jdbc3 support.  There was a significant amount
of duplicated code between the jdbc1 and jdbc2.  This checkin restructures
the code so that the duplication is removed so that the jdbc3 support
can be added without adding yet another copy of everything.  Also many
classes were renamed to avoid confusion with multiple different objects
having the same name.  The timestamp tests were also updated to add support
for testing timestamp without time zone in addition to timestamp with time zone

 Modified Files:
 	jdbc/Makefile jdbc/build.xml jdbc/example/ImageViewer.java
 	jdbc/example/basic.java jdbc/example/blobtest.java
 	jdbc/example/threadsafe.java
 	jdbc/org/postgresql/Driver.java.in
 	jdbc/org/postgresql/Field.java
 	jdbc/org/postgresql/core/QueryExecutor.java
 	jdbc/org/postgresql/fastpath/Fastpath.java
 	jdbc/org/postgresql/jdbc1/CallableStatement.java
 	jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
 	jdbc/org/postgresql/jdbc1/PreparedStatement.java
 	jdbc/org/postgresql/jdbc2/Array.java
 	jdbc/org/postgresql/jdbc2/CallableStatement.java
 	jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
 	jdbc/org/postgresql/jdbc2/PreparedStatement.java
 	jdbc/org/postgresql/jdbc2/UpdateableResultSet.java
 	jdbc/org/postgresql/largeobject/LargeObjectManager.java
 	jdbc/org/postgresql/largeobject/PGblob.java
 	jdbc/org/postgresql/largeobject/PGclob.java
 	jdbc/org/postgresql/test/jdbc2/BlobTest.java
 	jdbc/org/postgresql/test/jdbc2/ConnectionTest.java
 	jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
 	jdbc/org/postgresql/test/jdbc2/TimestampTest.java
 	jdbc/org/postgresql/test/jdbc2/UpdateableResultTest.java
 	jdbc/org/postgresql/util/Serialize.java
 Added Files:
 	jdbc/org/postgresql/PGConnection.java
 	jdbc/org/postgresql/PGStatement.java
 	jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
 	jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
 	jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
 	jdbc/org/postgresql/jdbc1/Jdbc1Connection.java
 	jdbc/org/postgresql/jdbc1/Jdbc1ResultSet.java
 	jdbc/org/postgresql/jdbc1/Jdbc1Statement.java
 	jdbc/org/postgresql/jdbc2/AbstractJdbc2Connection.java
 	jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
 	jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
 	jdbc/org/postgresql/jdbc2/Jdbc2Connection.java
 	jdbc/org/postgresql/jdbc2/Jdbc2ResultSet.java
 	jdbc/org/postgresql/jdbc2/Jdbc2Statement.java
 Removed Files:
 	jdbc/org/postgresql/Connection.java
 	jdbc/org/postgresql/ResultSet.java
 	jdbc/org/postgresql/Statement.java
 	jdbc/org/postgresql/jdbc1/Connection.java
 	jdbc/org/postgresql/jdbc1/ResultSet.java
 	jdbc/org/postgresql/jdbc1/Statement.java
 	jdbc/org/postgresql/jdbc2/Connection.java
 	jdbc/org/postgresql/jdbc2/ResultSet.java
 	jdbc/org/postgresql/jdbc2/Statement.java
@
text
@d7 1
a7 1
# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.34 2002/03/05 17:55:23 momjian Exp $
d32 1
a32 1
	$(mkinstalldirs) $(javadir)
d42 1
a42 1
	$(ANT) -buildfile $(srcdir)/build.xml test
@


1.34
log
@At this moment, --enable-debug adds debugging information to most of the
parts o f postgresql. The jdbc drivers are never compiled with debugging
support. This p atch make sure that debugging information is added to
the jdbc jar when the --en able-debug is added. This was usefull for me
for debugging some java jdbc poolin g objects but this might perhaps be
usefull for other people too?

Dries Verachtert
@
text
@d7 1
a7 1
# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.33 2001/07/06 23:07:20 petere Exp $
d41 1
a41 1
check:
@


1.33
log
@Resolve a number of oddities in the Java build.  First, remove the weird
redirections between the build files, which didn't work completely.  Now
you just go to the directory of your choice and run make.  Clean up the
build files to have a logical order, fix the unnecessary rebuilds, prevent
the deleting targets from removing files they're not responsible for.  Ant
1.3 does not have a bug.  It deletes directories just fine if you follow
the documentation.
@
text
@d7 1
a7 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.32 2001/06/07 20:24:54 momjian Exp $
d20 2
a21 1
		-Ddef_pgport=$(DEF_PGPORT)
@


1.32
log
@Document and work around ANT bug that prevents directory deletion.
@
text
@d3 1
a3 1
# Makefile for src/interfaces
d5 1
a5 1
# Copyright (c) 1994, Regents of the University of California
d7 1
a7 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.31 2001/05/25 14:28:58 momjian Exp $
d23 2
a24 1
	$(ANT) -buildfile $(top_srcdir)/build.xml $(properties)
d27 2
a28 3
	$(ANT) -Dinstall.directory=$(javadir) \
		-buildfile $(top_srcdir)/build.xml \
		install $(properties)
d31 1
a31 1
	$(mkinstalldirs) $(DESTDIR)$(datadir)/java
d34 2
a35 3
	$(ANT) -Dinstall.directory=$(DESTDIR)$(datadir)/java \
		-buildfile $(top_srcdir)/build.xml \
		uninstall
d38 4
a41 3
	$(ANT) -buildfile $(top_srcdir)/build.xml clean
	# ANT 1.3 has a bug that prevents directory deletion
	rm -rf build jars
@


1.31
log
@The following patch corrects a make install problem when building
under Cygwin.  The root cause of this problem is that (Sun) java is a
native Win32 app and hence does not understand Cygwin Posix style paths.
The solution is to use Cygwin's cygpath utility to convert the Posix style
JDBC installation directory path into a Win32 one before invoking ant.

I'm not sure if my patch is the best way to correct this issue but
my goal was to confine the Cygwin specific constructs to

Jason Tishler
@
text
@d7 1
a7 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.30 2001/05/17 03:22:53 momjian Exp $
d40 2
@


1.30
log
@Fix 'make clean' with jdbc and ant by using filesets.
@
text
@d7 1
a7 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.29 2001/05/17 00:29:52 momjian Exp $
d26 1
a26 1
	$(ANT) -Dinstall.directory=$(DESTDIR)$(datadir)/java \
@


1.29
log
@Mark column as not used.
@
text
@d7 1
a7 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.28 2001/03/11 11:07:00 petere Exp $
a39 1
	rm -f org/postgresql/Driver.java
@


1.28
log
@Add uninstall target to Java build.
Respect default port setting in JDBC driver.
Pick up version number from Makefile.global.
Change installation directory to share/java/.
Document.
@
text
@d7 1
a7 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.27 2001/03/05 09:39:53 peter Exp $
d40 1
@


1.27
log
@

Ok, I've split todays commit into three, the first two already done had some
bits in JDBC & the first set of tools into contrib.

This is the third, and deals with enabling JDBC to be compiled with the main
source.

What it does is add a new option to configure: --with-java

This option tells configure to look for ant (our build tool of choice) and
if found, it then compiles both the JDBC driver and the new tools as part
of the normal make.

Also, when the postgresql install is done, all the .jar files are also
installed into the ${PGLIB}/java directory (thought best to keep then separate)

Now I had some conflicts when this applied so could someone please double check
that everything is ok?

Peter
@
text
@d7 1
a7 1
# $Header: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/Makefile,v 1.43 2000/09/25 22:23:00 petere Exp $
d15 2
a16 2
all distprep:
	@@$(ANT) -buildfile $(top_builddir)/build.xml
d18 19
a36 7
install:
	@@$(ANT) -Dinstall.directory=$(DESTDIR)$(libdir)/java \
		-buildfile $(top_builddir)/build.xml \
		install

installdirs uninstall dep depend:
	@@echo Nothing for JDBC
d39 1
a39 2
	@@$(ANT) -buildfile $(top_builddir)/build.xml clean

@


1.26
log
@Thu Jan 18 12:24:00 GMT 2001 peter@@retep.org.uk
        - These methods in org.postgresql.jdbc2.ResultSet are now implemented:
            getBigDecimal(int) ie: without a scale (why did this get missed?)
            getBlob(int)
            getCharacterStream(int)
            getConcurrency()
            getDate(int,Calendar)
            getFetchDirection()
            getFetchSize()
            getTime(int,Calendar)
            getTimestamp(int,Calendar)
            getType()
          NB: Where int represents the column name, the associated version
              taking a String were already implemented by calling the int
              version.
        - These methods no longer throw the not implemented but the new noupdate
          error. This is in preparation for the Updateable ResultSet support
          which will overide these methods by extending the existing class to
          implement that functionality, but needed to show something other than
          notimplemented:
            cancelRowUpdates()
            deleteRow()
        - Added new error message into errors.properties "postgresql.noupdate"
          This is used by jdbc2.ResultSet when an update method is called and
          the ResultSet is not updateable. A new method notUpdateable() has been
          added to that class to throw this exception, keeping the binary size
          down.
        - Added new error message into errors.properties "postgresql.psqlnotimp"
          This is used instead of unimplemented when it's a feature in the
          backend that is preventing this method from being implemented.
        - Removed getKeysetSize() as its not part of the ResultSet API

Thu Jan 18 09:46:00 GMT 2001 peter@@retep.org.uk
        - Applied modified patch from Richard Bullington-McGuire
          <rbulling@@microstate.com>. I had to modify it as some of the code
          patched now exists in different classes, and some of it actually
          patched obsolete code.

Wed Jan 17 10:19:00 GMT 2001 peter@@retep.org.uk
        - Updated Implementation to include both ANT & JBuilder
        - Updated README to reflect the changes since 7.0
	- Created jdbc.jpr file which allows JBuilder to be used to edit the
          source. JBuilder _CAN_NOT_ be used to compile. You must use ANT for
          that. It's only to allow JBuilders syntax checking to improve the
          drivers source. Refer to Implementation for more details
@
text
@d3 1
a3 2
# Makefile
#    Makefile for Java JDBC interface
d5 3
a7 2
# IDENTIFICATION
#    $Id: Makefile,v 1.25 2000/10/12 08:55:23 peter Exp $
d11 11
a21 239
subdir		= src/interfaces
top_builddir	= ../../..
include		$(top_builddir)/src/Makefile.global

CP		= cp
FIND		= find
IDL2JAVA	= idltojava -fno-cpp -fno-tie
JAR		= jar
JAVA		= java
JAVAC		= javac -g
JAVADOC		= javadoc
RM		= rm -f
TOUCH		= touch

BUILDDRIVER	= sh utils/buildDriver
CHANGELOG	= perl utils/changelog.pl

# This defines how to compile a java class
.java.class:
	$(JAVAC) $<

.SUFFIXES:	.class .java
.PHONY:		all clean doc examples msg

# This is the base directory of the driver. In 7.0, this changed from
# postgresql to org/postgresql
PGBASE		= org/postgresql

# New for 7.1: The jar filename
JARFILE		= postgresql.jar

all:
	@@echo ------------------------------------------------------------
	@@echo The use of Make to build the driver is now depreciated in
	@@echo version 7.1 and later. To build the driver you now need to
	@@echo use ANT. This is the build tool of the Jakarta project, and
	@@echo you can obtain this from http://jakarta.apache.org/ant/
	@@echo
	@@echo Once you have this installed, change directory to the root
	@@echo directory of the postgresql source and type ant.
	@@echo
	@@echo ie: if you are currently in the pgsql/src/interfaces/jdbc
	@@echo directory then cd into the pgsql one \(cd ../../.. should
	@@echo do\).
	@@echo
	@@echo The file Implementation contains more info on this, as does
	@@echo the homepage http://jdbc.postgresql.org/
	@@echo ------------------------------------------------------------

# Yet another attempt to check the version. In theory, any JVM that fails
# this is breaking the versioning specifications released by Javasoft.
#
# In 7.1 this is renamed oldall so that the depreciated message is shown.
#
oldall:	utils/CheckVersion.class
	@@$(MAKE) `$(JAVA) utils.CheckVersion`

# For 6.5.3 and 7.0+, we need to select the correct JDBC API, so prompt
# for the version.
huho:	
	@@echo ------------------------------------------------------------
	@@echo Due to problems with some JVMs that dont return a meaningful
	@@echo version number, we have had to make the choice of what jdbc
	@@echo version is built as a compile time option.
	@@echo
	@@echo If you are using JDK1.1.x, you will need the JDBC1.2 driver.
	@@echo To compile, type:
	@@echo "  make jdbc1"
	@@echo
	@@echo "If you are using JDK1.2 (aka Java2) you need the JDBC2."
	@@echo To compile, type:
	@@echo "  make jdbc2"
	@@echo
	@@echo "If you are using the Java2 Enterprise Edition, you can use"
	@@echo "either the standard driver above, or compile the standard"
	@@echo "extensions version of the driver. Type:"
	@@echo "  make enterprise"
	@@echo
	@@echo Once you have done this, a postgresql.jar file will be
	@@echo produced. This file will only work with that particular
	@@echo version of virtual machine.
	@@echo
	@@echo ------------------------------------------------------------

# In 7.1 replaced msg so that the depreciated message is shown.
msg: all

oldmsg:	
	@@echo ------------------------------------------------------------
	@@echo The JDBC driver has now been built. To make it available to
	@@echo other applications, copy the postgresql.jar file to a public
	@@echo "place (under unix this could be /usr/local/lib) and add it"
	@@echo to the class path.
	@@echo
	@@echo Then either add -Djdbc.drivers=org.postgresql.Driver to the
	@@echo commandline when running your application, or edit the
	@@echo "properties file for your application (~/.hotjava/properties"
	@@echo "under unix for HotJava), and add a line containing"
	@@echo jdbc.drivers=org.postgresql.Driver
	@@echo
	@@echo More details are in the README file and in the main postgresql
	@@echo documentation.
	@@echo
	@@echo ------------------------------------------------------------
	@@echo To build the examples, type:
	@@echo "JDBC1:  make examples"
	@@echo "JDBC2:  make examples2"
	@@echo
	@@echo "To build the CORBA example (requires Java2):"
	@@echo "  make corba"
	@@echo
	@@echo "To make the tests, type:"
	@@echo "  make tests"
	@@echo
	@@echo "To build the GUI Shell, type:"
	@@echo "  make retepsql"
	@@echo
	@@echo ------------------------------------------------------------
	@@echo

dep depend:

# This rule builds the javadoc documentation
doc:
	export CLASSPATH=.;\
		$(JAVADOC) -public \
			org.postgresql \
			org.postgresql.fastpath \
			org.postgresql.largeobject

# These classes form the driver. These, and only these are placed into
# the jar file.
OBJ_COMMON=	$(PGBASE)/Connection.class \
		$(PGBASE)/Driver.class \
		$(PGBASE)/Field.class \
		$(PGBASE)/PG_Stream.class \
		$(PGBASE)/ResultSet.class \
		$(PGBASE)/errors.properties \
		$(PGBASE)/errors_fr.properties \
		$(PGBASE)/fastpath/Fastpath.class \
		$(PGBASE)/fastpath/FastpathArg.class \
		$(PGBASE)/geometric/PGbox.class \
		$(PGBASE)/geometric/PGcircle.class \
		$(PGBASE)/geometric/PGline.class \
		$(PGBASE)/geometric/PGlseg.class \
		$(PGBASE)/geometric/PGpath.class \
		$(PGBASE)/geometric/PGpoint.class \
		$(PGBASE)/geometric/PGpolygon.class \
		$(PGBASE)/largeobject/LargeObject.class \
		$(PGBASE)/largeobject/LargeObjectManager.class \
		$(PGBASE)/util/PGmoney.class \
		$(PGBASE)/util/PGobject.class \
		$(PGBASE)/util/PGtokenizer.class \
		$(PGBASE)/util/PSQLException.class \
		$(PGBASE)/util/Serialize.class \
		$(PGBASE)/util/UnixCrypt.class

# These files are unique to the JDBC 1 (JDK 1.1) driver
OBJ_JDBC1=	$(PGBASE)/jdbc1/CallableStatement.class \
		$(PGBASE)/jdbc1/Connection.class \
		$(PGBASE)/jdbc1/DatabaseMetaData.class \
		$(PGBASE)/jdbc1/PreparedStatement.class \
		$(PGBASE)/jdbc1/ResultSet.class \
		$(PGBASE)/jdbc1/ResultSetMetaData.class \
		$(PGBASE)/jdbc1/Statement.class

# These files are unique to the JDBC 2 (JDK 2 nee 1.2) driver
OBJ_JDBC2=	$(PGBASE)/jdbc2/ResultSet.class \
		$(PGBASE)/jdbc2/PreparedStatement.class \
		$(PGBASE)/jdbc2/CallableStatement.class \
		$(PGBASE)/jdbc2/Connection.class \
		$(PGBASE)/jdbc2/DatabaseMetaData.class \
		$(PGBASE)/jdbc2/ResultSetMetaData.class \
		$(PGBASE)/jdbc2/Statement.class \
		$(PGBASE)/largeobject/PGblob.class

# These files are unique to the JDBC2 Enterprise driver
OBJ_ENTER=	$(OBJ_JDBC2) \
		$(PGBASE)/PostgresqlDataSource.class \
		$(PGBASE)/xa/ClientConnection.class \
		$(PGBASE)/xa/TwoPhaseConnection.class \
		$(PGBASE)/xa/TxConnection.class \
		$(PGBASE)/xa/XAConnectionImpl.class \
		$(PGBASE)/xa/XADataSourceImpl.class

# This rule builds the JDBC1 compliant driver
jdbc1:
	$(BUILDDRIVER) $(VERSION) org.postgresql.jdbc1.Connection JDBC1.1 $(PGBASE)/Driver.java
	-$(RM) postgresql.jar
	@@$(MAKE) jdbc1real

# This rule does the real work for JDBC1.2, however do not call it directly.
# This is because the JDBC driver relies on the org.postgresql.DriverClass
# class to determine the driver version.
jdbc1real: $(OBJ_COMMON) $(OBJ_JDBC1) $(JARFILE) msg

# This rule builds the JDBC2 compliant driver
jdbc2:
	@@$(MAKE) jdbc2internal msg

# This allows us to build the jdbc2 driver without displaying the msg
# refer to the retepsql rule to see why.
jdbc2internal:
	$(BUILDDRIVER) $(VERSION) org.postgresql.jdbc2.Connection Java2 $(PGBASE)/Driver.java
	-$(RM) postgresql.jar
	@@$(MAKE) jdbc2real

# This rule does the real work for JDBC2, however do not call it directly.
# This is because the JDBC driver relies on the org.postgresql.DriverClass
# class to determine the driver version.
jdbc2real: $(OBJ_COMMON) $(OBJ_JDBC2) $(JARFILE)

# This rule builds the enterprise edition of the driver
enterprise:
	$(BUILDDRIVER) $(VERSION) org.postgresql.jdbc2.Connection Enterprise $(PGBASE)/Driver.java
	-$(RM) postgresql.jar
	@@$(MAKE) enterprisereal

# This rule does the real work for JDBC2 Enterprise Edition, however do not
# call it directly. This is because the JDBC driver relies on the
# org.postgresql.DriverClass class to determine the driver version.
enterprisereal: $(OBJ_COMMON) $(OBJ_ENTER) $(JARFILE)

# We use the old `cmd` notation here as some older shells (mainly sh under
# Solaris) don't recognise the newer $(cmd) syntax.
#
$(JARFILE): $(OBJ) $(OBJ_COMMON)
	$(JAR) -c0f $@@ `$(FIND) $(PGBASE) -name "*.class" -print` \
		$(wildcard $(PGBASE)/*.properties)

# This rule removes any temporary and compiled files from the source tree.
#
clean:
	$(FIND) . -name "*~" -exec $(RM) {} \;
	$(FIND) . -name "*.class" -exec $(RM) {} \;
	-$(RM) -rf stock example/corba/stock.built
	-$(RM) postgresql.jar org/postgresql/Driver.java
	-$(RM) -rf Package-postgresql *output
	-$(RM) retepsql.jar manifest
d23 2
a24 3
# New for 7.1
install:	$(JARFILE)
	$(CP) $(JARFILE) $(libdir)
d26 2
a27 188
# This converts CHANGELOG into an html format - used by peter@@retep.org.uk
# to produce an online version
changelog: changelog.html
changelog.html: CHANGELOG
	$(CHANGELOG) $< >$@@

#######################################################################
# This helps make workout what classes are from what source files
#
# Java is unlike C in that one source file can generate several
# _Different_ file names
#
$(PGBASE)/Connection.class:		$(PGBASE)/Connection.java
$(PGBASE)/DatabaseMetaData.class:	$(PGBASE)/DatabaseMetaData.java
$(PGBASE)/Driver.class:			$(PGBASE)/Driver.java
$(PGBASE)/Field.class:			$(PGBASE)/Field.java
$(PGBASE)/PG_Stream.class:		$(PGBASE)/PG_Stream.java
$(PGBASE)/PreparedStatement.class:	$(PGBASE)/PreparedStatement.java
$(PGBASE)/ResultSet.class:		$(PGBASE)/ResultSet.java
$(PGBASE)/ResultSetMetaData.class:	$(PGBASE)/ResultSetMetaData.java
$(PGBASE)/Statement.class:		$(PGBASE)/Statement.java
$(PGBASE)/fastpath/Fastpath.class:	$(PGBASE)/fastpath/Fastpath.java
$(PGBASE)/fastpath/FastpathArg.class:	$(PGBASE)/fastpath/FastpathArg.java
$(PGBASE)/geometric/PGbox.class:	$(PGBASE)/geometric/PGbox.java
$(PGBASE)/geometric/PGcircle.class:	$(PGBASE)/geometric/PGcircle.java
$(PGBASE)/geometric/PGlseg.class:	$(PGBASE)/geometric/PGlseg.java
$(PGBASE)/geometric/PGpath.class:	$(PGBASE)/geometric/PGpath.java
$(PGBASE)/geometric/PGpoint.class:	$(PGBASE)/geometric/PGpoint.java
$(PGBASE)/geometric/PGpolygon.class:	$(PGBASE)/geometric/PGpolygon.java
$(PGBASE)/largeobject/LargeObject.class: $(PGBASE)/largeobject/LargeObject.java
$(PGBASE)/largeobject/LargeObjectManager.class: $(PGBASE)/largeobject/LargeObjectManager.java
$(PGBASE)/util/PGmoney.class:		$(PGBASE)/util/PGmoney.java
$(PGBASE)/util/PGobject.class:		$(PGBASE)/util/PGobject.java
$(PGBASE)/util/PGtokenizer.class:	$(PGBASE)/util/PGtokenizer.java
$(PGBASE)/util/Serialize.class:	$(PGBASE)/util/Serialize.java
$(PGBASE)/util/UnixCrypt.class:	$(PGBASE)/util/UnixCrypt.java

#######################################################################
# These classes are in the example directory, and form the examples
EX=	example/basic.class \
	example/psql.class \
	example/ImageViewer.class

# These are only valid for JDBC2
EX2=	example/blobtest.class

# These are really test classes not true examples
TESTS=	example/metadata.class \
	example/threadsafe.class \
	example/Unicode.class

# Non functional/obsolete examples
#	example/datestyle.class \
#	example/Objects.class

# This rule builds the examples
examples:	postgresql.jar $(EX)
	@@echo ------------------------------------------------------------
	@@echo The examples have been built.
	@@echo
	@@echo For instructions on how to use them, simply run them. For example:
	@@echo
	@@echo "  java example.basic"
	@@echo
	@@echo This would display instructions on how to run the example.
	@@echo ------------------------------------------------------------
	@@echo Available examples:
	@@echo
	@@echo "  example.basic        Basic JDBC useage"
	@@echo "  example.datestyle    Shows how datestyles are handled"
	@@echo "  example.ImageViewer  Example application storing images"
	@@echo "  example.psql         Simple java implementation of psql"
	@@echo " "
	@@echo ------------------------------------------------------------
	@@echo

examples2:	$(EX2) examples
	@@echo "The following JDBC2 only examples have also been built:"
	@@echo
	@@echo "  example.blobtest     Binary Large Object tests"
	@@echo
	@@echo ------------------------------------------------------------
	@@echo

tests:	$(TESTS)
	@@echo ------------------------------------------------------------
	@@echo The following tests have been built:
	@@echo "  example.metadata     Tests various metadata methods"
	@@echo "  example.threadsafe   Tests the driver's thread safety"
	@@echo "  example.Unicode      Tests unicode charset support"
	@@echo ------------------------------------------------------------
	@@echo

example/basic.class:			example/basic.java
example/blobtest.class:			example/blobtest.java
example/datestyle.class:		example/datestyle.java
example/psql.class:			example/psql.java
example/ImageViewer.class:		example/ImageViewer.java
example/threadsafe.class:		example/threadsafe.java
example/metadata.class:			example/metadata.java
example/Unicode.class:                  example/Unicode.java

#######################################################################
#
# CORBA		This extensive example shows how to integrate PostgreSQL
#		JDBC & CORBA.

CORBASRC = $(wildcard example/corba/*.java)
CORBAOBJ = $(subst .java,.class,$(CORBASRC))

corba: jdbc2 example/corba/stock.built $(CORBAOBJ)
	@@echo -------------------------------------------------------
	@@echo The corba example has been built. Before running, you
	@@echo will need to read the example/corba/readme file on how
	@@echo to run the example.
	@@echo

#
# This compiles our idl file and the stubs
#
# Note: The idl file is in example/corba, but it builds a directory under
# the current one. For safety, we delete that directory before running
# idltojava
#
example/corba/stock.built: example/corba/stock.idl
	-rm -rf stock
	$(IDL2JAVA) $<
	$(JAVAC) stock/*.java
	$(TOUCH) $@@

# tip: we cant use $(wildcard stock/*.java) in the above rule as a race
#      condition occurs, where javac is passed no arguments
#######################################################################
#
# JPGSql	This isn't really an example, but an entire frontend
#		for PostgreSQL via Java & JDBC.
#
# Requirements:	Java2 platform (JDK1.2.x or 1.3)
#
retepsql:	jdbc2internal postgresql.jar
	-$(RM) retepsql.jar
	@@$(MAKE) retepsql.jar
	@@echo
	@@echo "The retepsql application has now been built. To run, simply"
	@@echo "type:"
	@@echo
	@@echo "  java -jar retepsql.jar"
	@@echo
	@@echo "Note: Some operating systems recognise .jar as an executable,"
	@@echo "      so on those (and Windows is one of them), you can simply"
	@@echo "      double click the jar file to start it."

# All my classes have this prefix
RETEP=		uk/org/retep

# These classes form part of my personal swing library. I have placed these
# into the public domain, so there are no license issues... enjoy...
RETEPUTILS=	$(RETEP)/swing/SwingApplication.class \
		$(RETEP)/swing/SwingApplication.class \

# This is my postgresql frontend. As it's never been released before, I've
# decided not only to publish it under the same licence as the JDBC driver,
# but also to put it along side the driver. To me it makes sense as it's the
# best example I have on showing how to use the driver ;-)
RETEPSQL=	$(RETEP)/sql/DBConnection.class \
		$(RETEP)/sql/RetepSQL.class \

# Some ancilary files which are included in the jar file
RETEPSQLAUX=	$(RETEP)/icons/ \

# The big rule, this builds the jpgsql.jar file which contains the entire
# application. DONT call this rule directly, but use the retepsql one, as
# it ensures that jdbc is also compiled first.
#
# Note: We include the postgresql.jar contents in this as well. Also the
# manifest entry MUST be immediately after $@@ (note the -m option to jar).
#
retepsql.jar:	$(RETEPUTILS) \
		$(RETEPSQL)
	(echo "Manifest-Version: 1.0"; \
	 echo "Created-By: 1.2 (Sun Microsystems Inc.)"; \
	 echo "Main-Class: uk.org.retep.sql.RetepSQL"; \
	) >manifest
	$(JAR) -c0fm $@@ manifest \
		`$(FIND) $(PGBASE) -name "*.class" -print` \
		$(wildcard $(PGBASE)/*.properties) \
		`$(FIND) $(RETEP) -name "*.class" -print` \
		$(RETEPSQLAUX)
a28 1
#######################################################################
@


1.25
log
@Major update part I involving delayed patches, reworked Makefile, and how
the versioning works. There's also a new utils directory used by Makefile
@
text
@d7 1
a7 1
#    $Id: Makefile,v 1.24 2000/09/12 04:58:46 momjian Exp $
d42 18
d63 3
a65 1
all:	utils/CheckVersion.class
d95 4
a98 1
msg:	
@


1.24
log
@Attached are a patch to allow the charset encoding used by the JDBC
driver to be set, and a description of said patch.  Please refer to
the latter for more information.

William
--
William Webber                               william@@peopleweb.net.au
@
text
@d7 1
a7 1
#    $Id: Makefile,v 1.23 2000/06/06 11:05:56 peter Exp $
d11 5
d25 3
d39 9
d50 1
a50 1
all:	
d58 1
a58 1
	@@echo "  make jdbc1 jar"
d62 6
a67 1
	@@echo "  make jdbc2 jar"
d71 1
a71 1
	@@echo JVM.
d101 4
a121 1
		$(PGBASE)/DriverClass.class \
d164 9
d175 1
a175 5
	(echo "package org.postgresql;" ;\
	 echo "public class DriverClass {" ;\
	 echo "public static String connectClass=\"org.postgresql.jdbc1.Connection\";" ;\
	 echo "}" \
	) >$(PGBASE)/DriverClass.java
d182 1
a182 2
jdbc1real: $(PGBASE)/DriverClass.class \
	$(OBJ_COMMON) $(OBJ_JDBC1) postgresql.jar msg
d185 7
a191 6
jdbc2:	
	(echo "package org.postgresql;" ;\
	 echo "public class DriverClass {" ;\
	 echo "public static String connectClass=\"org.postgresql.jdbc2.Connection\";" ;\
	 echo "}" \
	) >$(PGBASE)/DriverClass.java
d198 12
a209 2
jdbc2real: $(PGBASE)/DriverClass.class \
	$(OBJ_COMMON) $(OBJ_JDBC2) postgresql.jar msg
d211 2
a212 2
# If you have problems with this rule, replace the $( ) with ` ` as some
# shells (mainly sh under Solaris) doesn't recognise $( )
d214 1
a214 1
postgresql.jar: $(OBJ) $(OBJ_COMMON)
d219 1
a222 1
	$(FIND) . -name "*.html" -exec $(RM) {} \;
d224 1
a224 1
	-$(RM) postgresql.jar org/postgresql/DriverClass.java
d226 11
d364 57
@


1.23
log
@Added org/postgresql/DriverClass.java to the list of files removed by make clean (it's dynamically built)
Fixed Statement, so that the update count is valid when an SQL DELETE operation is done.
While fixing the update count, made it easier to get the OID of the last insert as well. Example is in example/basic.java
@
text
@d7 1
a7 1
#    $Id: Makefile,v 1.22 2000/05/15 21:32:51 peter Exp $
d229 2
a230 1
	example/threadsafe.class
d270 1
d281 1
@


1.22
log
@Fixed the message Makefile produces after compiling. It still said
about the old Driver class, not the new package. Spotted by
Joseph Shraibman <jks@@p1.selectacast.net>
@
text
@d7 1
a7 1
#    $Id: Makefile,v 1.21 2000/05/05 07:35:29 peter Exp $
d184 1
a184 1
	-$(RM) postgresql.jar
@


1.22.2.1
log
@Backpatch jdbc fixes into 7.0.X.
@
text
@d7 1
a7 1
#    $Id: Makefile,v 1.22 2000/05/15 21:32:51 peter Exp $
d184 1
a184 1
	-$(RM) postgresql.jar org/postgresql/DriverClass.java
@


1.21
log
@ImageViewer transaction fixes
@
text
@d7 1
a7 1
#    $Id: Makefile,v 1.20 2000/05/03 15:58:08 peter Exp $
d60 1
a60 1
	@@echo Then either add -Djdbc.drivers=postgresql.Driver to the
d64 1
a64 1
	@@echo jdbc.drivers=postgresql.Driver
@


1.20
log
@Minor fixes ready for 7.0
@
text
@d7 1
a7 1
#    $Id: Makefile,v 1.19 2000/04/26 14:19:29 momjian Exp $
d71 2
a72 1
	@@echo "  make examples"
d76 3
a220 2
	example/blobtest.class \
	example/datestyle.class \
d222 7
a228 2
	example/ImageViewer.class \
	example/metadata.class \
d230 3
d242 1
a242 1
	@@echo "  java example.blobtest"
a248 1
	@@echo "  example.blobtest     Binary Large Object tests"
a251 1
	@@echo "  example.Objects      Demonstrates Object Serialisation"
d253 14
a266 1
	@@echo These are not really examples, but tests various parts of the driver
@


1.19
log
@Install Peter's Makefile.
@
text
@d7 1
a7 1
#    $Id: Makefile,v 1.37 2000/04/26 05:50:18 peter Exp $
d31 2
a32 2
# In 6.5, the all rule builds the makeVersion class which then calls make using
# the jdbc1 or jdbc2 rules
d92 1
d142 1
d145 3
d158 1
d161 3
a169 3
# Note:	This works by storing all compiled classes under the $(PGBASE)
#	directory. We use this later for compiling the dual-mode driver.
#
d191 1
a191 1
$(PGBASE)/Driver.class:		$(PGBASE)/Driver.java
@


1.18
log
@> The snprintf stuff in interfaces/ecpg/preproc/Makefile.in is broken.
Please
> apply the attached patch.
>
> Andreas Kardos
>
>
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.17 2000/03/08 01:58:25 momjian Exp $
d27 4
d41 1
a41 1
	@@echo "  $(MAKE) jdbc1"
d45 6
a50 1
	@@echo "  $(MAKE) jdbc2"
d71 1
a71 1
	@@echo "  $(MAKE) examples"
d74 1
a74 1
	@@echo "  $(MAKE) corba"
d84 3
a86 3
			postgresql \
			postgresql.fastpath \
			postgresql.largeobject
d90 24
a113 24
OBJ_COMMON=	postgresql/Connection.class \
		postgresql/Driver.class \
		postgresql/Field.class \
		postgresql/PG_Stream.class \
		postgresql/ResultSet.class \
		postgresql/errors.properties \
		postgresql/errors_fr.properties \
		postgresql/fastpath/Fastpath.class \
		postgresql/fastpath/FastpathArg.class \
		postgresql/geometric/PGbox.class \
		postgresql/geometric/PGcircle.class \
		postgresql/geometric/PGline.class \
		postgresql/geometric/PGlseg.class \
		postgresql/geometric/PGpath.class \
		postgresql/geometric/PGpoint.class \
		postgresql/geometric/PGpolygon.class \
		postgresql/largeobject/LargeObject.class \
		postgresql/largeobject/LargeObjectManager.class \
		postgresql/util/PGmoney.class \
		postgresql/util/PGobject.class \
		postgresql/util/PGtokenizer.class \
		postgresql/util/PSQLException.class \
		postgresql/util/Serialize.class \
		postgresql/util/UnixCrypt.class
d116 7
a122 7
OBJ_JDBC1=	postgresql/jdbc1/CallableStatement.class \
		postgresql/jdbc1/Connection.class \
		postgresql/jdbc1/DatabaseMetaData.class \
		postgresql/jdbc1/PreparedStatement.class \
		postgresql/jdbc1/ResultSet.class \
		postgresql/jdbc1/ResultSetMetaData.class \
		postgresql/jdbc1/Statement.class
d125 8
a132 7
OBJ_JDBC2=	postgresql/jdbc2/ResultSet.class \
		postgresql/jdbc2/PreparedStatement.class \
		postgresql/jdbc2/CallableStatement.class \
		postgresql/jdbc2/Connection.class \
		postgresql/jdbc2/DatabaseMetaData.class \
		postgresql/jdbc2/ResultSetMetaData.class \
		postgresql/jdbc2/Statement.class
d136 1
a136 1
	(echo "package postgresql;" ;\
d138 1
a138 1
	 echo "public static String connectClass=\"postgresql.jdbc1.Connection\";" ;\
d140 1
a140 1
	) >postgresql/DriverClass.java
d143 1
a143 1
jdbc1real: postgresql/DriverClass.class \
d148 1
a148 1
	(echo "package postgresql;" ;\
d150 1
a150 1
	 echo "public static String connectClass=\"postgresql.jdbc2.Connection\";" ;\
d152 1
a152 1
	) >postgresql/DriverClass.java
d155 1
a155 1
jdbc2real: postgresql/DriverClass.class \
d161 1
a161 1
# Note:	This works by storing all compiled classes under the postgresql
d164 3
a166 3
postgresql.jar: $(OBJ_COMMON)
	$(JAR) -c0f $@@ `$(FIND) postgresql -name "*.class" -print` \
		$(wildcard postgresql/*.properties)
d183 24
a206 24
postgresql/Connection.class:		postgresql/Connection.java
postgresql/DatabaseMetaData.class:	postgresql/DatabaseMetaData.java
postgresql/Driver.class:		postgresql/Driver.java
postgresql/Field.class:			postgresql/Field.java
postgresql/PG_Stream.class:		postgresql/PG_Stream.java
postgresql/PreparedStatement.class:	postgresql/PreparedStatement.java
postgresql/ResultSet.class:		postgresql/ResultSet.java
postgresql/ResultSetMetaData.class:	postgresql/ResultSetMetaData.java
postgresql/Statement.class:		postgresql/Statement.java
postgresql/fastpath/Fastpath.class:	postgresql/fastpath/Fastpath.java
postgresql/fastpath/FastpathArg.class:	postgresql/fastpath/FastpathArg.java
postgresql/geometric/PGbox.class:	postgresql/geometric/PGbox.java
postgresql/geometric/PGcircle.class:	postgresql/geometric/PGcircle.java
postgresql/geometric/PGlseg.class:	postgresql/geometric/PGlseg.java
postgresql/geometric/PGpath.class:	postgresql/geometric/PGpath.java
postgresql/geometric/PGpoint.class:	postgresql/geometric/PGpoint.java
postgresql/geometric/PGpolygon.class:	postgresql/geometric/PGpolygon.java
postgresql/largeobject/LargeObject.class: postgresql/largeobject/LargeObject.java
postgresql/largeobject/LargeObjectManager.class: postgresql/largeobject/LargeObjectManager.java
postgresql/util/PGmoney.class:		postgresql/util/PGmoney.java
postgresql/util/PGobject.class:		postgresql/util/PGobject.java
postgresql/util/PGtokenizer.class:	postgresql/util/PGtokenizer.java
postgresql/util/Serialize.class:	postgresql/util/Serialize.java
postgresql/util/UnixCrypt.class:	postgresql/util/UnixCrypt.java
@


1.17
log
@I've made a diff against the 7.0beta1 tree that accomplishes several things:

        1) adds NetBSD shared lib support on both ELF and a.out platforms

        2) replaces "-L$(LIBPQDIR) -lpq" with "$(LIBPQ)" defined in
           Makefile.global.  This makes it much easier to build stuff in
           the source tree after you've already installed the libraries.

        3) adds TEMPLATEDIR in Makefile.global that indicates where the
           database templates are stored.  This separates the template files
           from real libraries that are installed in $(LIBDIR).
        4) changes include order of <readline/readline.h> and <readline.h>.
           The latest GNU readline installs its headers under a readline
           subdirectory.

In addition to applying the patch below the following files need to be copied:

        backend/port/dynloader:
                bsd.h -> netbsd.h
                bsd.c -> netbsd.c
        include/port:
                bsd.h -> netbsd.h
        makefiles:
                Makefile.bsd -> Makefile.netbsd

It would be great to see this incorporated into the source tree before
the 7.0 release is cut.

        Thanks!

     -- Johnny C. Lam <lamj@@stat.cmu.edu>
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.16 1999/09/15 21:56:16 peter Exp $
d154 1
a154 1
postgresql.jar: $(OBJ) $(OBJ_COMMON)
@


1.16
log
@jdbc2real rule was in there twice. One of them should have been jdbc1real
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.15 1999/09/14 05:50:27 peter Exp $
d37 1
a37 1
	@@echo "  make jdbc1"
d41 1
a41 1
	@@echo "  make jdbc2"
d62 1
a62 1
	@@echo "  make examples"
d65 1
a65 1
	@@echo "  make corba"
@


1.15
log
@Patches for 6.5.2
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.14 1999/06/23 05:56:17 peter Exp $
d133 2
a134 2
jdbc2real: postgresql/DriverClass.class \
	$(OBJ_COMMON) $(OBJ_JDBC2) postgresql.jar msg
@


1.14
log
@Some fixes supplied by Jon Nielsen jonfn@@image.dk
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.13 1999/05/17 22:58:18 peter Exp $
d15 1
a15 1
JAVAC		= javac
d25 1
a25 1
.PHONY:		all clean doc examples
d29 16
a44 2
all:	makeVersion.class
	make $$($(JAVA) makeVersion)
d124 8
a131 22
# This rule should never occur, but will be called when makeVersion fails to
# understand the java.version property correctly.
jdbc0:
	@@echo
	@@echo FATAL ERROR!
	@@echo
	@@echo makeVersion has not been able to determine what version of
	@@echo the JDK you are using, and hence what version of the driver
	@@echo to compile.
	@@echo
	@@echo There are two versions available, one that conforms to the
	@@echo JDBC 1 specification, and one to the JDBC 2 specification.
	@@echo
	@@echo To build the driver for JDBC 1 (usually for JDK 1.1 thru 1.1.7)
	@@echo then type: make jdbc1
	@@echo
	@@echo To build the driver for JDBC 2 (usually for JDK 1.2 and later)
	@@echo then type: make jdbc2
	@@echo
	@@echo If you still have problems, then please email the interfaces
	@@echo or bugs lists, or better still to me direct (peter@@retep.org.uk)
	@@echo
d133 2
a134 2
# This rule builds the JDBC1 compliant driver
jdbc1:	$(OBJ_COMMON) $(OBJ_JDBC1) postgresql.jar
d137 10
a146 1
jdbc2:	$(OBJ_COMMON) $(OBJ_JDBC2) postgresql.jar
d155 1
a155 1
	$(JAR) -c0f $@@ $$($(FIND) postgresql -name "*.class" -print) \
@


1.13
log
@Fixed Internationalization of error messages.
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.12 1999/01/25 21:22:02 scrappy Exp $
a163 1
postgresql/CallableStatement.class:	postgresql/CallableStatement.java
@


1.12
log
@
From: Peter T Mount <peter@@retep.org.uk>

This implements some of the JDBC2 methods, fixes a bug introduced into the
JDBC1 portion of the driver, and introduces a new example, showing how to
use the CORBA ORB thats in Java2 with JDBC.

The Tar file contains the new files, the diff the changes to the others.
CHANGELOG is separate as I forgot to make a .orig ;-)
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.11 1999/01/17 04:51:49 momjian Exp $
d72 2
d88 1
d146 2
a147 1
	$(JAR) -c0f $@@ $$($(FIND) postgresql -name "*.class" -print)
@


1.11
log
@As the email posted to the announce and interfaces list, attached is a tar
file containing the latest version of the JDBC driver, allowing it to be
compiled and used under JDK 1.2 and later.

NB: None (well almost none) of the new methods actually do anything. This
release only handles getting it to compile and run. Now this is done, I'll
start working on implementing the new stuff.

Now this tar file replaces everything under src/interfaces/jdbc. I had to
do it this way, rather than diffs, because most of the classes under the
postgresql subdirectory have moved to a new directory under that one, to
enable the support of the two JDBC standards.

Here's a list of files in the tar file. Any file not listed here (in the
postgresql directory) will have to be deleted, otherwise it could cause
the driver to fail:

Peter Mount
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.10 1998/10/08 00:38:18 momjian Exp $
d12 1
d18 1
d49 3
d150 2
a151 1
	$(RM) postgresql.jar
a227 1
#example/Objects.class:			example/Objects.java
d230 31
@


1.10
log
@Just a quick patch. This makes the JDBC driver thread safe, which is an
important step towards making the driver compliant, and means that for
some Java applications and servlets, only a single database connection
is
needed, so in a sence this is a nice little show stopper for 6.4 (and
should still be backward compatible to 6.3.2).

Peter
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.9 1998/09/03 02:29:41 momjian Exp $
a10 2
# These are commented out, but would be included in the postgresql source

d25 4
a28 1
all:	  postgresql.jar
d41 3
a43 1
	@@echo More details are in the README file.
d62 76
a137 31
OBJS=	postgresql/CallableStatement.class \
	postgresql/Connection.class \
	postgresql/DatabaseMetaData.class \
	postgresql/Driver.class \
	postgresql/Field.class \
	postgresql/PG_Stream.class \
	postgresql/PreparedStatement.class \
	postgresql/ResultSet.class \
	postgresql/ResultSetMetaData.class \
	postgresql/Statement.class \
	postgresql/fastpath/Fastpath.class \
	postgresql/fastpath/FastpathArg.class \
	postgresql/geometric/PGbox.class \
	postgresql/geometric/PGcircle.class \
	postgresql/geometric/PGline.class \
	postgresql/geometric/PGlseg.class \
	postgresql/geometric/PGpath.class \
	postgresql/geometric/PGpoint.class \
	postgresql/geometric/PGpolygon.class \
	postgresql/largeobject/LargeObject.class \
	postgresql/largeobject/LargeObjectManager.class \
	postgresql/util/PGmoney.class \
	postgresql/util/PGobject.class \
	postgresql/util/PGtokenizer.class \
	postgresql/util/Serialize.class \
	postgresql/util/UnixCrypt.class

# If you have problems with the first line, try the second one.
# This is needed when compiling under Solaris, as the solaris sh doesn't
# recognise $( )
postgresql.jar: $(OBJS)
a138 1
#	$(JAR) -c0f $@@ `$(FIND) postgresql -name "*.class" -print`
@


1.9
log
@New stuff for 6.4 jdbc.

Peter mount
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.8 1998/06/03 18:56:09 scrappy Exp $
d140 2
a141 1
	example/metadata.class
d164 1
d166 1
d176 1
a176 1

@


1.8
log
@
From: Peter T Mount <patches@@maidast.demon.co.uk>

Bug fixes:

        PreparedStatement.setObject didn't handle short's

        ResultSet.getDate() now handles null dates (returns null rather
        than a NullPointerException)

        ResultSetMetaData.getPrecision() now returns 0 for VARCHAR

New features:

        Field now caches the typename->oid in a Hashtable to speed things
        up. It removes the need for some unnecessary queries to the
        backend.

        PreparedStatement.toString() now returns the sql statement that
        it will send to the backend. Before it did nothing.

        DatabaseMetaData.getTypeInfo() now does something.
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.7 1998/04/06 00:30:36 momjian Exp $
d73 1
d80 1
d127 1
d140 2
a141 1
	example/Objects.class
d162 2
d172 3
a174 1
example/Objects.class:			example/Objects.java
@


1.7
log
@Hi,

Attached you'll find a (big) patch that fixes make dep and make
depend in all Makefiles where I found it to be appropriate.

It also removes the dependency in Makefile.global for NAMEDATALEN
and OIDNAMELEN by making backend/catalog/genbki.sh and bin/initdb/initdb.sh
a little smarter.

This no longer requires initdb.sh that is turned into initdb with
a sed script when installing Postgres, hence initdb.sh should be
renamed to initdb (after the patch has been applied :-) )

This patch is against the 6.3 sources, as it took a while to
complete.

Please review and apply,

Cheers,

Jeroen van Vianen
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.6 1998/02/09 03:22:30 scrappy Exp $
d81 1
d127 1
d136 2
a137 1
	example/ImageViewer.class
d157 1
d166 1
@


1.6
log
@From: Peter T Mount <patches@@maidast.demon.co.uk>

This patch fixes the following:

* Fixes minor bug found in DatabaseMetaData.getTables() where it doesn't
  handle default table types.
* It now reports an error if the client opens a database using
  properties, and either the user or password properties are missing. This
  should make the recent problem with Servlets easier to find.
* Commented out obsolete property in Driver.getPropertyInfo()
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.4 1998/01/13 02:19:10 scrappy Exp $
d46 2
@


1.5
log
@From: Peter T Mount <patches@@maidast.demon.co.uk>

[This is a repost - it supercedes the previous one. It fixes the patch so
it doesn't bread aix port, plus there's a file missing out of the
original post because difforig doesn't pick up new files. It's now
attached. peter]

This patch brings the JDBC driver up to the current protocol spec.
Basically, the backend now tells the driver what authentication scheme to
use.

The patch also fixes a performance problem with large objects. In the
buffer manager, each fastpath call was sending multiple Notifications to
the backend (sometimes more data in the form of notifications were being
sent than blob data!).
@
text
@d78 2
a79 1
	postgresql/util/PGtokenizer.class
d124 1
@


1.4
log
@Oops...missed over half the patch :(
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.2 1997/09/29 20:11:42 scrappy Exp $
d36 3
a38 2
	@@echo "properties file (~/.hotjava/properties under unix), and"
	@@echo add a line containing jdbc.drivers=postgresql.Driver
d80 3
d84 2
a85 1
	$(JAR) -c0vf $@@ $$($(FIND) postgresql -name "*.class" -print)
@


1.3
log
@Peter's Mega-Patch for JDBC...

see README_6.3 for list of changes
@
text
@@


1.2
log
@From: Peter T Mount <patches@@maidast.demon.co.uk>


This patch fixes a few results in DatabaseMetaData, and updates the README
and TODO files (the later being a new file).

The TODO file lists the things that need to be looked into after 6.2 is
released, and describes the problem with Large Objects.
@
text
@d7 1
a7 1
#    $Header: /usr/local/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v 1.1 1997/09/26 08:22:21 scrappy Exp $
d25 1
a25 1
.PHONY:		all clean doc
d28 17
d46 1
d48 5
a52 1
	$(JAVADOC) -public postgresql
d54 2
a60 1
	postgresql/PG_Object.class \
a61 8
	postgresql/PGbox.class \
	postgresql/PGcircle.class \
	postgresql/PGlobj.class \
	postgresql/PGlseg.class \
	postgresql/PGpath.class \
	postgresql/PGpoint.class \
	postgresql/PGpolygon.class \
	postgresql/PGtokenizer.class \
d65 13
a77 1
	postgresql/Statement.class
d80 1
a80 1
	$(JAR) -c0vf $@@ $^
d86 1
d88 1
a100 1
postgresql/PG_Object.class:		postgresql/PG_Object.java
a101 8
postgresql/PGbox.class:			postgresql/PGbox.java
postgresql/PGcircle.class:		postgresql/PGcircle.java
postgresql/PGlobj.class:		postgresql/PGlobj.java
postgresql/PGlseg.class:		postgresql/PGlseg.java
postgresql/PGpath.class:		postgresql/PGpath.java
postgresql/PGpoint.class:		postgresql/PGpoint.java
postgresql/PGpolygon.class:		postgresql/PGpolygon.java
postgresql/PGtokenizer.class:		postgresql/PGtokenizer.java
d106 12
d119 35
a153 3



@


1.1
log
@Get these two files finally committed for Peter...sorry for delay :(
@
text
@d7 1
a7 1
#    $Header$
d59 1
a59 1
	$(RM) postgres.jar
@
