database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

Make numeric form of PG version number readily available in Makefiles.

Browse Source 
Expose PG_VERSION_NUM (e.g., "90600") as a Make variable; but for
consistency with the other Make variables holding similar info,
call the variable just VERSION_NUM not PG_VERSION_NUM.

There was some discussion of making this value available as a pg_config
value as well.  However, that would entail substantially more work than
this two-line patch.  Given that there was not exactly universal consensus
that we need this at all, let's just do a minimal amount of work for now.

Back-patch of commit a5d489ccb7e613c7ca3be6141092b8c1d2c13fa7, so that this
variable is actually useful for its intended purpose sometime before 2020.

Michael Paquier, reviewed by Pavel Stehule
This commit is contained in:
Tom Lane 2015-07-05 12:01:01 -04:00
parent 4a1944ec6c
commit 60c38e62cd
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -627,6 +627,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS ac_subst_vars='LTLIBOBJS
vpath_build vpath_build
PG_VERSION_NUM
PROVE PROVE
OSX OSX
XSLTPROC XSLTPROC
@ -15056,6 +15057,7 @@ _ACEOF
# Begin output steps # Begin output steps
{ $as_echo "$as_me:${as_lineno-$LINENO}: using compiler=$cc_string" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: using compiler=$cc_string" >&5

1
configure.in
View File

@ -2022,6 +2022,7 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR,
tr '.' ' ' | tr '.' ' ' |
$AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"] $AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"]
AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number]) AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number])
AC_SUBST(PG_VERSION_NUM)
# Begin output steps # Begin output steps

1
src/Makefile.global.in
View File

@ -38,6 +38,7 @@ all:
# PostgreSQL version number # PostgreSQL version number
VERSION = @PACKAGE_VERSION@ VERSION = @PACKAGE_VERSION@
MAJORVERSION = @PG_MAJORVERSION@ MAJORVERSION = @PG_MAJORVERSION@
VERSION_NUM = @PG_VERSION_NUM@
# Support for VPATH builds # Support for VPATH builds
# (PGXS VPATH support is handled separately in pgxs.mk) # (PGXS VPATH support is handled separately in pgxs.mk)