Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit64737e9

Browse files
committed
Get rid of the need for manual maintenance of the initial contents of
pg_attribute, by having genbki.pl derive the information from the variouscatalog header files. This greatly simplifies modification of the"bootstrapped" catalogs.This patch finally kills genbki.sh and Gen_fmgrtab.sh; we now rely entirely onPerl scripts for those build steps. To avoid creating a Perl build dependencywhere there was not one before, the output files generated by these scriptsare now treated as distprep targets, ie, they will be built and shipped intarballs. But you will need a reasonably modern Perl (probably at least5.6) if you want to build from a CVS pull.The changes to the MSVC build process are untested, and may well break ---we'll soon find out from the buildfarm.John Naylor, based on ideas from Robert Haas and others
1 parentfc09fb7 commit64737e9

File tree

66 files changed

+929
-1499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+929
-1499
lines changed

‎doc/src/sgml/bki.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/bki.sgml,v 1.22 2009/09/26 22:42:00 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/bki.sgml,v 1.23 2010/01/05 01:06:55 tgl Exp $ -->
22

33
<chapter id="bki">
44
<title><acronym>BKI</acronym> Backend Interface</title>
@@ -20,10 +20,10 @@
2020
to do part of its job when creating a new database cluster. The
2121
input file used by <application>initdb</application> is created as
2222
part of building and installing <productname>PostgreSQL</productname>
23-
by a program named <filename>genbki.sh</filename>, which reads some
23+
by a program named <filename>genbki.pl</filename>, which reads some
2424
specially formatted C header files in the <filename>src/include/catalog/</>
25-
directory of the source tree. The created
26-
<acronym>BKI</acronym> fileis called <filename>postgres.bki</filename> and is
25+
directory of the source tree. The created <acronym>BKI</acronym> file
26+
is called <filename>postgres.bki</filename> and is
2727
normally installed in the
2828
<filename>share</filename> subdirectory of the installation tree.
2929
</para>

‎doc/src/sgml/installation.sgml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.335 2009/12/18 21:37:38 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.336 2010/01/05 01:06:55 tgl Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -125,10 +125,10 @@ su - postgres
125125
<filename>libedit</filename> library is
126126
GNU <productname>Readline</productname>-compatible and is used if
127127
<filename>libreadline</filename> is not found, or if
128-
<option>--with-libedit-preferred</option> is used as an
128+
<option>--with-libedit-preferred</option> is used as an
129129
option to <filename>configure</>. If you are using a package-based
130-
Linux distribution, be aware that you need both the
131-
<literal>readline</> and <literal>readline-devel</> packages, if
130+
Linux distribution, be aware that you need both the
131+
<literal>readline</> and <literal>readline-devel</> packages, if
132132
those are separate in your distribution.
133133
</para>
134134
</listitem>
@@ -266,7 +266,7 @@ su - postgres
266266

267267
<listitem>
268268
<para>
269-
<application>Kerberos</>, <productname>OpenSSL</>,
269+
<application>Kerberos</>, <productname>OpenSSL</>,
270270
<productname>OpenLDAP</>, and/or
271271
<application>PAM</>, if you want to support authentication or
272272
encryption using these services.
@@ -310,7 +310,7 @@ su - postgres
310310
<primary>perl</primary>
311311
</indexterm>
312312

313-
<application>Perl</>is also needed to build from a CVS checkout,
313+
<application>Perl</>5.8 or later is needed to build from a CVS checkout,
314314
or if you changed the input files for any of the build steps that
315315
use Perl scripts. If building on Windows you will need
316316
<application>Perl</> in any case.
@@ -456,7 +456,7 @@ su - postgres
456456
delete it, in case you have trouble and need to revert to it. Keep
457457
in mind the directory might consume significant disk space. To rename
458458
the directory, use a command like this:
459-
<screen>
459+
<screen>
460460
<userinput>mv /usr/local/pgsql /usr/local/pgsql.old</>
461461
</screen>
462462
</para>
@@ -581,7 +581,7 @@ su - postgres
581581
</para>
582582

