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

Commitb0a738f

Browse files
committed
Move pg_xlogdump from contrib/ to src/bin/
Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
1 parent0275ecf commitb0a738f

File tree

14 files changed

+33
-28
lines changed

14 files changed

+33
-28
lines changed

‎contrib/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ SUBDIRS = \
3737
pgcrypto\
3838
pgrowlocks\
3939
pgstattuple\
40-
pg_xlogdump\
4140
postgres_fdw\
4241
seg\
4342
spi\

‎doc/src/sgml/contrib.sgml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,5 @@ pages.
202202
</para>
203203

204204
&pgstandby;
205-
&pgxlogdump;
206205
</sect1>
207206
</appendix>

‎doc/src/sgml/filelist.sgml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
<!ENTITY pgstatstatements SYSTEM "pgstatstatements.sgml">
135135
<!ENTITY pgstattuple SYSTEM "pgstattuple.sgml">
136136
<!ENTITY pgtrgm SYSTEM "pgtrgm.sgml">
137-
<!ENTITY pgxlogdump SYSTEM "pg_xlogdump.sgml">
138137
<!ENTITY postgres-fdw SYSTEM "postgres-fdw.sgml">
139138
<!ENTITY seg SYSTEM "seg.sgml">
140139
<!ENTITY contrib-spi SYSTEM "contrib-spi.sgml">

‎doc/src/sgml/ref/allfiles.sgml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ Complete list of usable sgml source files in this directory.
196196
<!ENTITY pgtestfsync SYSTEM "pgtestfsync.sgml">
197197
<!ENTITY pgtesttiming SYSTEM "pgtesttiming.sgml">
198198
<!ENTITY pgupgrade SYSTEM "pgupgrade.sgml">
199+
<!ENTITY pgxlogdump SYSTEM "pg_xlogdump.sgml">
199200
<!ENTITY postgres SYSTEM "postgres-ref.sgml">
200201
<!ENTITY postmaster SYSTEM "postmaster.sgml">
201202
<!ENTITY psqlRef SYSTEM "psql-ref.sgml">
File renamed without changes.

‎doc/src/sgml/reference.sgml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@
266266
&pgtestfsync;
267267
&pgtesttiming;
268268
&pgupgrade;
269+
&pgxlogdump;
269270
&postgres;
270271
&postmaster;
271272

‎src/bin/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ SUBDIRS = \
2626
pg_test_fsync\
2727
pg_test_timing\
2828
pg_upgrade\
29+
pg_xlogdump\
2930
pgbench\
3031
psql\
3132
scripts
File renamed without changes.
Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,40 @@
1-
#contrib/pg_xlogdump/Makefile
1+
#src/bin/pg_xlogdump/Makefile
22

33
PGFILEDESC = "pg_xlogdump - decode and display WAL"
44
PGAPPICON=win32
55

6-
PROGRAM = pg_xlogdump
6+
subdir = src/bin/pg_xlogdump
7+
top_builddir = ../../..
8+
include$(top_builddir)/src/Makefile.global
9+
710
OBJS = pg_xlogdump.o compat.o xlogreader.o rmgrdesc.o\
811
$(RMGRDESCOBJS)$(WIN32RES)
912

