git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/contrib/Makefile b/contrib/Makefile

index 195d4472c573ae233b271c4df7e8a7922b925f2e..c56050eecc37a0d9a19c47f5f425c32300105aea 100644 (file)

--- a/contrib/Makefile

+++ b/contrib/Makefile

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 (file)
index ab52390..0000000

--- a/contrib/pg_archivecleanup/Makefile

+++ /dev/null

-# 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 a698d0fb2f89a14a23e0d426a6c784f5ebdd677c..f21fa1491825947b73dd4e25950d8c8412696eba 100644 (file)

--- a/doc/src/sgml/contrib.sgml

+++ b/doc/src/sgml/contrib.sgml

part of the core <productname>PostgreSQL</productname> distribution.

</para>

- &pgarchivecleanup;

&pgstandby;

&pgtestfsync;

&pgtesttiming;

diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml

index 89fff7739e1ffb26f9eba1fb88ac5753927f092f..8b9d6a9127966cfe5e19d14a26c62066a67cb61f 100644 (file)

--- a/doc/src/sgml/filelist.sgml

+++ b/doc/src/sgml/filelist.sgml

<!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">

diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml

index 5b4692fb6d8dacd923a4a1ab66edbff05ab0a6fe..f3b577119bd6d9699251c47a47164c11a0f6f69d 100644 (file)

--- a/doc/src/sgml/ref/allfiles.sgml

+++ b/doc/src/sgml/ref/allfiles.sgml

<!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">

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 fdf0cbb9d1be5ad48d3343d8f56d9b40d99cf6ad..779159d7fc2c5a06d18696dbcaf916e1ad377627 100644 (file)

--- a/doc/src/sgml/pgarchivecleanup.sgml

+++ b/doc/src/sgml/ref/pgarchivecleanup.sgml

-<!-- doc/src/sgml/pgarchivecleanup.sgml -->

+<!-- doc/src/sgml/ref/pgarchivecleanup.sgml -->

<refentry id="pgarchivecleanup">

<indexterm zone="pgarchivecleanup">

</itemizedlist>

</refsect1>

- <refsect1>

- <title>Author</title>

-

- <para>

- Simon Riggs <email>simon@2ndquadrant.com</email>

- </para>

- </refsect1>

-

<refsect1>

<title>See Also</title>

diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml

index 65ad795afe97b8ce0bd6496b8d7654e9a3401ea9..9fb32f8c284ac75e19d48d486ae4956a1f9882d3 100644 (file)

--- a/doc/src/sgml/reference.sgml

+++ b/doc/src/sgml/reference.sgml

</partintro>

&initdb;

+ &pgarchivecleanup;

&pgControldata;

&pgCtl;

&pgResetxlog;

diff --git a/src/bin/Makefile b/src/bin/Makefile

index 7832deca0db3d574bfaec064afb53428529e9823..69cc2b83c1bbf04cecc45aa5b39622c1ea84231a 100644 (file)

--- a/src/bin/Makefile

+++ b/src/bin/Makefile

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 (file)
index 0000000..5bda784

--- /dev/null

+++ b/src/bin/pg_archivecleanup/Makefile

+# 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 97225a81a766532d8d92986133a0285e7c14ade6..2ff2a270b65e1315c8b3a952331a692223163930 100644 (file)

--- a/contrib/pg_archivecleanup/pg_archivecleanup.c

+++ b/src/bin/pg_archivecleanup/pg_archivecleanup.c

/*

- * 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 a647cc719cd8dc6159b7f9e1dcd45c6e16ae377a..ef0833497361569ffd9cfb7b6bb2b5927bffe674 100644 (file)

--- a/src/tools/msvc/Mkvcbuild.pm

+++ b/src/tools/msvc/Mkvcbuild.pm

('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');

# 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'],

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);

}