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

Commit 3738510

Browse files
author
Neil Conway
committed
Remove more traces of libpgtcl from the source tree. Also, make some
semi-related SGML cleanup. Original patch from ljb220@mindspring.com, additional cleanup by Neil Conway.
1 parent d2af5f8 commit 3738510

File tree

7 files changed

+50
-149
lines changed

7 files changed

+50
-149
lines changed

README

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ database management system.
77
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
10-
and functions. This distribution also contains several language
11-
bindings, including C and Tcl.
10+
and functions. This distribution also contains C language bindings.
1211

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.
12+
The JDBC, ODBC, C++, Python, and Tcl interfaces have been moved to the
13+
PostgreSQL Projects Web Site at http://gborg.postgresql.org for separate
14+
maintenance. A Perl DBI/DBD driver is available from CPAN.
1615

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

configure

+2-2
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ Optional Packages:
859859
--with-libraries=DIRS look for additional libraries in DIRS
860860
--with-libs=DIRS alternative spelling of --with-libraries
861861
--with-pgport=PORTNUM change default port number 5432
862-
--with-tcl build Tcl and Tk interfaces
862+
--with-tcl build Tcl modules (PL/Tcl)
863863
--with-tclconfig=DIR tclConfig.sh is in DIR
864864
--with-perl build Perl modules (PL/Perl)
865865
--with-python build Python modules (PL/Python)
@@ -2995,7 +2995,7 @@ echo "${ECHO_T}$enable_thread_safety" >&6
29952995

29962996

29972997
#
2998-
# Tcl/Tk
2998+
# Optionally build Tcl modules (PL/Tcl)
29992999
#
30003000
echo "$as_me:$LINENO: checking whether to build with Tcl" >&5
30013001
echo $ECHO_N "checking whether to build with Tcl... $ECHO_C" >&6

configure.in

+3-3
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.378 2004/09/27 02:17:14 pgsql Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.379 2004/10/01 02:00:41 neilc Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -371,10 +371,10 @@ AC_MSG_RESULT([$enable_thread_safety])
371371
AC_SUBST(enable_thread_safety)
372372

373373
#
374-
# Tcl/Tk
374+
# Optionally build Tcl modules (PL/Tcl)
375375
#
376376
AC_MSG_CHECKING([whether to build with Tcl])
377-
PGAC_ARG_BOOL(with, tcl, no, [ --with-tcl build Tcl and Tk interfaces])
377+
PGAC_ARG_BOOL(with, tcl, no, [ --with-tcl build Tcl modules (PL/Tcl)])
378378
AC_MSG_RESULT([$with_tcl])
379379
AC_SUBST([with_tcl])
380380

doc/src/sgml/installation.sgml

+32-44
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.204 2004/09/23 00:30:13 neilc Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.205 2004/10/01 02:00:43 neilc Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -137,11 +137,12 @@ su - postgres
137137
<itemizedlist>
138138
<listitem>
139139
<para>
140-
To build the server programming language PL/Perl you need a full
140+
To build the server programming language
141+
<application>PL/Perl</application> you need a full
141142
<productname>Perl</productname> installation, including the
142143
<filename>libperl</filename> library and the header files.
143-
Since PL/Perl will be a shared library, the
144-
<indexterm><primary>libperl</primary></indexterm>
144+
Since <application>PL/Perl</application> will be a shared
145+
library, the <indexterm><primary>libperl</primary></indexterm>
145146
<filename>libperl</filename> library must be a shared library
146147
also on most platforms. This appears to be the default in
147148
recent <productname>Perl</productname> versions, but it was not
@@ -158,28 +159,30 @@ su - postgres
158159
*** the documentation for details.
159160
</screen>
160161
(If you don't follow the on-screen output you will merely notice
161-
that the PL/Perl library object, <filename>plperl.so</filename>
162-
or similar, will not be installed.) If you see this, you will
163-
have to rebuild and install <productname>Perl</productname>
164-
manually to be able to build PL/Perl. During the configuration
165-
process for <productname>Perl</productname>, request a shared
166-
library.
162+
that the <application>PL/Perl</application> library object,
163+
<filename>plperl.so</filename> or similar, will not be
164+
installed.) If you see this, you will have to rebuild and
165+
install <productname>Perl</productname> manually to be able to
166+
build <application>PL/Perl</application>. During the
167+
configuration process for <productname>Perl</productname>,
168+
request a shared library.
167169
</para>
168170
</listitem>
169171

170172
<listitem>
171173
<para>
172-
To build the PL/Python server programming language, you need a
173-
<productname>Python</productname> installation with the header
174-
files and the distutils module. The distutils module is
175-
included by default with <productname>Python</productname> 1.6
176-
and later; users of earlier versions of
177-
<productname>Python</productname> will need to install it.
174+
To build the <application>PL/Python</> server programming
175+
language, you need a <productname>Python</productname>
176+
installation with the header files and the distutils module.
177+
The distutils module is included by default with
178+
<productname>Python</productname> 1.6 and later; users of
179+
earlier versions of <productname>Python</productname> will need
180+
to install it.
178181
</para>
179182

180183
<para>
181-
Since PL/Python will be a shared library, the
182-
<indexterm><primary>libpython</primary></indexterm>
184+
Since <application>PL/Python</application> will be a shared
185+
library, the <indexterm><primary>libpython</primary></indexterm>
183186
<filename>libpython</filename> library must be a shared library
184187
also on most platforms. This is not the case in a default
185188
<productname>Python</productname> installation. If after
@@ -209,8 +212,8 @@ su - postgres
209212