583583
<para>
584-
For relocatable installs, you might want to use
584+
For relocatable installs, you might want to use
585585
<filename>configure</filename>'s <literal>--disable-rpath</>
586586
option. Also, you will need to tell the operating system how
587587
to find the shared libraries.
@@ -943,7 +943,7 @@ su - postgres
943943
<listitem>
944944
<para>
945945
Build with <acronym>LDAP</><indexterm><primary>LDAP</></>
946-
support for authentication and connection parameter lookup (see
946+
support for authentication and connection parameter lookup (see
947947
<![%standalone-include[the documentation about client authentication
948948
and libpq]]><![%standalone-ignore[<xref linkend="libpq-ldap"> and
949949
<xref linkend="auth-ldap">]]> for more information). On Unix,
@@ -952,7 +952,7 @@ su - postgres
952952
library is used. <filename>configure</> will check for the required
953953
header files and libraries to make sure that your
954954
<productname>OpenLDAP</> installation is sufficient before
955-
proceeding.
955+
proceeding.
956956
</para>
957957
</listitem>
958958
</varlistentry>
@@ -1381,7 +1381,7 @@ su - postgres
13811381
<para>
13821382
Here is a list of the significant variables that can be set in
13831383
this manner:
1384-
1384+
13851385
<variablelist>
13861386
<varlistentry>
13871387
<term><envar>BISON</envar></term>
@@ -1635,7 +1635,7 @@ All of PostgreSQL is successfully made. Ready to install.
16351635
</procedure>
16361636

16371637
<formalpara>
1638-
<title>Registering <application>eventlog</> on <systemitem
1638+
<title>Registering <application>eventlog</> on <systemitem
16391639
class="osname">Windows</>:</title>
16401640
<para>
16411641
To register a <systemitem class="osname">Windows</> <application>eventlog</>
@@ -1887,7 +1887,7 @@ postgres$ <userinput>/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data</>
18871887
<para>
18881888
At this point, if you did not use the <command>initdb</> <literal>-A</>
18891889
option, you might want to modify <filename>pg_hba.conf</> to control
1890-
local access to the server before you start it. The default is to
1890+
local access to the server before you start it. The default is to
18911891
trust all local users.
18921892
</para>
18931893
</step>
@@ -2678,7 +2678,7 @@ cc-1020 cc: ERROR File = pqcomm.c, Line = 427
26782678
MinGW. The ready-made installer files are available on the main
26792679
PostgreSQL FTP servers in the <filename>binary/win32</filename>
26802680
directory.
2681-
</para>
2681+
</para>
26822682

26832683
<para>
26842684
The native Win32 port requires a 32-bit NT-based Microsoft

‎src/backend/Makefile

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.137 2010/01/02 16:57:33 momjian Exp $
8+
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.138 2010/01/05 01:06:56 tgl Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -42,7 +42,7 @@ LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS)
4242

4343
##########################################################################
4444

45-
all: submake-libpgport postgres$(POSTGRES_IMP)
45+
all: submake-libpgportsubmake-schemapgpostgres$(POSTGRES_IMP)
4646

4747
ifneq ($(PORTNAME), cygwin)
4848
ifneq ($(PORTNAME), win32)
@@ -111,7 +111,13 @@ endif
111111
endif# aix
112112

113113
# Update the commonly used headers before building the subdirectories
114-
$(SUBDIRS:%=%-recursive):$(top_builddir)/src/include/parser/gram.h$(top_builddir)/src/include/utils/fmgroids.h$(top_builddir)/src/include/utils/probes.h
114+
$(SUBDIRS:%=%-recursive):$(top_builddir)/src/include/parser/gram.h$(top_builddir)/src/include/catalog/schemapg.h$(top_builddir)/src/include/utils/fmgroids.h$(top_builddir)/src/include/utils/probes.h
115+
116+
# run this unconditionally to avoid needing to know its dependencies here:
117+
submake-schemapg:
118+
$(MAKE) -C catalog schemapg.h
119+
120+
.PHONY: submake-schemapg
115121

116122

117123
# The postgres.o target is needed by the rule in Makefile.global that
@@ -127,7 +133,7 @@ postgres.o: $(OBJS)
127133
parser/gram.h: parser/gram.y
128134
$(MAKE) -C parser gram.h
129135

