From fd4aca93bebd4904066cf56ead10ace5edf186e5 Mon Sep 17 00:00:00 2001 From: Dianjin Wang Date: Tue, 26 Nov 2024 14:44:45 +0800 Subject: [PATCH] Doc: update Cloudberry info in configuration files In this PR, including the following changes: * Rename the project name from "Cloudberry Database" to "Apache Cloudberry" * Update the website url to "cloudberry.apache.org" * Update the contact email from "info@cloudberrydb.org" to "dev@cloudberry.apache.org" mailing list --- GNUmakefile.in | 4 +- configure | 54 +++++++++++------------ configure.ac | 6 +-- gpMgmt/bin/gppylib/gpversion.py | 8 ++-- src/test/regress/expected/gp_metadata.out | 2 +- src/test/regress/sql/gp_metadata.sql | 2 +- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 159a26d6995..77c2ab55218 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -34,7 +34,7 @@ ifeq ($(with_openssl), yes) endif $(MAKE) -C gpMgmt all $(MAKE) -C gpcontrib all - +@echo "All of Cloudberry Database successfully made. Ready to install." + +@echo "All of Apache Cloudberry successfully made. Ready to install." docs: $(MAKE) -C doc all @@ -78,7 +78,7 @@ ifeq ($(with_openssl), yes) endif $(MAKE) -C gpMgmt $@ $(MAKE) -C gpcontrib $@ - +@echo "Cloudberry Database installation complete." + +@echo "Apache Cloudberry installation complete." install-docs: $(MAKE) -C doc install diff --git a/configure b/configure index afb75756c7f..f38924fb577 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Cloudberry Database 1.0.0. +# Generated by GNU Autoconf 2.69 for Apache Cloudberry 1.0.0. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -269,10 +269,10 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: info@cloudberrydb.org about your system, including any -$0: error possibly output before this message. Then install -$0: a modern shell, or manually run the script under such a -$0: shell if you do have one." +$0: dev@cloudberry.apache.org about your system, including +$0: any error possibly output before this message. Then +$0: install a modern shell, or manually run the script +$0: under such a shell if you do have one." fi exit 1 fi @@ -579,12 +579,12 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='Cloudberry Database' -PACKAGE_TARNAME='cloudberry-database' +PACKAGE_NAME='Apache Cloudberry' +PACKAGE_TARNAME='apache-cloudberry' PACKAGE_VERSION='1.0.0' -PACKAGE_STRING='Cloudberry Database 1.0.0' -PACKAGE_BUGREPORT='info@cloudberrydb.org' -PACKAGE_URL='https://www.cloudberrydb.org/' +PACKAGE_STRING='Apache Cloudberry 1.0.0' +PACKAGE_BUGREPORT='dev@cloudberry.apache.org' +PACKAGE_URL='https://cloudberry.apache.org/' ac_unique_file="src/backend/access/common/heaptuple.c" ac_default_prefix=/usr/local/cbdb @@ -1508,7 +1508,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Cloudberry Database 1.0.0 to adapt to many kinds of systems. +\`configure' configures Apache Cloudberry 1.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1557,7 +1557,7 @@ Fine tuning of the installation directories: --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] --docdir=DIR documentation root - [DATAROOTDIR/doc/cloudberry-database] + [DATAROOTDIR/doc/apache-cloudberry] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1574,7 +1574,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Cloudberry Database 1.0.0:";; + short | recursive ) echo "Configuration of Apache Cloudberry 1.0.0:";; esac cat <<\_ACEOF @@ -1711,8 +1711,8 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . -Cloudberry Database home page: . +Report bugs to . +Apache Cloudberry home page: . _ACEOF ac_status=$? fi @@ -1775,7 +1775,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Cloudberry Database configure 1.0.0 +Apache Cloudberry configure 1.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2020,9 +2020,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------ ## -## Report this to info@cloudberrydb.org ## -## ------------------------------------ ##" +( $as_echo "## ---------------------------------------- ## +## Report this to dev@cloudberry.apache.org ## +## ---------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2528,7 +2528,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Cloudberry Database $as_me 1.0.0, which was +It was created by Apache Cloudberry $as_me 1.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3096,7 +3096,7 @@ PostgreSQL has apparently not been ported to your platform yet. To try a manual configuration, look into the src/template directory for a similar platform and use the '--with-template=' option. -Please also contact to see about +Please also contact to see about rectifying this. Include the above 'checking host system type...' line. ******************************************************************* @@ -22652,7 +22652,7 @@ fi cat >>confdefs.h <<_ACEOF -#define PG_VERSION_STR "PostgreSQL $PG_VERSION (Cloudberry Database $GP_VERSION) on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit" +#define PG_VERSION_STR "PostgreSQL $PG_VERSION (Apache Cloudberry $GP_VERSION) on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit" _ACEOF @@ -23263,7 +23263,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Cloudberry Database $as_me 1.0.0, which was +This file was extended by Apache Cloudberry $as_me 1.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23327,14 +23327,14 @@ $config_links Configuration commands: $config_commands -Report bugs to . -Cloudberry Database home page: ." +Report bugs to . +Apache Cloudberry home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Cloudberry Database config.status 1.0.0 +Apache Cloudberry config.status 1.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4fd6f8c7379..2c724121816 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros dnl The PACKAGE_VERSION from upstream PostgreSQL is maintained in the dnl PG_PACKAGE_VERSION variable, when merging make sure to update this dnl variable with the merge conflict from the AC_INIT() statement. -AC_INIT([Cloudberry Database], [1.0.0], [info@cloudberrydb.org], [], [https://www.cloudberrydb.org/]) +AC_INIT([Apache Cloudberry], [1.0.0], [dev@cloudberry.apache.org], [], [https://cloudberry.apache.org/]) [PG_PACKAGE_VERSION=14.4] AC_SUBST(PG_PACKAGE_VERSION) @@ -45,7 +45,7 @@ AC_DEFINE_UNQUOTED(PG_MINORVERSION_NUM, $PG_MINORVERSION, [PostgreSQL minor vers [PG_VERSION="$PG_PACKAGE_VERSION"] PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version], [], []) -AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_PACKAGE_VERSION", [Postgres version Cloudberry Database is based on]) +AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_PACKAGE_VERSION", [Postgres version Apache Cloudberry is based on]) AC_CANONICAL_HOST @@ -2973,7 +2973,7 @@ else fi AC_DEFINE_UNQUOTED(PG_VERSION_STR, - ["PostgreSQL $PG_VERSION (Cloudberry Database $GP_VERSION) on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"], + ["PostgreSQL $PG_VERSION (Apache Cloudberry $GP_VERSION) on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"], [A string containing the version number, platform, and C compiler]) # Supply a numeric version string for use by 3rd party add-ons diff --git a/gpMgmt/bin/gppylib/gpversion.py b/gpMgmt/bin/gppylib/gpversion.py index 9d0a35e9f1a..a30aef28e3f 100644 --- a/gpMgmt/bin/gppylib/gpversion.py +++ b/gpMgmt/bin/gppylib/gpversion.py @@ -90,10 +90,10 @@ def __init__(self, version): # There are several version formats that we anticipate receiving: # # Versions from "postgres --gp-version": - # ".* (Cloudberry Database) build " + # ".* (Apache Cloudberry) build " # # Version from sql "select version()" - # ".* (Cloudberry Database build ) .*" + # ".* (Apache Cloudberry build ) .*" # # Versions from python code: # "" @@ -101,7 +101,7 @@ def __init__(self, version): # if isinstance(v, str): # See if it matches one of the two the long formats - regex = r"\(Cloudberry Database\)? ([^ ]+) build ([^ )]+)" + regex = r"\(Apache Cloudberry\)? ([^ ]+) build ([^ )]+)" m = re.search(regex, v) if m: (v, self.build) = m.groups() # (version, build) @@ -175,7 +175,7 @@ def __init__(self, version): # If part of the conversion process above failed, throw an error, except Exception as e: - raise Exception("Unrecognised CloudberryDB Version '%s' due to %s" % + raise Exception("Unrecognised Cloudberry Version '%s' due to %s" % (str(version), str(e))) #------------------------------------------------------------ diff --git a/src/test/regress/expected/gp_metadata.out b/src/test/regress/expected/gp_metadata.out index 337d62b4c62..cbe64f6961d 100644 --- a/src/test/regress/expected/gp_metadata.out +++ b/src/test/regress/expected/gp_metadata.out @@ -1,4 +1,4 @@ -select version() ~ '^PostgreSQL (1[0-9]+)(\.[0-9]+)?(devel|stable)?(beta[0-9])? \(Cloudberry Database ([0-9]+\.){2}[0-9]+.+' as version; +select version() ~ '^PostgreSQL (1[0-9]+)(\.[0-9]+)?(devel|stable)?(beta[0-9])? \(Apache Cloudberry ([0-9]+\.){2}[0-9]+.+' as version; version --------- t diff --git a/src/test/regress/sql/gp_metadata.sql b/src/test/regress/sql/gp_metadata.sql index 965ad94f50e..d78d5ff4e6c 100644 --- a/src/test/regress/sql/gp_metadata.sql +++ b/src/test/regress/sql/gp_metadata.sql @@ -1,2 +1,2 @@ -select version() ~ '^PostgreSQL (1[0-9]+)(\.[0-9]+)?(devel|stable)?(beta[0-9])? \(Cloudberry Database ([0-9]+\.){2}[0-9]+.+' as version; +select version() ~ '^PostgreSQL (1[0-9]+)(\.[0-9]+)?(devel|stable)?(beta[0-9])? \(Apache Cloudberry ([0-9]+\.){2}[0-9]+.+' as version; select gp_opt_version() ~ '^(GPOPT version: 4.0.0, Xerces version: ([0-9]+\.){2}[0-9]+|Server has been compiled without ORCA)$' as version;