Move pg_tde_alter_key_provider into conrtrib/pg_tde

This tool should be considered part of our contrib module similar to
how pglogical considers pglogical_create_subscriber. It is a bit
confusing that we have to use SCRIPTS_built when building with make
but it works.

contrib/pg_tde/Makefile

@@ -54,6 +54,10 @@ src/libkmip/libkmip/src/kmip_bio.o \
 src/libkmip/libkmip/src/kmip_locate.o \
 src/libkmip/libkmip/src/kmip_memset.o
 
+SCRIPTS_built = src/pg_tde_alter_key_provider
+
+EXTRA_CLEAN += src/pg_tde_alter_key_provider.o
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -69,6 +73,9 @@ endif
 
 override SHLIB_LINK += -lcurl -lcrypto -lssl
 
+src/pg_tde_alter_key_provider: src/pg_tde_alter_key_provider.o $(top_srcdir)/src/fe_utils/simple_list.o $(top_builddir)/src/libtde/libtde.a
+	$(CC) -DFRONTEND $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
+
 # Fetches typedefs list for PostgreSQL core and merges it with typedefs defined in this project.
 # https://wiki.postgresql.org/wiki/Running_pgindent_on_non-core_code_or_development_code
 update-typedefs:

contrib/pg_tde/meson.build

@@ -151,3 +151,17 @@ pg_tde_frontend = static_library('pg_tde_frontend',
   include_directories: incdir,
   link_whole: [kmip]
 )
+
+pg_tde_alter_key_provider_sources = files(
+  'src/pg_tde_alter_key_provider.c',
+)
+
+pg_tde_alter_key_provider = executable('pg_tde_alter_key_provider',
+  pg_tde_alter_key_provider_sources,
+  dependencies: [frontend_code, lz4, zstd],
+  c_args: ['-DFRONTEND'], # needed for xlogreader et al
+  kwargs: default_bin_args,
+  include_directories: [postgres_inc, pg_tde_inc],
+  link_with: [pg_tde_frontend]
+)
+contrib_targets += pg_tde_alter_key_provider

src/bin/Makefile

@@ -31,7 +31,6 @@ SUBDIRS = \
 	pg_dump \
 	pg_resetwal \
 	pg_rewind \
-	pg_tde_alter_key_provider \
 	pg_test_fsync \
 	pg_test_timing \
 	pg_upgrade \

src/bin/meson.build

@@ -12,7 +12,6 @@ subdir('pg_ctl')
 subdir('pg_dump')
 subdir('pg_resetwal')
 subdir('pg_rewind')
-subdir('pg_tde_alter_key_provider')
 subdir('pg_test_fsync')
 subdir('pg_test_timing')
 subdir('pg_upgrade')

src/bin/pg_tde_alter_key_provider/.gitignore

@@ -1 +0,0 @@
-/pg_tde_alter_key_provider

src/bin/pg_tde_alter_key_provider/Makefile

@@ -1,36 +0,0 @@
-# src/bin/pg_tde_alter_key_provider/Makefile
-
-PGFILEDESC = "pg_tde_alter_key_provider"
-
-subdir = src/bin/pg_tde_alter_key_provider
-top_builddir = ../../..
-include $(top_builddir)/src/Makefile.global
-
-OBJS = \
-	pg_tde_alter_key_provider.o 
-
-override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
-
-OBJS += \
-	$(top_srcdir)/src/fe_utils/simple_list.o \
-	$(top_builddir)/src/libtde/libtde.a
-
-override CPPFLAGS := -I$(top_srcdir)/contrib/pg_tde/src/include -I$(top_srcdir)/contrib/pg_tde/src/libkmip/libkmip/include $(CPPFLAGS)
-
-all: pg_tde_alter_key_provider
-
-pg_tde_alter_key_provider: $(OBJS) | submake-libpgport
-	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
-
-install: all installdirs
-	$(INSTALL_PROGRAM) pg_tde_alter_key_provider$(X) '$(DESTDIR)$(bindir)/pg_tde_alter_key_provider$(X)'
-
-installdirs:
-	$(MKDIR_P) '$(DESTDIR)$(bindir)'
-
-uninstall:
-	rm -f '$(DESTDIR)$(bindir)/pg_tde_alter_key_provider$(X)'
-
-clean distclean:
-	rm -f pg_tde_alter_key_provider$(X) $(OBJS) $(RMGRDESCSOURCES) xlogreader.c xlogstats.c
-	rm -rf tmp_check

src/bin/pg_tde_alter_key_provider/meson.build

@@ -1,26 +0,0 @@
-pg_tde_alter_key_provider_sources = files(
-  'pg_tde_alter_key_provider.c',
-)
-
-link_w = [pg_tde_frontend]
-include_dirs = [postgres_inc, pg_tde_inc]
-
-pg_tde_alter_key_provider = executable('pg_tde_alter_key_provider',
-  pg_tde_alter_key_provider_sources,
-  dependencies: [frontend_code, lz4, zstd],
-  c_args: ['-DFRONTEND'], # needed for xlogreader et al
-  kwargs: default_bin_args,
-  include_directories: include_dirs,
-  link_with: link_w
-)
-bin_targets += pg_tde_alter_key_provider
-
-tests += {
-  'name': 'pg_tde_alter_key_provider',
-  'sd': meson.current_source_dir(),
-  'bd': meson.current_build_dir(),
-  'tap': {
-    'tests': [
-    ],
-  },
-}