rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move pg_archivecleanup from contrib/ to src/bin/ 

Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
This commit is contained in:
Peter Eisentraut 2015-03-10 22:33:23 -04:00
parent 27846f02c1
commit 83aca89f7c
12 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/Makefile
View File

@ -28,7 +28,6 @@ SUBDIRS = \
oid2name \
pageinspect \
passwordcheck \
pg_archivecleanup \
pg_buffercache \
pg_freespacemap \
pg_prewarm \

18
contrib/pg_archivecleanup/Makefile
View File

@ -1,18 +0,0 @@
# contrib/pg_archivecleanup/Makefile
PGFILEDESC = "pg_archivecleanup - cleans archive when used with streaming replication"
PGAPPICON = win32
PROGRAM = pg_archivecleanup
OBJS = pg_archivecleanup.o $(WIN32RES)
ifdef USE_PGXS
PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS)
else
subdir = contrib/pg_archivecleanup
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif

1
doc/src/sgml/contrib.sgml
View File

@ -202,7 +202,6 @@ pages.
part of the core <productname>PostgreSQL</productname> distribution.
</para>
&pgarchivecleanup;
&pgstandby;
&pgtestfsync;
&pgtesttiming;

1
doc/src/sgml/filelist.sgml
View File

@ -126,7 +126,6 @@
<!ENTITY pageinspect SYSTEM "pageinspect.sgml">
<!ENTITY passwordcheck SYSTEM "passwordcheck.sgml">
<!ENTITY pgbench SYSTEM "pgbench.sgml">
<!ENTITY pgarchivecleanup SYSTEM "pgarchivecleanup.sgml">
<!ENTITY pgbuffercache SYSTEM "pgbuffercache.sgml">
<!ENTITY pgcrypto SYSTEM "pgcrypto.sgml">
<!ENTITY pgfreespacemap SYSTEM "pgfreespacemap.sgml">

1
doc/src/sgml/ref/allfiles.sgml
View File

@ -179,6 +179,7 @@ Complete list of usable sgml source files in this directory.
<!ENTITY dropuser SYSTEM "dropuser.sgml">
<!ENTITY ecpgRef SYSTEM "ecpg-ref.sgml">
<!ENTITY initdb SYSTEM "initdb.sgml">
<!ENTITY pgarchivecleanup SYSTEM "pgarchivecleanup.sgml">
<!ENTITY pgBasebackup SYSTEM "pg_basebackup.sgml">
<!ENTITY pgConfig SYSTEM "pg_config-ref.sgml">
<!ENTITY pgControldata SYSTEM "pg_controldata.sgml">

10
doc/src/sgml/pgarchivecleanup.sgml → doc/src/sgml/ref/pgarchivecleanup.sgml
View File

@ -1,4 +1,4 @@
<!-- doc/src/sgml/pgarchivecleanup.sgml -->
<!-- doc/src/sgml/ref/pgarchivecleanup.sgml -->
<refentry id="pgarchivecleanup">
<indexterm zone="pgarchivecleanup">
@ -193,14 +193,6 @@ archive_cleanup_command = 'pg_archivecleanup -d /mnt/standby/archive %r 2>>clean
</itemizedlist>
</refsect1>
<refsect1>
<title>Author</title>
<para>
Simon Riggs <email>simon@2ndquadrant.com</email>
</para>
</refsect1>
<refsect1>
<title>See Also</title>

1
doc/src/sgml/reference.sgml
View File

@ -257,6 +257,7 @@
</partintro>
&initdb;
&pgarchivecleanup;
&pgControldata;
&pgCtl;
&pgResetxlog;

1
src/bin/Makefile
View File

@ -15,6 +15,7 @@ include $(top_builddir)/src/Makefile.global
SUBDIRS = \
initdb \
pg_archivecleanup \
pg_basebackup \
pg_config \
pg_controldata \

0
contrib/pg_archivecleanup/.gitignore → src/bin/pg_archivecleanup/.gitignore vendored
View File

27
src/bin/pg_archivecleanup/Makefile Normal file
View File

@ -0,0 +1,27 @@
# src/bin/pg_archivecleanup/Makefile
PGFILEDESC = "pg_archivecleanup - cleans archive when used with streaming replication"
PGAPPICON = win32
subdir = src/bin/pg_archivecleanup
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
OBJS = pg_archivecleanup.o $(WIN32RES)
all: pg_archivecleanup
pg_archivecleanup: $(OBJS) | submake-libpgport
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
install: all installdirs
$(INSTALL_PROGRAM) pg_archivecleanup$(X) '$(DESTDIR)$(bindir)/pg_archivecleanup$(X)'
installdirs:
$(MKDIR_P) '$(DESTDIR)$(bindir)'
uninstall:
rm -f '$(DESTDIR)$(bindir)/pg_archivecleanup$(X)'
clean distclean maintainer-clean:
rm -f pg_archivecleanup$(X) $(OBJS)

2
contrib/pg_archivecleanup/pg_archivecleanup.c → src/bin/pg_archivecleanup/pg_archivecleanup.c
View File

@ -1,5 +1,5 @@
/*
* contrib/pg_archivecleanup/pg_archivecleanup.c
* src/bin/pg_archivecleanup/pg_archivecleanup.c
*
* pg_archivecleanup.c
*

11
src/tools/msvc/Mkvcbuild.pm
View File

@ -34,13 +34,13 @@ my @contrib_uselibpq =
('dblink', 'oid2name', 'pgbench', 'pg_upgrade', 'postgres_fdw', 'vacuumlo');
my @contrib_uselibpgport = (
'oid2name', 'pgbench',
'pg_standby', 'pg_archivecleanup',
'pg_standby',
'pg_test_fsync', 'pg_test_timing',
'pg_upgrade', 'pg_xlogdump',
'vacuumlo');
my @contrib_uselibpgcommon = (
'oid2name', 'pgbench',
'pg_standby', 'pg_archivecleanup',
'pg_standby',
'pg_test_fsync', 'pg_test_timing',
'pg_upgrade', 'pg_xlogdump',
'vacuumlo');
@ -57,6 +57,8 @@ my @contrib_excludes = ('pgcrypto', 'intagg', 'sepgsql');
# Set of variables for frontend modules
my $frontend_defines = { 'initdb' => 'FRONTEND' };
my @frontend_uselibpq = ('pg_ctl', 'psql');
my @frontend_uselibpgport = ( 'pg_archivecleanup' );
my @frontend_uselibpgcommon = ( 'pg_archivecleanup' );
my $frontend_extralibs = {
'initdb' => ['ws2_32.lib'],
'pg_restore' => ['ws2_32.lib'],
@ -769,8 +771,9 @@ sub AdjustContribProj
sub AdjustFrontendProj
{
my $proj = shift;
AdjustModule($proj, $frontend_defines, \@frontend_uselibpq, undef,
undef, $frontend_extralibs,
AdjustModule($proj, $frontend_defines, \@frontend_uselibpq,
\@frontend_uselibpgport, \@frontend_uselibpgcommon,
$frontend_extralibs,
$frontend_extrasource, $frontend_extraincludes);
}