From e1e597c2d93d4133aa16eaddb3a8350f27cc7664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=94=A6=E6=B3=A2?= Date: Tue, 14 May 2024 03:34:01 +0000 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E8=87=B36.?= =?UTF-8?q?0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李锦波 更新版本至6.0.0 Signed-off-by: 李锦波 更新版本至6.0.0 Signed-off-by: 李锦波 更新版本至6.0.0 Signed-off-by: 李锦波 更新版本至6.0.0 Signed-off-by: 李锦波 更新版本至6.0.0 Signed-off-by: 李锦波 更新版本至6.0.0 Signed-off-by: 李锦波 update src/bin/gs_plan_simulator/gs_plan_simulator.sh. Signed-off-by: 李锦波 更新版本至6.0.0 Signed-off-by: 李锦波 更新版本至6.0.0 Signed-off-by: 李锦波 --- build/script/aarch64_lite_list | 2 +- build/script/gaussdb.ver | 2 +- build/script/x86_64_lite_list | 2 +- cmake/src/build_function.cmake | 2 +- cmake/src/config-in/pg_config.h.in | 2 +- cmake/src/config-in/pg_config_nocheck.h.in | 2 +- configure | 2 +- src/bin/gs_plan_simulator/gs_plan_simulator.sh | 2 +- src/bin/pg_config/pg_config.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/script/aarch64_lite_list b/build/script/aarch64_lite_list index 856c122f4..38b7eacdd 100644 --- a/build/script/aarch64_lite_list +++ b/build/script/aarch64_lite_list @@ -919,4 +919,4 @@ ./include/pqcomm.h ./include/pqexpbuffer.h [version] -6.0.0-RC1 +6.0.0 diff --git a/build/script/gaussdb.ver b/build/script/gaussdb.ver index cf6bf25ad..1ace1aa09 100644 --- a/build/script/gaussdb.ver +++ b/build/script/gaussdb.ver @@ -1,2 +1,2 @@ PRODUCT=openGauss -VERSION=6.0.0-RC1 \ No newline at end of file +VERSION=6.0.0 \ No newline at end of file diff --git a/build/script/x86_64_lite_list b/build/script/x86_64_lite_list index 2143d2aa7..ca989045f 100644 --- a/build/script/x86_64_lite_list +++ b/build/script/x86_64_lite_list @@ -918,4 +918,4 @@ ./include/pqcomm.h ./include/pqexpbuffer.h [version] -6.0.0-RC1 +6.0.0 diff --git a/cmake/src/build_function.cmake b/cmake/src/build_function.cmake index 173059af5..fc114c9f2 100755 --- a/cmake/src/build_function.cmake +++ b/cmake/src/build_function.cmake @@ -198,7 +198,7 @@ ENDMACRO(CHECK_CC_ENABLE) function(GET_VERSIONSTR_FROMGIT ret) set(PG_VERSION "9.2.4") - set(OPENGAUSS_VERSION "6.0.0-RC1") + set(OPENGAUSS_VERSION "6.0.0") execute_process( COMMAND ${CMAKE_SOURCE_DIR}/${openGauss}/cmake/src/buildfunction.sh --s ${PROJECT_TRUNK_DIR} OUTPUT_VARIABLE GS_VERSION_STR) set(PG_VERSION "${PG_VERSION}" PARENT_SCOPE) diff --git a/cmake/src/config-in/pg_config.h.in b/cmake/src/config-in/pg_config.h.in index c25bbf357..3eb54fd71 100755 --- a/cmake/src/config-in/pg_config.h.in +++ b/cmake/src/config-in/pg_config.h.in @@ -714,7 +714,7 @@ #define PGXC_VERSION_NUM /* openGauss version as a number string */ -#define OPENGAUSS_VERSION_NUM_STR "6.0.0-RC1" +#define OPENGAUSS_VERSION_NUM_STR "6.0.0" /* A string containing the version number, platform, and C compiler */ #define PG_VERSION_STR "@PG_VERSION_STR@" diff --git a/cmake/src/config-in/pg_config_nocheck.h.in b/cmake/src/config-in/pg_config_nocheck.h.in index 56d6663db..71c832361 100755 --- a/cmake/src/config-in/pg_config_nocheck.h.in +++ b/cmake/src/config-in/pg_config_nocheck.h.in @@ -695,7 +695,7 @@ #define PG_VERSION "9.2.4" /* openGauss version as a string */ -#define OPENGAUSS_VERSION "6.0.0-RC1" +#define OPENGAUSS_VERSION "6.0.0" /* Gaussdb version as a string*/ #define DEF_GS_VERSION "(GaussDB A 8.0.0 build 21f07aff) compiled at 2020-03-17 10:59:07 commit 7431 last mr 12039 debug" diff --git a/configure b/configure index 726648bd9..1c5f41a89 100755 --- a/configure +++ b/configure @@ -2208,7 +2208,7 @@ PACKAGE_VERSION='9.2.4' # Postgres-XC 1.1devel is based on PostgreSQL 9.2.4 PACKAGE_XC_VERSION='1.1' # openGauss is based on PostgreSQL 9.2.4 and it will be the Kernel of GaussDB database -OPENGAUSS_VERSION='6.0.0-RC1' +OPENGAUSS_VERSION='6.0.0' cat >>confdefs.h <<_ACEOF #define PG_VERSION "$PACKAGE_VERSION" diff --git a/src/bin/gs_plan_simulator/gs_plan_simulator.sh b/src/bin/gs_plan_simulator/gs_plan_simulator.sh index 3fdbed513..01c85129f 100755 --- a/src/bin/gs_plan_simulator/gs_plan_simulator.sh +++ b/src/bin/gs_plan_simulator/gs_plan_simulator.sh @@ -88,7 +88,7 @@ function logo() echo " | | | | (_| | | | | ____) | | | | | | | |_| | | (_| | || (_) | | " echo " |_| |_|\__,_|_| |_| |_____/|_|_| |_| |_|\__,_|_|\__,_|\__|___/|_| " echo " " - echo " Version 6.0.0-RC1" + echo " Version 6.0.0" echo "--------------------------------------------------------------------------" } diff --git a/src/bin/pg_config/pg_config.cpp b/src/bin/pg_config/pg_config.cpp index 412fd98e1..7cd8b09d6 100644 --- a/src/bin/pg_config/pg_config.cpp +++ b/src/bin/pg_config/pg_config.cpp @@ -297,7 +297,7 @@ static void show_version(int alls) if (alls) { printf("OPENGAUSS_VERSION = "); } - printf("openGauss 6.0.0-RC1\n"); + printf("openGauss 6.0.0\n"); #endif }