Move pg_upgrade from contrib/ to src/bin/

Reviewed-by: Michael Paquier <[email protected]>

diff --git a/contrib/Makefile b/contrib/Makefile
index 074e39477b1e3fddb428a8b916760dcc14d06afa..cc60d680fca9c927e5b9d9aeebed2322da6eecf3 100644 (file)
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -36,7 +36,6 @@ SUBDIRS = \
                pg_test_fsync   \
                pg_test_timing  \
                pg_trgm         \
-               pg_upgrade      \
                pgcrypto        \
                pgrowlocks      \
                pgstattuple     \

diff --git a/contrib/pg_upgrade/Makefile b/contrib/pg_upgrade/Makefile
deleted file mode 100644 (file)
index 87da4b8..0000000
--- a/contrib/pg_upgrade/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# contrib/pg_upgrade/Makefile
-
-PGFILEDESC = "pg_upgrade - an in-place binary upgrade utility"
-PGAPPICON = win32
-
-PROGRAM  = pg_upgrade
-OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \
-       option.o page.o parallel.o pg_upgrade.o relfilenode.o server.o \
-       tablespace.o util.o version.o $(WIN32RES)
-
-PG_CPPFLAGS  = -DFRONTEND -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir)
-PG_LIBS = $(libpq_pgport)
-
-EXTRA_CLEAN = analyze_new_cluster.sh delete_old_cluster.sh log/ tmp_check/ \
-              pg_upgrade_dump_globals.sql \
-              pg_upgrade_dump_*.custom pg_upgrade_*.log
-
-ifdef USE_PGXS
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
-else
-subdir = contrib/pg_upgrade
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
-
-check: test.sh all
-       MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir) EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)" $(SHELL) $< --install
-
-# disabled because it upsets the build farm
-#installcheck: test.sh
-#      MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir) $(SHELL) $<

diff --git a/doc/src/sgml/contrib.sgml b/doc/src/sgml/contrib.sgml
index 57730955bfaa859b3241467425c8c24ef32ef5de..adc21843db23b0df341f4e3b1f618004b91bd2cc 100644 (file)
--- a/doc/src/sgml/contrib.sgml
+++ b/doc/src/sgml/contrib.sgml
@@ -204,7 +204,6 @@ pages.
  &pgstandby;
  &pgtestfsync;
  &pgtesttiming;
- &pgupgrade;
  &pgxlogdump;
  </sect1>
 </appendix>

diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml
index ab935a6664f98cf5c4b61f4555e17ab5ce76032a..2d7514c3ea17de45d5c14e4bff87be722bc2101b 100644 (file)
--- a/doc/src/sgml/filelist.sgml
+++ b/doc/src/sgml/filelist.sgml
@@ -136,7 +136,6 @@
 <!ENTITY pgtestfsync     SYSTEM "pgtestfsync.sgml">
 <!ENTITY pgtesttiming    SYSTEM "pgtesttiming.sgml">
 <!ENTITY pgtrgm          SYSTEM "pgtrgm.sgml">
-<!ENTITY pgupgrade       SYSTEM "pgupgrade.sgml">
 <!ENTITY pgxlogdump      SYSTEM "pg_xlogdump.sgml">
 <!ENTITY postgres-fdw    SYSTEM "postgres-fdw.sgml">
 <!ENTITY seg             SYSTEM "seg.sgml">

diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml
index 9ae6aecb1a176f2f3871de98733d2c9e88133d17..211a3c42bd5d2d485b8291727ac2bb6f8ca4012e 100644 (file)
--- a/doc/src/sgml/ref/allfiles.sgml
+++ b/doc/src/sgml/ref/allfiles.sgml
@@ -193,6 +193,7 @@ Complete list of usable sgml source files in this directory.
 <!ENTITY pgResetxlog        SYSTEM "pg_resetxlog.sgml">
 <!ENTITY pgRestore          SYSTEM "pg_restore.sgml">
 <!ENTITY pgRewind           SYSTEM "pg_rewind.sgml">