13+
overrideCPPFLAGS := -DFRONTEND$(CPPFLAGS)
14+
1015
RMGRDESCSOURCES =$(notdir$(wildcard$(top_srcdir)/src/backend/access/rmgrdesc/*desc.c))
1116
RMGRDESCOBJS =$(patsubst%.c,%.o,$(RMGRDESCSOURCES))
1217

13-
EXTRA_CLEAN =$(RMGRDESCSOURCES) xlogreader.c
14-
15-
ifdefUSE_PGXS
16-
$(error "pg_xlogdump cannot be built with PGXS")
17-
endif
18-
19-
subdir = contrib/pg_xlogdump
20-
top_builddir = ../..
21-
include$(top_builddir)/src/Makefile.global
22-
include$(top_srcdir)/contrib/contrib-global.mk
2318

19+
all: pg_xlogdump
2420

25-
overrideCPPFLAGS := -DFRONTEND$(CPPFLAGS)
21+
pg_xlogdump:$(OBJS) | submake-libpgport
22+
$(CC)$(CFLAGS)$^$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
2623

2724
xlogreader.c:% :$(top_srcdir)/src/backend/access/transam/%
2825
rm -f$@&&$(LN_S)$<.
2926

3027
$(RMGRDESCSOURCES):% :$(top_srcdir)/src/backend/access/rmgrdesc/%
3128
rm -f$@&&$(LN_S)$<.
29+
30+
install: all installdirs
31+
$(INSTALL_PROGRAM) pg_xlogdump$(X)'$(DESTDIR)$(bindir)/pg_xlogdump$(X)'
32+
33+
installdirs:
34+
$(MKDIR_P)'$(DESTDIR)$(bindir)'
35+
36+
uninstall:
37+
rm -f'$(DESTDIR)$(bindir)/pg_xlogdump$(X)'
38+
39+
cleandistcleanmaintainer-clean:
40+
rm -f pg_xlogdump$(X)$(OBJS)$(RMGRDESCSOURCES) xlogreader.c

‎contrib/pg_xlogdump/compat.crenamed to‎src/bin/pg_xlogdump/compat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 2013-2015, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
*contrib/pg_xlogdump/compat.c
9+
*src/bin/pg_xlogdump/compat.c
1010
*
1111
* This file contains client-side implementations for various backend
1212
* functions that the rm_desc functions in *desc.c files rely on.

‎contrib/pg_xlogdump/pg_xlogdump.crenamed to‎src/bin/pg_xlogdump/pg_xlogdump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Copyright (c) 2013-2015, PostgreSQL Global Development Group
66
*
77
* IDENTIFICATION
8-
*contrib/pg_xlogdump/pg_xlogdump.c
8+
*src/bin/pg_xlogdump/pg_xlogdump.c
99
*-------------------------------------------------------------------------
1010
*/
1111

‎contrib/pg_xlogdump/rmgrdesc.crenamed to‎src/bin/pg_xlogdump/rmgrdesc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* pg_xlogdump resource managers definition
55
*
6-
*contrib/pg_xlogdump/rmgrdesc.c
6+
*src/bin/pg_xlogdump/rmgrdesc.c
77
*/
88
#defineFRONTEND 1
99
#include"postgres.h"

‎contrib/pg_xlogdump/rmgrdesc.hrenamed to‎src/bin/pg_xlogdump/rmgrdesc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* pg_xlogdump resource managers declaration
55
*
6-
*contrib/pg_xlogdump/rmgrdesc.h
6+
*src/bin/pg_xlogdump/rmgrdesc.h
77
*/
88
#ifndefRMGRDESC_H
99
#defineRMGRDESC_H

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,10 @@ my @contrib_uselibpq =
3535
my@contrib_uselibpgport = (
3636
'oid2name',
3737
'pg_standby',
38-
'pg_xlogdump',
3938
'vacuumlo');
4039
my@contrib_uselibpgcommon = (
4140
'oid2name',
4241
'pg_standby',
43-
'pg_xlogdump',
4442
'vacuumlo');
4543
my$contrib_extralibs =undef;
4644
my$contrib_extraincludes =
@@ -53,8 +51,8 @@ my @contrib_excludes = ('pgcrypto', 'commit_ts', 'intagg', 'sepgsql');
5351
# Set of variables for frontend modules
5452
my$frontend_defines = {'initdb'=>'FRONTEND' };
5553
my@frontend_uselibpq = ('pg_ctl','pg_upgrade','pgbench','psql');
56-
my@frontend_uselibpgport = ('pg_archivecleanup','pg_test_fsync','pg_test_timing','pg_upgrade','pgbench' );
57-
my@frontend_uselibpgcommon = ('pg_archivecleanup','pg_test_fsync','pg_test_timing','pg_upgrade','pgbench' );
54+
my@frontend_uselibpgport = ('pg_archivecleanup','pg_test_fsync','pg_test_timing','pg_upgrade','pg_xlogdump','pgbench' );
55+
my@frontend_uselibpgcommon = ('pg_archivecleanup','pg_test_fsync','pg_test_timing','pg_upgrade','pg_xlogdump','pgbench' );
5856
my$frontend_extralibs = {
5957
'initdb'=> ['ws2_32.lib'],
6058
'pg_restore'=> ['ws2_32.lib'],
@@ -69,7 +67,7 @@ my $frontend_extrasource = {
6967
['src\bin\pgbench\exprscan.l','src\bin\pgbench\exprparse.y' ],
7068
};
7169
my@frontend_excludes =
72-
('pgevent','pg_basebackup','pg_rewind','pg_dump','scripts');
70+
('pgevent','pg_basebackup','pg_rewind','pg_dump','pg_xlogdump','scripts');
7371

7472
submkvcbuild
7573
{
@@ -648,9 +646,7 @@ sub mkvcbuild
648646

649647
# fix up pg_xlogdump once it's been set up
650648
# files symlinked on Unix are copied on windows
651-
my$pg_xlogdump =
652-
(grep {$_->{name}eq'pg_xlogdump' }
653-
@{$solution->{projects}->{contrib} })[0];
649+
my$pg_xlogdump = AddSimpleFrontend('pg_xlogdump');
654650
$pg_xlogdump->AddDefine('FRONTEND');
655651
foreachmy$xf (glob('src\\backend\\access\\rmgrdesc\\*desc.c'))
656652
{

0 commit comments

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