Ensure to return the right release version

Fow now, if we build Cloudberry from a source zip file (not using git
clone), the version information displayed is not matched the right info,
always return 1.0.0 like this:

```
   PostgreSQL 14.4 (Apache Cloudberry 1.0.0 build dev)
```

In this PR, these changes are made:

- Update the PACKAGE_VERSION string from 1.0.0 to 2.0.0devel, which is
  similar to the way PostgreSQL is using.
- Generate the new configure file with the new configure.ac
- Update the getversion file to take the PACKAGE_VERSION as the base
  version info, and append `+dev.<count>.g<sha>` whenever possible
  unless the current commit is exactly on a tag.

After these changes, will return the right info no matter how they get
the source code, like git-clone, source tarballs.

For each release, we also need to update the version string to match the
right release version manually in each branch.

See: http://github.com/apache/cloudberry/discussions/909

Author: tuhaihe

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Apache Cloudberry 1.0.0.
+# Generated by GNU Autoconf 2.69 for Apache Cloudberry 2.0.0devel.
 #
 # Report bugs to <dev@cloudberry.apache.org>.
 #
@@ -570,6 +570,7 @@ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 #
 # Initializations.
 #
+ac_default_prefix=/usr/local
 ac_clean_files=
 ac_config_libobj_dir=.
 LIBOBJS=
@@ -581,8 +582,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Apache Cloudberry'
 PACKAGE_TARNAME='apache-cloudberry'
-PACKAGE_VERSION='1.0.0'
-PACKAGE_STRING='Apache Cloudberry 1.0.0'
+PACKAGE_VERSION='2.0.0devel'
+PACKAGE_STRING='Apache Cloudberry 2.0.0devel'
 PACKAGE_BUGREPORT='dev@cloudberry.apache.org'
 PACKAGE_URL='https://cloudberry.apache.org/'
 
@@ -759,8 +760,8 @@ HAVE_CXX14
 enable_gpcloud
 enable_shared_postgres_backend
 enable_mapreduce
-enable_catalog_ext
 enable_serverless
+enable_catalog_ext
 enable_orca
 autodepend
 PKG_CONFIG_LIBDIR
@@ -1512,7 +1513,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 Apache Cloudberry 1.0.0 to adapt to many kinds of systems.
+\`configure' configures Apache Cloudberry 2.0.0devel to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1578,7 +1579,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Apache Cloudberry 1.0.0:";;
+     short | recursive ) echo "Configuration of Apache Cloudberry 2.0.0devel:";;
    esac
   cat <<\_ACEOF
 
@@ -1608,7 +1609,7 @@ Optional Features:
   --enable-cassert        enable assertion checks (for debugging)
   --disable-orca          disable ORCA optimizer
   --enable-catalog-ext    enable Cloudberry catalog extension
-  --enable-serverless     enable Cloudberry serverless mode
+  --enable-serverless     use serverless mode of Cloudberry
   --enable-mapreduce      enable Cloudberry Mapreduce support
   --disable-shared-postgres-backend
                           enable Cloudberry shared postgres backend support
@@ -1781,7 +1782,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Apache Cloudberry configure 1.0.0
+Apache Cloudberry configure 2.0.0devel
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2534,7 +2535,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 Apache Cloudberry $as_me 1.0.0, which was
+It was created by Apache Cloudberry $as_me 2.0.0devel, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8380,7 +8381,7 @@ $as_echo "checking whether to build with catalog extension... $enable_catalog_ex
 
 
 #
-# Enable serverless mode
+# --enable-serverless uses serverless mode of Cloudberry
 #
 
 
@@ -8407,8 +8408,8 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking whether to use serverless architecture of Cloudberry ... $enable_serverless" >&5
-$as_echo "checking whether to use serverless architecture of Cloudberry ... $enable_serverless" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking whether to use serverless mode of Cloudberry... $enable_serverless" >&5
+$as_echo "checking whether to use serverless mode of Cloudberry... $enable_serverless" >&6; }
 
 
 #
@@ -23331,7 +23332,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 Apache Cloudberry $as_me 1.0.0, which was
+This file was extended by Apache Cloudberry $as_me 2.0.0devel, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23402,7 +23403,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Apache Cloudberry config.status 1.0.0
+Apache Cloudberry config.status 2.0.0devel
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

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([Apache Cloudberry], [1.0.0], [dev@cloudberry.apache.org], [], [https://cloudberry.apache.org/])
+AC_INIT([Apache Cloudberry], [2.0.0devel], [dev@cloudberry.apache.org], [], [https://cloudberry.apache.org/])
 [PG_PACKAGE_VERSION=14.4]
 AC_SUBST(PG_PACKAGE_VERSION)
 

getversion

@@ -23,10 +23,11 @@ if type git >/dev/null 2>&1 && [ -d '.git' ] ; then
 	# overwrite the VERSION from autoconf with the output, else append
 	# HEAD commit info
 	if git describe >/dev/null 2>&1 ; then
-		VERSION=$(generate_dev_version)
-	else
-		VERSION+=+
-		VERSION+=$(git rev-parse --short HEAD)
+		GIT_VERSION=$(generate_dev_version)
+	# Append commit distance and SHA if not on a tag
+		if ! git describe --exact-match >/dev/null 2>&1; then
+			VERSION+=\+$(echo "$GIT_VERSION" | cut -d'+' -f2-)
+		fi
 	fi
 # If not a git repository and VERSION file exists, use version string from file.
 elif [[ -s ./VERSION ]]; then

gpMgmt/bin/gppylib/gpversion.py

@@ -18,7 +18,7 @@
                      % os.path.split(__file__)[-1])
     sys.exit(1)
 
-MAIN_VERSION = [1,99]    # version number for main
+MAIN_VERSION = [2,99]    # version number for main
 
 
 #============================================================