diff --git a/contrib/Makefile b/contrib/Makefile index 195d4472c57..c56050eecc3 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -28,7 +28,6 @@ SUBDIRS = \ oid2name \ pageinspect \ passwordcheck \ - pg_archivecleanup \ pg_buffercache \ pg_freespacemap \ pg_prewarm \ diff --git a/contrib/pg_archivecleanup/Makefile b/contrib/pg_archivecleanup/Makefile deleted file mode 100644 index ab5239078c5..00000000000 --- a/contrib/pg_archivecleanup/Makefile +++ /dev/null @@ -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 diff --git a/doc/src/sgml/contrib.sgml b/doc/src/sgml/contrib.sgml index a698d0fb2f8..f21fa149182 100644 --- a/doc/src/sgml/contrib.sgml +++ b/doc/src/sgml/contrib.sgml @@ -202,7 +202,6 @@ pages. part of the core PostgreSQL distribution. - &pgarchivecleanup; &pgstandby; &pgtestfsync; &pgtesttiming; diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml index 89fff7739e1..8b9d6a91279 100644 --- a/doc/src/sgml/filelist.sgml +++ b/doc/src/sgml/filelist.sgml @@ -126,7 +126,6 @@ - diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml index 5b4692fb6d8..f3b577119bd 100644 --- a/doc/src/sgml/ref/allfiles.sgml +++ b/doc/src/sgml/ref/allfiles.sgml @@ -179,6 +179,7 @@ Complete list of usable sgml source files in this directory. + diff --git a/doc/src/sgml/pgarchivecleanup.sgml b/doc/src/sgml/ref/pgarchivecleanup.sgml similarity index 97% rename from doc/src/sgml/pgarchivecleanup.sgml rename to doc/src/sgml/ref/pgarchivecleanup.sgml index fdf0cbb9d1b..779159d7fc2 100644 --- a/doc/src/sgml/pgarchivecleanup.sgml +++ b/doc/src/sgml/ref/pgarchivecleanup.sgml @@ -1,4 +1,4 @@ - + @@ -193,14 +193,6 @@ archive_cleanup_command = 'pg_archivecleanup -d /mnt/standby/archive %r 2>>clean - - Author - - - Simon Riggs simon@2ndquadrant.com - - - See Also diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml index 65ad795afe9..9fb32f8c284 100644 --- a/doc/src/sgml/reference.sgml +++ b/doc/src/sgml/reference.sgml @@ -257,6 +257,7 @@ &initdb; + &pgarchivecleanup; &pgControldata; &pgCtl; &pgResetxlog; diff --git a/src/bin/Makefile b/src/bin/Makefile index 7832deca0db..69cc2b83c1b 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -15,6 +15,7 @@ include $(top_builddir)/src/Makefile.global SUBDIRS = \ initdb \ + pg_archivecleanup \ pg_basebackup \ pg_config \ pg_controldata \ diff --git a/contrib/pg_archivecleanup/.gitignore b/src/bin/pg_archivecleanup/.gitignore similarity index 100% rename from contrib/pg_archivecleanup/.gitignore rename to src/bin/pg_archivecleanup/.gitignore diff --git a/src/bin/pg_archivecleanup/Makefile b/src/bin/pg_archivecleanup/Makefile new file mode 100644 index 00000000000..5bda78490c2 --- /dev/null +++ b/src/bin/pg_archivecleanup/Makefile @@ -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) diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/src/bin/pg_archivecleanup/pg_archivecleanup.c similarity index 99% rename from contrib/pg_archivecleanup/pg_archivecleanup.c rename to src/bin/pg_archivecleanup/pg_archivecleanup.c index 97225a81a76..2ff2a270b65 100644 --- a/contrib/pg_archivecleanup/pg_archivecleanup.c +++ b/src/bin/pg_archivecleanup/pg_archivecleanup.c @@ -1,5 +1,5 @@ /* - * contrib/pg_archivecleanup/pg_archivecleanup.c + * src/bin/pg_archivecleanup/pg_archivecleanup.c * * pg_archivecleanup.c * diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index a647cc719cd..ef083349736 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -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); }