From 528c2e44ab0a5ba49a5a04689dae3f674b71c15e Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 10 Mar 2015 22:33:24 -0400 Subject: [PATCH] Move pg_test_timing from contrib/ to src/bin/ Reviewed-by: Michael Paquier --- contrib/Makefile | 1 - contrib/pg_test_timing/Makefile | 18 ------------- doc/src/sgml/contrib.sgml | 1 - doc/src/sgml/filelist.sgml | 1 - doc/src/sgml/ref/allfiles.sgml | 1 + doc/src/sgml/{ => ref}/pgtesttiming.sgml | 10 +------ doc/src/sgml/reference.sgml | 1 + src/bin/Makefile | 1 + .../bin}/pg_test_timing/.gitignore | 0 src/bin/pg_test_timing/Makefile | 27 +++++++++++++++++++ .../bin}/pg_test_timing/pg_test_timing.c | 0 src/tools/msvc/Mkvcbuild.pm | 6 ++--- 12 files changed, 33 insertions(+), 34 deletions(-) delete mode 100644 contrib/pg_test_timing/Makefile rename doc/src/sgml/{ => ref}/pgtesttiming.sgml (98%) rename {contrib => src/bin}/pg_test_timing/.gitignore (100%) create mode 100644 src/bin/pg_test_timing/Makefile rename {contrib => src/bin}/pg_test_timing/pg_test_timing.c (100%) diff --git a/contrib/Makefile b/contrib/Makefile index 9ca1ed707a0..e5ce0be5fd4 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -33,7 +33,6 @@ SUBDIRS = \ pg_prewarm \ pg_standby \ pg_stat_statements \ - pg_test_timing \ pg_trgm \ pgcrypto \ pgrowlocks \ diff --git a/contrib/pg_test_timing/Makefile b/contrib/pg_test_timing/Makefile deleted file mode 100644 index 8b37aa82496..00000000000 --- a/contrib/pg_test_timing/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# contrib/pg_test_timing/Makefile - -PGFILEDESC = "pg_test_timing - test timing overhead" -PGAPPICON = win32 - -PROGRAM = pg_test_timing -OBJS = pg_test_timing.o $(WIN32RES) - -ifdef USE_PGXS -PG_CONFIG = pg_config -PGXS := $(shell $(PG_CONFIG) --pgxs) -include $(PGXS) -else -subdir = contrib/pg_test_timing -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 b25d18b344a..29e4f2df9b5 100644 --- a/doc/src/sgml/contrib.sgml +++ b/doc/src/sgml/contrib.sgml @@ -202,7 +202,6 @@ pages. &pgstandby; - &pgtesttiming; &pgxlogdump; diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml index 5095e0fce2a..2f4896d4ce3 100644 --- a/doc/src/sgml/filelist.sgml +++ b/doc/src/sgml/filelist.sgml @@ -133,7 +133,6 @@ - diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml index e940153540e..0e0a1f4f462 100644 --- a/doc/src/sgml/ref/allfiles.sgml +++ b/doc/src/sgml/ref/allfiles.sgml @@ -194,6 +194,7 @@ Complete list of usable sgml source files in this directory. + diff --git a/doc/src/sgml/pgtesttiming.sgml b/doc/src/sgml/ref/pgtesttiming.sgml similarity index 98% rename from doc/src/sgml/pgtesttiming.sgml rename to doc/src/sgml/ref/pgtesttiming.sgml index a6ab9b114bb..d5e231fff7b 100644 --- a/doc/src/sgml/pgtesttiming.sgml +++ b/doc/src/sgml/ref/pgtesttiming.sgml @@ -1,4 +1,4 @@ - + @@ -290,14 +290,6 @@ Histogram of timing durations: - - Author - - - Ants Aasma ants.aasma@eesti.ee - - - See Also diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml index 666493cd640..a526638ec9b 100644 --- a/doc/src/sgml/reference.sgml +++ b/doc/src/sgml/reference.sgml @@ -264,6 +264,7 @@ &pgResetxlog; &pgRewind; &pgtestfsync; + &pgtesttiming; &pgupgrade; &postgres; &postmaster; diff --git a/src/bin/Makefile b/src/bin/Makefile index 06a0ab75b6b..d23c95c581c 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -24,6 +24,7 @@ SUBDIRS = \ pg_resetxlog \ pg_rewind \ pg_test_fsync \ + pg_test_timing \ pg_upgrade \ pgbench \ psql \ diff --git a/contrib/pg_test_timing/.gitignore b/src/bin/pg_test_timing/.gitignore similarity index 100% rename from contrib/pg_test_timing/.gitignore rename to src/bin/pg_test_timing/.gitignore diff --git a/src/bin/pg_test_timing/Makefile b/src/bin/pg_test_timing/Makefile new file mode 100644 index 00000000000..d1f35954f0f --- /dev/null +++ b/src/bin/pg_test_timing/Makefile @@ -0,0 +1,27 @@ +# src/bin/pg_test_timing/Makefile + +PGFILEDESC = "pg_test_timing - test timing overhead" +PGAPPICON = win32 + +subdir = src/bin/pg_test_timing +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global + +OBJS = pg_test_timing.o $(WIN32RES) + +all: pg_test_timing + +pg_test_timing: $(OBJS) | submake-libpgport + $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) + +install: all installdirs + $(INSTALL_PROGRAM) pg_test_timing$(X) '$(DESTDIR)$(bindir)/pg_test_timing$(X)' + +installdirs: + $(MKDIR_P) '$(DESTDIR)$(bindir)' + +uninstall: + rm -f '$(DESTDIR)$(bindir)/pg_test_timing$(X)' + +clean distclean maintainer-clean: + rm -f pg_test_timing$(X) $(OBJS) diff --git a/contrib/pg_test_timing/pg_test_timing.c b/src/bin/pg_test_timing/pg_test_timing.c similarity index 100% rename from contrib/pg_test_timing/pg_test_timing.c rename to src/bin/pg_test_timing/pg_test_timing.c diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 5b86c805ae6..6dd429a8b68 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -35,13 +35,11 @@ my @contrib_uselibpq = my @contrib_uselibpgport = ( 'oid2name', 'pg_standby', - 'pg_test_timing', 'pg_xlogdump', 'vacuumlo'); my @contrib_uselibpgcommon = ( 'oid2name', 'pg_standby', - 'pg_test_timing', 'pg_xlogdump', 'vacuumlo'); my $contrib_extralibs = undef; @@ -55,8 +53,8 @@ my @contrib_excludes = ('pgcrypto', 'commit_ts', 'intagg', 'sepgsql'); # Set of variables for frontend modules my $frontend_defines = { 'initdb' => 'FRONTEND' }; my @frontend_uselibpq = ('pg_ctl', 'pg_upgrade', 'pgbench', 'psql'); -my @frontend_uselibpgport = ( 'pg_archivecleanup', 'pg_test_fsync', 'pg_upgrade', 'pgbench' ); -my @frontend_uselibpgcommon = ( 'pg_archivecleanup', 'pg_test_fsync', 'pg_upgrade', 'pgbench' ); +my @frontend_uselibpgport = ( 'pg_archivecleanup', 'pg_test_fsync', 'pg_test_timing', 'pg_upgrade', 'pgbench' ); +my @frontend_uselibpgcommon = ( 'pg_archivecleanup', 'pg_test_fsync', 'pg_test_timing', 'pg_upgrade', 'pgbench' ); my $frontend_extralibs = { 'initdb' => ['ws2_32.lib'], 'pg_restore' => ['ws2_32.lib'], -- 2.30.2