+<!ENTITY pgupgrade          SYSTEM "pgupgrade.sgml">
 <!ENTITY postgres           SYSTEM "postgres-ref.sgml">
 <!ENTITY postmaster         SYSTEM "postmaster.sgml">
 <!ENTITY psqlRef            SYSTEM "psql-ref.sgml">

diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml
similarity index 98%
rename from doc/src/sgml/pgupgrade.sgml
rename to doc/src/sgml/ref/pgupgrade.sgml
index 45bceff9bea5dbf497c1d895a8d40234295e493e..ce5e3082b5d2ac94c53ae81fcbaa51665b5e7ada 100644 (file)
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/ref/pgupgrade.sgml
@@ -1,4 +1,4 @@
-<!-- doc/src/sgml/pgupgrade.sgml -->
+<!-- doc/src/sgml/ref/pgupgrade.sgml -->
 
 <refentry id="pgupgrade">
  <indexterm zone="pgupgrade">
@@ -240,7 +240,8 @@ mv /usr/local/pgsql /usr/local/pgsql.old
     <title>Install the new PostgreSQL binaries</title>
 
     <para>
-     Install the new server's binaries and support files.
+     Install the new server's binaries and support
+     files.  <application>pg_upgrade</> is included in a default installation.
     </para>
 
     <para>
@@ -252,15 +253,6 @@ make prefix=/usr/local/pgsql.new install
 </programlisting></para>
    </step>
 
-   <step>
-    <title>Install pg_upgrade</title>
-
-    <para>
-     Install the <application>pg_upgrade</> binary in the new PostgreSQL
-     installation.
-    </para>
-   </step>
-
    <step>
     <title>Initialize the new PostgreSQL cluster</title>
 

diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml
index c1765ef1c5ec310b9dd23f7a4425ed6ef70447c5..fb18d94ea0974a37ab75e58e4019bae0ee645f11 100644 (file)
--- a/doc/src/sgml/reference.sgml
+++ b/doc/src/sgml/reference.sgml
@@ -263,6 +263,7 @@
    &pgCtl;
    &pgResetxlog;
    &pgRewind;
+   &pgupgrade;
    &postgres;
    &postmaster;
 

diff --git a/src/bin/Makefile b/src/bin/Makefile
index bb77142cab819c2fe6884bc539b6df0335e1b250..cc78798fba7c339b07066f676a0985297c1a8c82 100644 (file)
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -23,6 +23,7 @@ SUBDIRS = \
        pg_dump \
        pg_resetxlog \
        pg_rewind \
+       pg_upgrade \
        pgbench \
        psql \
        scripts

diff --git a/contrib/pg_upgrade/.gitignore b/src/bin/pg_upgrade/.gitignore
similarity index 100%
rename from contrib/pg_upgrade/.gitignore
rename to src/bin/pg_upgrade/.gitignore

diff --git a/contrib/pg_upgrade/IMPLEMENTATION b/src/bin/pg_upgrade/IMPLEMENTATION
similarity index 99%
rename from contrib/pg_upgrade/IMPLEMENTATION
rename to src/bin/pg_upgrade/IMPLEMENTATION
index a0cfcf15dac30f198b59b5188071ce3e32ec6d76..9b5ff7295c109bb6238000ee96c0b0bbc32f5df4 100644 (file)
--- a/contrib/pg_upgrade/IMPLEMENTATION
+++ b/src/bin/pg_upgrade/IMPLEMENTATION
@@ -1,5 +1,3 @@
-contrib/pg_upgrade/IMPLEMENTATION
-
 ------------------------------------------------------------------------------
 PG_UPGRADE: IN-PLACE UPGRADES FOR POSTGRESQL
 ------------------------------------------------------------------------------

