Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit bd046b9

Browse files
tglsfdctglsfdc
committed
Remove JDBC from the build system and documentation, too.
1 parent 163edee commit bd046b9

13 files changed

+15
-3497
lines changed

‎GNUmakefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# PostgreSQL top level makefile
33
#
4-
# $PostgreSQL: pgsql/GNUmakefile.in,v 1.36 2003/11/28 20:32:09 pgsql Exp $
4+
# $PostgreSQL: pgsql/GNUmakefile.in,v 1.37 2004/01/19 21:20:04 tgl Exp $
55
#
66

77
subdir =
@@ -72,7 +72,7 @@ $(distdir).tar: distdir
7272
opt_files := \
7373
src/tools src/corba src/tutorial \
7474
src/bin/pgtclsh \
75-
$(addprefix src/interfaces/, libpgtcl jdbc) \
75+
$(addprefix src/interfaces/, libpgtcl) \
7676
$(addprefix src/pl/, plperl plpython tcl)
7777

7878
docs_files := doc/postgres.tar.gz doc/src doc/TODO.detail

‎README

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ PostgreSQL is an advanced object-relational database management system
88
that supports an extended subset of the SQL standard, including
99
transactions, foreign keys, subqueries, triggers, user-defined types
1010
and functions. This distribution also contains several language
11-
bindings, including C, Perl, Python, and Tcl, as well as a JDBC
12-
driver.
11+
bindings, including C and Tcl.
1312

14-
The ODBC and C++ interfaces have been moved to the PostgreSQL Projects
15-
Web Site at http://gborg.postgresql.org for separate maintenance.
13+
The JDBC, ODBC, C++, and Python interfaces have been moved to the PostgreSQL
14+
Projects Web Site at http://gborg.postgresql.org for separate maintenance.
15+
A Perl DBI/DBD driver is available from CPAN.
1616

1717
See the file INSTALL for instructions on how to build and install
1818
PostgreSQL. That file also lists supported operating systems and

‎aclocal.m4

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
dnl $PostgreSQL: pgsql/aclocal.m4,v 1.16 2003/11/29 19:51:16 pgsql Exp $
1+
dnl $PostgreSQL: pgsql/aclocal.m4,v 1.17 2004/01/19 21:20:04 tgl Exp $
22
m4_include([config/ac_func_accept_argtypes.m4])
33
m4_include([config/c-compiler.m4])
44
m4_include([config/c-library.m4])
55
m4_include([config/docbook.m4])
66
m4_include([config/general.m4])
7-
m4_include([config/java.m4])
87
m4_include([config/libtool.m4])
98
m4_include([config/perl.m4])
109
m4_include([config/programs.m4])

‎config/java.m4

-61
This file was deleted.

‎configure

-150
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,6 @@ Optional Packages:
864864
--with-tkconfig=DIR tkConfig.sh is in DIR
865865
--with-perl build Perl modules (PL/Perl)
866866
--with-python build Python modules (PL/Python)
867-
--with-java build JDBC interface and Java tools
868867
--with-krb4 build with Kerberos 4 support
869868
--with-krb5 build with Kerberos 5 support
870869
--with-krb-srvnam=NAME name of the service principal in Kerberos [postgres]
@@ -3166,153 +3165,6 @@ echo "$as_me:$LINENO: result: $with_python" >&5
31663165
echo "${ECHO_T}$with_python" >&6
31673166

31683167

3169-
#
3170-
# Optionally build the Java/JDBC tools
3171-
#
3172-
echo "$as_me:$LINENO: checking whether to build Java/JDBC tools" >&5
3173-
echo $ECHO_N "checking whether to build Java/JDBC tools... $ECHO_C" >&6
3174-
3175-
3176-
3177-
# Check whether --with-java or --without-java was given.
3178-
if test "${with_java+set}" = set; then
3179-
withval="$with_java"
3180-
3181-
case $withval in
3182-
yes)
3183-
echo "$as_me:$LINENO: result: yes" >&5
3184-
echo "${ECHO_T}yes" >&6
3185-
3186-
for ac_prog in jakarta-ant ant ant.sh ant.bat
3187-
do
3188-
# Extract the first word of "$ac_prog", so it can be a program name with args.
3189-
set dummy $ac_prog; ac_word=$2
3190-
echo "$as_me:$LINENO: checking for $ac_word" >&5
3191-
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3192-
if test "${ac_cv_path_ANT+set}" = set; then
3193-
echo $ECHO_N "(cached) $ECHO_C" >&6
3194-
else
3195-
case $ANT in
3196-
[\\/]* | ?:[\\/]*)
3197-
ac_cv_path_ANT="$ANT" # Let the user override the test with a path.
3198-
;;
3199-
*)
3200-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3201-
for as_dir in $PATH
3202-
do
3203-
IFS=$as_save_IFS
3204-
test -z "$as_dir" && as_dir=.
3205-
for ac_exec_ext in '' $ac_executable_extensions; do
3206-
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3207-
ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
3208-
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3209-
break 2
3210-
fi
3211-
done
3212-
done
3213-
3214-
;;
3215-
esac
3216-
fi
3217-
ANT=$ac_cv_path_ANT
3218-
3219-
if test -n "$ANT"; then
3220-
echo "$as_me:$LINENO: result: $ANT" >&5
3221-
echo "${ECHO_T}$ANT" >&6
3222-
else
3223-
echo "$as_me:$LINENO: result: no" >&5
3224-
echo "${ECHO_T}no" >&6
3225-
fi
3226-
3227-
test -n "$ANT" && break
3228-
done
3229-
3230-
3231-
echo "$as_me:$LINENO: checking whether $ANT works" >&5
3232-
echo $ECHO_N "checking whether $ANT works... $ECHO_C" >&6
3233-
if test "${pgac_cv_prog_ant_works+set}" = set; then
3234-
echo $ECHO_N "(cached) $ECHO_C" >&6
3235-
else
3236-
3237-
cat > conftest.java << EOF
3238-
public class conftest {
3239-
int testmethod(int a, int b) {
3240-
return a + b;
3241-
}
3242-
}
3243-
EOF
3244-
3245-
cat > conftest.xml << EOF
3246-
<project name="conftest" default="conftest">
3247-
<target name="conftest">
3248-
<javac srcdir="." includes="conftest.java">
3249-
</javac>
3250-
</target>
3251-
</project>
3252-
EOF
3253-
3254-
pgac_cmd='$ANT -buildfile conftest.xml 1>&2'
3255-
{ (eval echo "$as_me:$LINENO: \"$pgac_cmd\"") >&5
3256-
(eval $pgac_cmd) 2>&5
3257-
ac_status=$?
3258-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
3259-
(exit $ac_status); }
3260-
pgac_save_status=$?
3261-
if test $? = 0 && test -f ./conftest.class ; then
3262-
pgac_cv_prog_ant_works=yes
3263-
else
3264-
echo "configure: failed java program was:" >&5
3265-
cat conftest.java >&5
3266-
echo "configure: failed build file was:" >&5
3267-
cat conftest.xml >&5
3268-
pgac_cv_prog_ant_works=no
3269-
fi
3270-
3271-
rm -f conftest* core core.* *.core
3272-
3273-
fi
3274-
echo "$as_me:$LINENO: result: $pgac_cv_prog_ant_works" >&5
3275-
echo "${ECHO_T}$pgac_cv_prog_ant_works" >&6
3276-
3277-
if test "$pgac_cv_prog_ant_works" != yes; then
3278-
{ { echo "$as_me:$LINENO: error: ant does not work" >&5
3279-
echo "$as_me: error: ant does not work" >&2;}
3280-
{ (exit 1); exit 1; }; }
3281-
fi
3282-
3283-
3284-
if test -z "$ANT"; then
3285-
{ { echo "$as_me:$LINENO: error: Ant is required to build Java components
3286-
If you have Ant already installed, see config.log for details on the failure." >&5
3287-
echo "$as_me: error: Ant is required to build Java components
3288-
If you have Ant already installed, see config.log for details on the failure." >&2;}
3289-
{ (exit 1); exit 1; }; }
3290-
fi
3291-
if "$ANT" -version | egrep -i 'ant version' | sed q | egrep -v ' 1\.[5-9]| [2-9]\.' >/dev/null ; then
3292-
{ { echo "$as_me:$LINENO: error: Ant version >= 1.5 is required to build Java components" >&5
3293-
echo "$as_me: error: Ant version >= 1.5 is required to build Java components" >&2;}
3294-
{ (exit 1); exit 1; }; }
3295-
fi
3296-
;;
3297-
no)
3298-
echo "$as_me:$LINENO: result: no" >&5
3299-
echo "${ECHO_T}no" >&6
3300-
;;
3301-
*)
3302-
{ { echo "$as_me:$LINENO: error: no argument expected for --with-java option" >&5
3303-
echo "$as_me: error: no argument expected for --with-java option" >&2;}
3304-
{ (exit 1); exit 1; }; }
3305-
;;
3306-
esac
3307-
3308-
else
3309-
with_java=no
3310-
echo "$as_me:$LINENO: result: no" >&5
3311-
echo "${ECHO_T}no" >&6
3312-
fi;
3313-
3314-
3315-
33163168
#
33173169
# Kerberos 4
33183170
#
@@ -18252,8 +18104,6 @@ s,@with_tcl@,$with_tcl,;t t
1825218104
s,@with_tk@,$with_tk,;t t
1825318105
s,@with_perl@,$with_perl,;t t
1825418106
s,@with_python@,$with_python,;t t
18255-
s,@ANT@,$ANT,;t t
18256-
s,@with_java@,$with_java,;t t
1825718107
s,@with_krb4@,$with_krb4,;t t
1825818108
s,@with_krb5@,$with_krb5,;t t
1825918109
s,@krb_srvtab@,$krb_srvtab,;t t