210213
<listitem>
211214
<para>
212-
If you want to build Tcl or Tk components (clients and the
213-
PL/Tcl language) you of course need a Tcl installation.
215+
If you want to build the <application>PL/Tcl</application>
216+
procedural language, you of course need a Tcl installation.
214217
</para>
215218
</listitem>
216219

@@ -723,7 +726,7 @@ su - postgres
723726
<term><option>--with-perl</option></term>
724727
<listitem>
725728
<para>
726-
Build the PL/Perl server-side language.
729+
Build the <application>PL/Perl</> server-side language.
727730
</para>
728731
</listitem>
729732
</varlistentry>
@@ -732,7 +735,7 @@ su - postgres
732735
<term><option>--with-python</option></term>
733736
<listitem>
734737
<para>
735-
Build the PL/Python server-side language.
738+
Build the <application>PL/Python</> server-side language.
736739
</para>
737740
</listitem>
738741
</varlistentry>
@@ -741,36 +744,21 @@ su - postgres
741744
<term><option>--with-tcl</option></term>
742745
<listitem>
743746
<para>
744-
Build <application>PL/Tcl</>, which requires Tcl/Tk
745-
<option>--without-tk</>.
746-
</para>
747-
</listitem>
748-
</varlistentry>
749-
750-
<varlistentry>
751-
<term><option>--without-tk</option></term>
752-
<listitem>
753-
<para>
754-
If you specify <option>--with-tcl</> and this option, then
755-
the program that requires <productname>Tk</>
756-
(<application>pgtksh</>) will be
757-
excluded.
747+
Build the <application>PL/Tcl</> server-side language.
758748
</para>
759749
</listitem>
760750
</varlistentry>
761751

762752
<varlistentry>
763753
<term><option>--with-tclconfig=<replaceable>DIRECTORY</replaceable></option></term>
764-
<term><option>--with-tkconfig=<replaceable>DIRECTORY</replaceable></option></term>
765754
<listitem>
766755
<para>
767-
Tcl/Tk installs the files <filename>tclConfig.sh</filename> and
768-
<filename>tkConfig.sh</filename>, which contain
769-
configuration information needed to build modules
770-
interfacing to Tcl or Tk. These files are normally found
771-
automatically at their well-known locations, but if you want to
772-
use a different version of Tcl or Tk you can specify the
773-
directory in which to find them.
756+
Tcl installs the file <filename>tclConfig.sh</filename>, which
757+
contains configuration information needed to build modules
758+
interfacing to Tcl. This file is normally found automatically
759+
at a well-known location, but if you want to use a different
760+
version of Tcl you can specify the directory in which to look
761+
for it.
774762
</para>
775763
</listitem>
776764
</varlistentry>

doc/src/sgml/ref/create_function.sgml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.61 2004/09/20 22:48:29 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.62 2004/10/01 02:00:44 neilc Exp $
33
-->
44

55
<refentry id="SQL-CREATEFUNCTION">
@@ -402,7 +402,8 @@ CREATE FUNCTION add(integer, integer) RETURNS integer
402402
</para>
403403

404404
<para>
405-
Increment an integer, making use of an argument name, in PL/PgSQL:
405+
Increment an integer, making use of an argument name, in
406+
<application>PL/pgSQL</application>:
406407

407408
<programlisting>
408409
CREATE OR REPLACE FUNCTION increment(i integer) RETURNS integer AS '

doc/src/sgml/ref/pgtclsh.sgml

-87
This file was deleted.

doc/src/sgml/release.sgml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.297 2004/09/24 01:31:32 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.298 2004/10/01 02:00:43 neilc Exp $
33
-->
44

55
<appendix id="release">
@@ -1501,7 +1501,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.297 2004/09/24 01:31:32 neilc E
15011501

15021502
<listitem>
15031503
<para>
1504-
Allow PL/PgSQL parameter names to be referenced in the function (Dennis Bjorklund)
1504+
Allow PL/pgSQL parameter names to be referenced in the function (Dennis Bjorklund)
15051505
</para>
15061506
<para>
15071507
This basically creates an automatic alias for each named parameter.
@@ -1510,7 +1510,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.297 2004/09/24 01:31:32 neilc E
15101510

15111511
<listitem>
15121512
<para>
1513-
Do minimal syntax checking of PL/PgSQL functions at creation time (Tom)
1513+
Do minimal syntax checking of PL/pgSQL functions at creation time (Tom)
15141514
</para>
15151515
<para>
15161516
This allows us to catch simple syntax errors sooner.
@@ -1519,7 +1519,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.297 2004/09/24 01:31:32 neilc E
15191519

15201520
<listitem>
15211521
<para>
1522-
More support for composite types (row and record variables) in PL/PgSQL
1522+
More support for composite types (row and record variables) in PL/pgSQL
15231523
</para>
15241524
<para>
15251525
For example, it now works to pass a rowtype variable to another function
@@ -1529,14 +1529,14 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.297 2004/09/24 01:31:32 neilc E
15291529

15301530
<listitem>
15311531
<para>
1532-
Default values for PL/PgSQL variables can now reference previously
1532+
Default values for PL/pgSQL variables can now reference previously
15331533
declared variables
15341534
</para>
15351535
</listitem>
15361536

15371537
<listitem>
15381538
<para>
1539-
Improve parsing of PL/PgSQL FOR loops (Tom)
1539+
Improve parsing of PL/pgSQL FOR loops (Tom)
15401540
</para>
15411541
<para>
15421542
Parsing is now driven by presence of ".." rather than datatype of FOR

0 commit comments

Comments
 (0)