diff --git a/src/bin/pg_upgrade/Makefile b/src/bin/pg_upgrade/Makefile
new file mode 100644 (file)
index 0000000..4eb20d6
--- /dev/null
+++ b/src/bin/pg_upgrade/Makefile
@@ -0,0 +1,42 @@
+# src/bin/pg_upgrade/Makefile
+
+PGFILEDESC = "pg_upgrade - an in-place binary upgrade utility"
+PGAPPICON = win32
+
+subdir = src/bin/pg_upgrade
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
+
+OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \
+       option.o page.o parallel.o pg_upgrade.o relfilenode.o server.o \
+       tablespace.o util.o version.o $(WIN32RES)
+
+override CPPFLAGS := -DFRONTEND -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
+
+
+all: pg_upgrade
+
+pg_upgrade: $(OBJS) | submake-libpq submake-libpgport
+       $(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
+
+install: all installdirs
+       $(INSTALL_PROGRAM) pg_upgrade$(X) '$(DESTDIR)$(bindir)/pg_upgrade$(X)'
+
+installdirs:
+       $(MKDIR_P) '$(DESTDIR)$(bindir)'
+
+uninstall:
+       rm -f '$(DESTDIR)$(bindir)/pg_upgrade$(X)'
+
+clean distclean maintainer-clean:
+       rm -f pg_upgrade$(X) $(OBJS)
+       rm -rf analyze_new_cluster.sh delete_old_cluster.sh log/ tmp_check/ \
+              pg_upgrade_dump_globals.sql \
+              pg_upgrade_dump_*.custom pg_upgrade_*.log
+
+check: test.sh all
+       MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir) EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)" $(SHELL) $< --install
+
+# disabled because it upsets the build farm
+#installcheck: test.sh
+#      MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir) $(SHELL) $<

diff --git a/contrib/pg_upgrade/TESTING b/src/bin/pg_upgrade/TESTING
similarity index 99%
rename from contrib/pg_upgrade/TESTING
rename to src/bin/pg_upgrade/TESTING
index 359688c6645b94f90f62fa10de8865b810f0399f..4ecfc5798e01d3ad841333ccd117ebf144869ec5 100644 (file)
--- a/contrib/pg_upgrade/TESTING
+++ b/src/bin/pg_upgrade/TESTING
@@ -1,5 +1,3 @@
-contrib/pg_upgrade/TESTING
-
 The most effective way to test pg_upgrade, aside from testing on user
 data, is by upgrading the PostgreSQL regression database.
 