130-
utils/fmgroids.h: utils/Gen_fmgrtab.sh$(top_srcdir)/src/include/catalog/pg_proc.h
136+
utils/fmgroids.h: utils/Gen_fmgrtab.pl catalog/Catalog.pm$(top_srcdir)/src/include/catalog/pg_proc.h
131137
$(MAKE) -C utils fmgroids.h
132138

133139
utils/probes.h: utils/probes.d
@@ -136,15 +142,28 @@ utils/probes.h: utils/probes.d
136142
# Make symlinks for these headers in the include directory. That way
137143
# we can cut down on the -I options. Also, a symlink is automatically
138144
# up to date when we update the base file.
145+
#
146+
# The point of the prereqdir incantation in some of the rules below is to
147+
# force the symlink to use an absolute path rather than a relative path.
148+
# For headers which are generated by make distprep, the actual header within
149+
# src/backend will be in the source tree, while the symlink in src/include
150+
# will be in the build tree, so a simple ../.. reference won't work.
151+
# For headers generated during regular builds, we prefer a relative symlink.
139152

140153
$(top_builddir)/src/include/parser/gram.h: parser/gram.h
141154
prereqdir=`cd$(dir $<)>/dev/null&& pwd`&&\
142155
cd$(dir$@)&& rm -f$(notdir$@)&&\
143156
$(LN_S)"$$prereqdir/$(notdir $<)".
144157

158+
$(top_builddir)/src/include/catalog/schemapg.h: catalog/schemapg.h
159+
prereqdir=`cd$(dir $<)>/dev/null&& pwd`&&\
160+
cd$(dir$@)&& rm -f$(notdir$@)&&\
161+
$(LN_S)"$$prereqdir/$(notdir $<)".
162+
145163
$(top_builddir)/src/include/utils/fmgroids.h: utils/fmgroids.h
146-
cd$(dir$@)&& rm -f$(notdir$@)&&\
147-
$(LN_S) ../../../$(subdir)/utils/fmgroids.h.
164+
prereqdir=`cd$(dir $<)>/dev/null&& pwd`&&\
165+
cd$(dir$@)&& rm -f$(notdir$@)&&\
166+
$(LN_S)"$$prereqdir/$(notdir $<)".
148167

149168
$(top_builddir)/src/include/utils/probes.h: utils/probes.h
150169
cd$(dir$@)&& rm -f$(notdir$@)&&\
@@ -160,6 +179,8 @@ utils/probes.o: utils/probes.d $(SUBDIROBJS)
160179
distprep:
161180
$(MAKE) -C parsergram.c gram.h scan.c
162181
$(MAKE) -C bootstrapbootparse.c bootscanner.c
182+
$(MAKE) -C catalogschemapg.h postgres.bki postgres.description postgres.shdescription
183+
$(MAKE) -C utilsfmgrtab.c fmgroids.h
163184
$(MAKE) -C utils/miscguc-file.c
164185

165186

@@ -243,8 +264,10 @@ endif
243264

244265
clean:
245266
rm -f$(LOCALOBJS) postgres$(X)$(POSTGRES_IMP)\
246-
$(top_srcdir)/src/include/parser/gram.h\
247-
$(top_builddir)/src/include/utils/fmgroids.h
267+
$(top_builddir)/src/include/parser/gram.h\
268+
$(top_builddir)/src/include/catalog/schemapg.h\
269+
$(top_builddir)/src/include/utils/fmgroids.h\
270+
$(top_builddir)/src/include/utils/probes.h
248271
ifeq ($(PORTNAME), cygwin)
249272
rm -f postgres.dll postgres.def libpostgres.a
250273
endif
@@ -261,6 +284,12 @@ maintainer-clean: distclean
261284
parser/gram.c\
262285
parser/scan.c\
263286
parser/gram.h\
287+
catalog/schemapg.h\
288+
catalog/postgres.bki\
289+
catalog/postgres.description\
290+
catalog/postgres.shdescription\
291+
utils/fmgroids.h\
292+
utils/fmgrtab.c\
264293
utils/misc/guc-file.c
265294

266295

‎src/backend/catalog/.cvsignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
postgres.bki
2+
postgres.description
3+
postgres.shdescription
4+
schemapg.h

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp