From e44b10a8e172ec48c3af62173b9ea209037bcb92 Mon Sep 17 00:00:00 2001 From: liuheng Date: Mon, 11 Mar 2024 17:15:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=A2=9E=E5=8A=A0ecpg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/script/aarch64_opengauss_list | 10 ++++++++++ build/script/x86_64_opengauss_list | 10 ++++++++++ src/common/interfaces/ecpg/include/Makefile | 7 +++++++ 3 files changed, 27 insertions(+) diff --git a/build/script/aarch64_opengauss_list b/build/script/aarch64_opengauss_list index 7fa78abef..640bb7a5e 100644 --- a/build/script/aarch64_opengauss_list +++ b/build/script/aarch64_opengauss_list @@ -5,6 +5,7 @@ ./bin/dms_contrl.sh ./bin/dss_clear.sh ./bin/dss_contrl.sh +./bin/ecpg ./bin/gsql ./bin/gaussdb ./bin/gstrace @@ -808,6 +809,10 @@ ./lib/libpq_ce.so ./lib/libpq_ce.so.5 ./lib/libpq_ce.so.5.5 +./lib/libecpg.so.6.4 +./lib/libecpg_compat.so.3.4 +./lib/libecpg.a +./lib/libecpg_compat.a ./lib/libgauss_cl_jni.so ./lib/libnuma.so ./lib/libnuma.so.1 @@ -1030,6 +1035,11 @@ ./include/postgresql/server/gstrace/gstrace_infra.h ./include/postgresql/server/extension_dependency.h ./include/postgresql/server/libpq/libpq-fe.h +./include/postgresql/server/ecpg/ecpgerrno.h +./include/postgresql/server/ecpg/ecpglib.h +./include/postgresql/server/ecpg/ecpgtype.h +./include/postgresql/server/ecpg/ecpg_informix.h +./include/postgresql/server/ecpg/ecpg_config.h ./include/postgresql/server/access/clog.h ./include/postgresql/server/storage/proc.h ./include/postgresql/server/access/xlog.h diff --git a/build/script/x86_64_opengauss_list b/build/script/x86_64_opengauss_list index 625e7b58e..ce252e976 100644 --- a/build/script/x86_64_opengauss_list +++ b/build/script/x86_64_opengauss_list @@ -5,6 +5,7 @@ ./bin/dms_contrl.sh ./bin/dss_clear.sh ./bin/dss_contrl.sh +./bin/ecpg ./bin/gsql ./bin/gaussdb ./bin/gstrace @@ -808,6 +809,10 @@ ./lib/libpq_ce.so ./lib/libpq_ce.so.5 ./lib/libpq_ce.so.5.5 +./lib/libecpg.so.6.4 +./lib/libecpg_compat.so.3.4 +./lib/libecpg.a +./lib/libecpg_compat.a ./lib/libgauss_cl_jni.so ./lib/libcgroup.so* ./lib/libcom_err_gauss.so* @@ -1027,6 +1032,11 @@ ./include/postgresql/server/gstrace/gstrace_infra.h ./include/postgresql/server/extension_dependency.h ./include/postgresql/server/libpq/libpq-fe.h +./include/postgresql/server/ecpg/ecpgerrno.h +./include/postgresql/server/ecpg/ecpglib.h +./include/postgresql/server/ecpg/ecpgtype.h +./include/postgresql/server/ecpg/ecpg_informix.h +./include/postgresql/server/ecpg/ecpg_config.h ./include/postgresql/server/access/clog.h ./include/postgresql/server/storage/proc.h ./include/postgresql/server/access/xlog.h diff --git a/src/common/interfaces/ecpg/include/Makefile b/src/common/interfaces/ecpg/include/Makefile index 7abb37af7..afac23e14 100644 --- a/src/common/interfaces/ecpg/include/Makefile +++ b/src/common/interfaces/ecpg/include/Makefile @@ -23,9 +23,15 @@ install-headers: $(ecpg_headers) $(informix_headers) $(INSTALL_DATA) $(addprefix $(srcdir)/,$(informix_headers)) '$(DESTDIR)$(informix_esql_dir)/' $(INSTALL_DATA) $(ecpg_config_h) '$(DESTDIR)$(includedir)' + $(MKDIR_P) '$(DESTDIR)$(includedir_server)/ecpg' + for header_file in $(wildcard $(srcdir)/*.h); do \ + $(INSTALL_DATA) $$header_file '$(DESTDIR)$(includedir_server)/ecpg' || exit; \ + done + installdirs: $(MKDIR_P) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(informix_esql_dir)' + uninstall: rm -f $(addprefix '$(DESTDIR)$(includedir)'/, $(ecpg_headers)) rm -f $(addprefix '$(DESTDIR)$(informix_esql_dir)'/, $(informix_headers)) @@ -33,3 +39,4 @@ uninstall: distclean maintainer-clean: rm -f ecpg_config.h stamp-h + rm -r '$(DESTDIR)$(includedir_server)/ecpg'