diff --git a/contrib/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
similarity index 99%
rename from contrib/pg_upgrade/check.c
rename to src/bin/pg_upgrade/check.c
index 6a498c3bd5c46641e2c78998ea4e411590423410..647bf349f4d9f776cb052383ddfca5936e86b4cc 100644 (file)
--- a/contrib/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -4,7 +4,7 @@
  *     server checks and output routines
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/check.c
+ *     src/bin/pg_upgrade/check.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
similarity index 99%
rename from contrib/pg_upgrade/controldata.c
rename to src/bin/pg_upgrade/controldata.c
index 0e70b6f80b484e4e4535c025d3e997f76d4bfd4e..bf53db05515b2a9fb7f42f4ceab5a4e6e2e21d62 100644 (file)
--- a/contrib/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -4,7 +4,7 @@
  *     controldata functions
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/controldata.c
+ *     src/bin/pg_upgrade/controldata.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/dump.c b/src/bin/pg_upgrade/dump.c
similarity index 99%
rename from contrib/pg_upgrade/dump.c
rename to src/bin/pg_upgrade/dump.c
index 906e85f2b53e68203e1b9f5654b81fd44c4f8d84..2c20e847ac02744242e14834ba1952fb28c9d2d2 100644 (file)
--- a/contrib/pg_upgrade/dump.c
+++ b/src/bin/pg_upgrade/dump.c
@@ -4,7 +4,7 @@
  *     dump functions
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/dump.c
+ *     src/bin/pg_upgrade/dump.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/exec.c b/src/bin/pg_upgrade/exec.c
similarity index 99%
rename from contrib/pg_upgrade/exec.c
rename to src/bin/pg_upgrade/exec.c
index bf87419b18734ef13b6cd58d1082083e5ee5fbd3..7d319126ed9d7cda9f3e611b1b02df0d9dca3651 100644 (file)
--- a/contrib/pg_upgrade/exec.c
+++ b/src/bin/pg_upgrade/exec.c
@@ -4,7 +4,7 @@
  *     execution functions
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/exec.c
+ *     src/bin/pg_upgrade/exec.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/file.c b/src/bin/pg_upgrade/file.c
similarity index 99%
rename from contrib/pg_upgrade/file.c
rename to src/bin/pg_upgrade/file.c
index 5a8d17ae0f499cd06ad13e3220693828e409840a..79d9390216ed34e10191b143770fbc4393fe8972 100644 (file)
--- a/contrib/pg_upgrade/file.c
+++ b/src/bin/pg_upgrade/file.c
@@ -4,7 +4,7 @@
  *     file system operations
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/file.c
+ *     src/bin/pg_upgrade/file.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/function.c b/src/bin/pg_upgrade/function.c
similarity index 99%
rename from contrib/pg_upgrade/function.c
rename to src/bin/pg_upgrade/function.c
index d8009d195d85800ee9d1602c0b112b4bdee548a0..04492a5cee4ffcb21a8e6dfe5e87bba766ea80be 100644 (file)
--- a/contrib/pg_upgrade/function.c
+++ b/src/bin/pg_upgrade/function.c
@@ -4,7 +4,7 @@
  *     server-side function support
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/function.c
+ *     src/bin/pg_upgrade/function.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
similarity index 99%
rename from contrib/pg_upgrade/info.c
rename to src/bin/pg_upgrade/info.c
index 12549342707f78d69fa2d322bba7d59ce70bf662..c0a560120900c1d8338f1dfcf11bfda92b1324cc 100644 (file)
--- a/contrib/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -4,7 +4,7 @@
  *     information support functions
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/info.c
+ *     src/bin/pg_upgrade/info.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
similarity index 99%
rename from contrib/pg_upgrade/option.c
rename to src/bin/pg_upgrade/option.c
index 742d133e391fe58a38188258a729bb8aa11785ac..b85105613506f3fc8596f33a05f96a9e62a8ec82 100644 (file)
--- a/contrib/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -4,7 +4,7 @@
  *     options functions
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/option.c
+ *     src/bin/pg_upgrade/option.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/page.c b/src/bin/pg_upgrade/page.c
similarity index 99%
rename from contrib/pg_upgrade/page.c
rename to src/bin/pg_upgrade/page.c
index 1cfc10f8a2ae1c1edf3887a0badc20629a8f38b3..3f4c697a10863eb8c96eebac80d06410f16df8bf 100644 (file)
--- a/contrib/pg_upgrade/page.c
+++ b/src/bin/pg_upgrade/page.c
@@ -4,7 +4,7 @@
  *     per-page conversion operations
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/page.c
+ *     src/bin/pg_upgrade/page.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/parallel.c b/src/bin/pg_upgrade/parallel.c
similarity index 99%
rename from contrib/pg_upgrade/parallel.c
rename to src/bin/pg_upgrade/parallel.c
index 6da996559a4916a657286a55a49487a3b55c333b..c6978b596b4099d88af5df4933ee1598da7d5221 100644 (file)
--- a/contrib/pg_upgrade/parallel.c
+++ b/src/bin/pg_upgrade/parallel.c
@@ -4,7 +4,7 @@
  *     multi-process support
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/parallel.c
+ *     src/bin/pg_upgrade/parallel.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
similarity index 99%
rename from contrib/pg_upgrade/pg_upgrade.c
rename to src/bin/pg_upgrade/pg_upgrade.c
index 78bd29fb957faabd2ee8d727f123f5e359bba557..fbccc2e830463f6444126df35ac4b6cfa0ab3fc8 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -4,7 +4,7 @@
  *     main source file
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/pg_upgrade.c
+ *     src/bin/pg_upgrade/pg_upgrade.c
  */
 
 /*

diff --git a/contrib/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h
similarity index 99%
rename from contrib/pg_upgrade/pg_upgrade.h
rename to src/bin/pg_upgrade/pg_upgrade.h
index ace3465f989ca68400b4e8091ffff588112a1bd0..4683c6f71c3093f6d09f11c8a10358d9321613f6 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/src/bin/pg_upgrade/pg_upgrade.h
@@ -2,7 +2,7 @@
  *     pg_upgrade.h
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/pg_upgrade.h
+ *     src/bin/pg_upgrade/pg_upgrade.h
  */
 
 #include <unistd.h>

