From 5b041a0d34c1f5c32c9abd35f1bc0a6d9c85ec71 Mon Sep 17 00:00:00 2001 From: liuheng Date: Mon, 8 Jan 2024 14:20:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E8=87=B36.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- 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 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 73c41df00..a719d4805 100644 --- a/README.md +++ b/README.md @@ -461,8 +461,8 @@ https://opengauss.org/zh/ v3.1.0 gcc7.3 - openEuler_arm: https://opengauss.obs.cn-south-1.myhuaweicloud.com/3.1.0/binarylibs/openGauss-third_party_binarylibs_openEuler_arm.tar.gz
- openEuler_x86: https://opengauss.obs.cn-south-1.myhuaweicloud.com/3.1.0/binarylibs/openGauss-third_party_binarylibs_openEuler_x86_64.tar.gz
+ openEuler_arm: https://opengauss.obs.cn-south-1.myhuaweicloud.com/3.1.0/binarylibs/openGauss-third_party_binarylibs_openEuler_arm.tar.gz
+ openEuler_x86: https://opengauss.obs.cn-south-1.myhuaweicloud.com/3.1.0/binarylibs/openGauss-third_party_binarylibs_openEuler_x86_64.tar.gz
Centos_x86: https://opengauss.obs.cn-south-1.myhuaweicloud.com/3.1.0/binarylibs/openGauss-third_party_binarylibs_Centos7.6_x86_64.tar.gz @@ -506,7 +506,7 @@ https://opengauss.org/zh/ openEuler_arm: https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/binarylibs/gcc7.3/openGauss-third_party_binarylibs_openEuler_arm.tar.gz
openEuler_x86: https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/binarylibs/gcc7.3/openGauss-third_party_binarylibs_openEuler_x86_64.tar.gz
Centos_x86: https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/binarylibs/gcc7.3/openGauss-third_party_binarylibs_Centos7.6_x86_64.tar.gz
- openEuler 22.03 arm: https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/binarylibs/gcc7.3/openGauss-third_party_binarylibs_openEuler_arm.tar.gz
+ openEuler 22.03 arm: https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/binarylibs/gcc7.3/openGauss-third_party_binarylibs_openEuler_2203_arm.tar.gz
openEuler 22.03 x86: https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/binarylibs/gcc7.3/openGauss-third_party_binarylibs_openEuler_2203_x86_64.tar.gz gcc10.3 diff --git a/build/script/aarch64_lite_list b/build/script/aarch64_lite_list index 7bae1a87f..708de739a 100644 --- a/build/script/aarch64_lite_list +++ b/build/script/aarch64_lite_list @@ -916,4 +916,4 @@ ./include/pqcomm.h ./include/pqexpbuffer.h [version] -5.1.1 +6.0.0 diff --git a/build/script/gaussdb.ver b/build/script/gaussdb.ver index 04e6ba720..1ace1aa09 100644 --- a/build/script/gaussdb.ver +++ b/build/script/gaussdb.ver @@ -1,2 +1,2 @@ PRODUCT=openGauss -VERSION=5.1.1 \ 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 7e825fee7..226b3df60 100644 --- a/build/script/x86_64_lite_list +++ b/build/script/x86_64_lite_list @@ -915,4 +915,4 @@ ./include/pqcomm.h ./include/pqexpbuffer.h [version] -5.1.1 +6.0.0 diff --git a/cmake/src/build_function.cmake b/cmake/src/build_function.cmake index cba45fcd6..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 "5.1.1") + 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 eba38861d..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 "5.1.1" +#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 179700955..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 "5.1.1" +#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 4fd990d91..fb0e9d9b4 100755 --- a/configure +++ b/configure @@ -2206,7 +2206,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='5.1.1' +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 0bc13700b..ec7d46402 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 5.1.1" + 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 04096bab9..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 5.1.1\n"); + printf("openGauss 6.0.0\n"); #endif }