‎configure.in

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.310 2004/01/09 04:58:09 momjian Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.311 2004/01/19 21:20:05 tgl Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -409,23 +409,6 @@ PGAC_ARG_BOOL(with, python, no, [ --with-python build Python modules
409409
AC_MSG_RESULT([$with_python])
410410
AC_SUBST(with_python)
411411

412-
#
413-
# Optionally build the Java/JDBC tools
414-
#
415-
AC_MSG_CHECKING([whether to build Java/JDBC tools])
416-
PGAC_ARG_BOOL(with, java, no, [ --with-java build JDBC interface and Java tools],
417-
[AC_MSG_RESULT(yes)
418-
PGAC_PATH_ANT
419-
if test -z "$ANT"; then
420-
AC_MSG_ERROR([Ant is required to build Java components
421-
If you have Ant already installed, see config.log for details on the failure.])
422-
fi
423-
if "$ANT" -version | egrep -i 'ant version' | sed q | egrep -v ' 1\.[[5-9]]| [[2-9]]\.' >/dev/null ; then
424-
AC_MSG_ERROR([Ant version >= 1.5 is required to build Java components])
425-
fi],
426-
[AC_MSG_RESULT(no)])
427-
AC_SUBST(with_java)
428-
429412
#
430413
# Kerberos 4
431414
#

‎doc/src/sgml/filelist.sgml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/filelist.sgml,v 1.34 2003/11/29 19:51:37 pgsql Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/filelist.sgml,v 1.35 2004/01/19 21:20:06 tgl Exp $ -->
22

33
<!entity history SYSTEM "history.sgml">
44
<!entity info SYSTEM "info.sgml">
@@ -49,7 +49,6 @@
4949
<!entity extend SYSTEM "extend.sgml">
5050
<!entity func-ref SYSTEM "func-ref.sgml">
5151
<!entity infoschema SYSTEM "information_schema.sgml">
52-
<!entity jdbc SYSTEM "jdbc.sgml">
5352
<!entity libpgeasy SYSTEM "libpgeasy.sgml">
5453
<!entity libpq SYSTEM "libpq.sgml">
5554
<!entity libpgtcl SYSTEM "libpgtcl.sgml">

‎doc/src/sgml/installation.sgml

+1-46
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.192 2004/01/11 05:46:58 neilc Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.193 2004/01/19 21:20:06 tgl Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -212,41 +212,6 @@ su - postgres
212212
</para>
213213
</listitem>
214214

215-
<listitem>
216-
<para>
217-
To build the JDBC driver, you need
218-
<application>Ant</application> 1.5 or higher and a
219-
<acronym>JDK</acronym>. <application>Ant</application> is a
220-
special tool for building Java-based packages. It can be
221-
downloaded from the <ulink
222-
url="http://jakarta.apache.org/ant/index.html"><application>Ant</application>
223-
web site</ulink>.
224-
</para>
225-
226-
<para>
227-
If you have several Java compilers installed, it depends on the
228-
Ant configuration which one gets used. Precompiled
229-
<application>Ant</application> distributions are typically set
230-
up to read a file <filename>.antrc</filename> in the current
231-
user's home directory for configuration. For example, to use a
232-
different <acronym>JDK</acronym> than the default, this may
233-
work:
234-
<programlisting>
235-
JAVA_HOME=/usr/local/sun-jdk1.3
236-
JAVACMD=$JAVA_HOME/bin/java
237-
</programlisting>
238-
</para>
239-
240-
<note>
241-
<para>
242-
Do not try to build the driver by calling
243-
<command>ant</command> or even <command>javac</command>
244-
directly. This will not work. Run <command>gmake</command>
245-
normally as described below.
246-
</para>
247-
</note>
248-
</listitem>
249-
250215
<listitem>
251216
<para>
252217
To enable Native Language Support (<acronym>NLS</acronym>), that
@@ -801,16 +766,6 @@ JAVACMD=$JAVA_HOME/bin/java
801766
</listitem>
802767
</varlistentry>
803768

804-
<varlistentry>
805-
<term><option>--with-java</option></term>
806-
<listitem>
807-
<para>
808-
Build the <acronym>JDBC</acronym> driver and associated Java
809-
packages.
810-
</para>
811-
</listitem>
812-
</varlistentry>
813-
814769
<varlistentry>
815770
<term><option>--with-krb4</option></term>
816771
<term><option>--with-krb5</option></term>

0 commit comments

Comments
 (0)