diff --git a/contrib/pg_upgrade/relfilenode.c b/src/bin/pg_upgrade/relfilenode.c
similarity index 99%
rename from contrib/pg_upgrade/relfilenode.c
rename to src/bin/pg_upgrade/relfilenode.c
index 423802bd2392bd3e38ff05167b612a812938cdc2..fe058807b68ef76bc903e4f017bb9a5b7d67a8d3 100644 (file)
--- a/contrib/pg_upgrade/relfilenode.c
+++ b/src/bin/pg_upgrade/relfilenode.c
@@ -4,7 +4,7 @@
  *     relfilenode functions
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/relfilenode.c
+ *     src/bin/pg_upgrade/relfilenode.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
similarity index 99%
rename from contrib/pg_upgrade/server.c
rename to src/bin/pg_upgrade/server.c
index c5f66f096329a7201a403228f0e88222b9f09628..8d8e7d70734eed35fb57c3011d321fc33f7c14b4 100644 (file)
--- a/contrib/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -4,7 +4,7 @@
  *     database server functions
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/server.c
+ *     src/bin/pg_upgrade/server.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/tablespace.c b/src/bin/pg_upgrade/tablespace.c
similarity index 98%
rename from contrib/pg_upgrade/tablespace.c
rename to src/bin/pg_upgrade/tablespace.c
index eecdf4b298367d059e8b0b4a68681ef6a9658c23..ce7097e71bf385311e6b2ac1654abbcf3bf332dd 100644 (file)
--- a/contrib/pg_upgrade/tablespace.c
+++ b/src/bin/pg_upgrade/tablespace.c
@@ -4,7 +4,7 @@
  *     tablespace functions
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/tablespace.c
+ *     src/bin/pg_upgrade/tablespace.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
similarity index 97%
rename from contrib/pg_upgrade/test.sh
rename to src/bin/pg_upgrade/test.sh
index 2e9f97688c64588d50c19e388d543d051098d5b1..0903f30b11972857223f96cf9d06da28ae1d8f0f 100644 (file)
--- a/contrib/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# contrib/pg_upgrade/test.sh
+# src/bin/pg_upgrade/test.sh
 #
 # Test driver for pg_upgrade.  Initializes a new database cluster,
 # runs the regression tests (to put in some data), runs pg_dumpall,
@@ -21,7 +21,7 @@ unset MAKELEVEL
 # authentication configuration.
 standard_initdb() {
        "$1" -N
-       ../../src/test/regress/pg_regress --config-auth "$PGDATA"
+       ../../test/regress/pg_regress --config-auth "$PGDATA"
 }
 
 # Establish how the server will listen for connections
@@ -92,9 +92,9 @@ fi
 
 : ${oldbindir=$bindir}
 
-: ${oldsrc=../..}
+: ${oldsrc=../../..}
 oldsrc=`cd "$oldsrc" && pwd`
-newsrc=`cd ../.. && pwd`
+newsrc=`cd ../../.. && pwd`
 
 PATH=$bindir:$PATH
 export PATH

diff --git a/contrib/pg_upgrade/util.c b/src/bin/pg_upgrade/util.c
similarity index 99%
rename from contrib/pg_upgrade/util.c
rename to src/bin/pg_upgrade/util.c
index 6184ceef933ebf462a7eb0116770d58d1e34361e..7f328f06444c41a8b3ecc3265318b2b0826e3396 100644 (file)
--- a/contrib/pg_upgrade/util.c
+++ b/src/bin/pg_upgrade/util.c
@@ -4,7 +4,7 @@
  *     utility functions
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/util.c
+ *     src/bin/pg_upgrade/util.c
  */
 
 #include "postgres_fe.h"

diff --git a/contrib/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
similarity index 99%
rename from contrib/pg_upgrade/version.c
rename to src/bin/pg_upgrade/version.c
index 4ae9511d04526447231a43736320eeffe33b745d..e3e7387c92dd321b536b7f2ec92e901e3fe30fb8 100644 (file)
--- a/contrib/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -4,7 +4,7 @@
  *     Postgres-version-specific routines
  *
  *     Copyright (c) 2010-2015, PostgreSQL Global Development Group
