Merge pull request #13 from dutow/ver2

Changing the format of version string
This commit is contained in:
Zsolt Parragi 2024-10-01 13:58:50 +01:00 committed by GitHub
commit f97400152a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions

4
configure vendored
View File

@ -2875,12 +2875,12 @@ if test "${with_extra_version+set}" = set; then :
as_fn_error $? "argument required for --with-extra-version option" "$LINENO" 5 as_fn_error $? "argument required for --with-extra-version option" "$LINENO" 5
;; ;;
*) *)
PG_VERSION="$PACKAGE_VERSION.$PG_PERCONAVERSION (Percona Server for PostgreSQL)$withval" PG_VERSION="$PACKAGE_VERSION - Percona Server for PostgreSQL $PG_MAJORVERSION.$PG_MINORVERSION.$PG_PERCONAVERSION$withval"
;; ;;
esac esac
else else
PG_VERSION="$PACKAGE_VERSION.$PG_PERCONAVERSION (Percona Server for PostgreSQL)" PG_VERSION="$PACKAGE_VERSION - Percona Server for PostgreSQL $PG_MAJORVERSION.$PG_MINORVERSION.$PG_PERCONAVERSION"
fi fi

View File

@ -41,8 +41,8 @@ AC_DEFINE_UNQUOTED(PG_MINORVERSION_NUM, $PG_MINORVERSION, [PostgreSQL minor vers
AC_DEFINE_UNQUOTED(PG_PERCONAVERSION, "$PG_PERCONAVERSION", [PostgreSQL Percona version as a string]) AC_DEFINE_UNQUOTED(PG_PERCONAVERSION, "$PG_PERCONAVERSION", [PostgreSQL Percona version as a string])
PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version], PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
[PG_VERSION="$PACKAGE_VERSION.$PG_PERCONAVERSION (Percona Server for PostgreSQL)$withval"], [PG_VERSION="$PACKAGE_VERSION - Percona Server for PostgreSQL $PG_MAJORVERSION.$PG_MINORVERSION.$PG_PERCONAVERSION$withval"],
[PG_VERSION="$PACKAGE_VERSION.$PG_PERCONAVERSION (Percona Server for PostgreSQL)"]) [PG_VERSION="$PACKAGE_VERSION - Percona Server for PostgreSQL $PG_MAJORVERSION.$PG_MINORVERSION.$PG_PERCONAVERSION"])
AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string]) AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])
AC_CANONICAL_HOST AC_CANONICAL_HOST

View File

@ -145,7 +145,7 @@ cdata.set_quoted('PACKAGE_VERSION', pg_version)
cdata.set_quoted('PACKAGE_STRING', 'PostgreSQL @0@'.format(pg_version)) cdata.set_quoted('PACKAGE_STRING', 'PostgreSQL @0@'.format(pg_version))
cdata.set_quoted('PACKAGE_TARNAME', 'postgresql') cdata.set_quoted('PACKAGE_TARNAME', 'postgresql')
pg_version += '.' + pg_percona_ver + ' (Percona Server for PostgreSQL)' pg_version += ' - Percona Server for PostgreSQL' + pg_version_major.to_string() + '.' + pg_version_minor.to_string() + '.' + pg_percona_ver
pg_version += get_option('extra_version') pg_version += get_option('extra_version')
cdata.set_quoted('PG_VERSION', pg_version) cdata.set_quoted('PG_VERSION', pg_version)
cdata.set_quoted('PG_MAJORVERSION', pg_version_major.to_string()) cdata.set_quoted('PG_MAJORVERSION', pg_version_major.to_string())