- *     contrib/pg_upgrade/version.c
+ *     src/bin/pg_upgrade/version.c
  */
 
 #include "postgres_fe.h"

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 39281db901173ed5ce21dba226b9e45c476710ec..e4dbebf0604b50da19a591de0a3c58d2054e6c52 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -31,18 +31,18 @@ my $libpq;
 # Set of variables for contrib modules
 my $contrib_defines = { 'refint' => 'REFINT_VERBOSE' };
 my @contrib_uselibpq =
-  ('dblink', 'oid2name', 'pg_upgrade', 'postgres_fdw', 'vacuumlo');
+  ('dblink', 'oid2name', 'postgres_fdw', 'vacuumlo');
 my @contrib_uselibpgport = (
        'oid2name',
        'pg_standby',
        'pg_test_fsync', 'pg_test_timing',
-       'pg_upgrade',    'pg_xlogdump',
+       'pg_xlogdump',
        'vacuumlo');
 my @contrib_uselibpgcommon = (
        'oid2name',
        'pg_standby',
        'pg_test_fsync', 'pg_test_timing',
-       'pg_upgrade',    'pg_xlogdump',
+       'pg_xlogdump',
        'vacuumlo');
 my $contrib_extralibs = undef;
 my $contrib_extraincludes =
@@ -54,9 +54,9 @@ my @contrib_excludes = ('pgcrypto', 'intagg', 'sepgsql');
 
 # Set of variables for frontend modules
 my $frontend_defines = { 'initdb' => 'FRONTEND' };
-my @frontend_uselibpq = ('pg_ctl', 'pgbench', 'psql');
-my @frontend_uselibpgport = ( 'pg_archivecleanup', 'pgbench' );
-my @frontend_uselibpgcommon = ( 'pg_archivecleanup', 'pgbench' );
+my @frontend_uselibpq = ('pg_ctl', 'pg_upgrade', 'pgbench', 'psql');
+my @frontend_uselibpgport = ( 'pg_archivecleanup', 'pg_upgrade', 'pgbench' );
+my @frontend_uselibpgcommon = ( 'pg_archivecleanup', 'pg_upgrade', 'pgbench' );
 my $frontend_extralibs = {
        'initdb'     => ['ws2_32.lib'],
        'pg_restore' => ['ws2_32.lib'],

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index bd3dd2ca1e1070d46a6a7cb64cdf722da94b8d3e..4812a0361f680f28393c6157f635d60f1d37c78c 100644 (file)
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -269,7 +269,7 @@ sub upgradecheck
 
        $ENV{PGHOST} = 'localhost';
        $ENV{PGPORT} ||= 50432;
-       my $tmp_root = "$topdir/contrib/pg_upgrade/tmp_check";
+       my $tmp_root = "$topdir/src/bin/pg_upgrade/tmp_check";
        (mkdir $tmp_root || die $!) unless -d $tmp_root;
        my $tmp_install = "$tmp_root/install";
        print "Setting up temp install\n\n";
@@ -282,7 +282,7 @@ sub upgradecheck
        $ENV{PATH} = "$bindir;$ENV{PATH}";
        my $data = "$tmp_root/data";
        $ENV{PGDATA} = "$data.old";
-       my $logdir = "$topdir/contrib/pg_upgrade/log";
+       my $logdir = "$topdir/src/bin/pg_upgrade/log";
        (mkdir $logdir || die $!) unless -d $logdir;
        print "\nRunning initdb on old cluster\n\n";
        standard_initdb() or exit 1;
@@ -292,7 +292,7 @@ sub upgradecheck
        installcheck();
 
        # now we can chdir into the source dir
-       chdir "$topdir/contrib/pg_upgrade";
+       chdir "$topdir/src/bin/pg_upgrade";
        print "\nDumping old cluster\n\n";
        system("pg_dumpall -f $tmp_root/dump1.sql") == 0 or exit 1;
        print "\nStopping old cluster\n\n";