Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdb955ba

Browse files
committed
Make version reporting compatible with vanilla PostgreSQL, while leaving additional defines and function for PostgresPro version
1 parent9764b25 commitdb955ba

File tree

11 files changed

+109
-41
lines changed

11 files changed

+109
-41
lines changed

‎GNUmakefile.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,11 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
7575

7676

7777
##########################################################################
78-
78+
ifeq ($PGPRO_VERSION,)
7979
distdir= postgrespro-$(VERSION)
80+
else
81+
distdir= postgrespro-$(PGPRO_VERSION)
82+
endif
8083
dummy= =install=
8184
garbage = =* "#"* ."#"* *~* *.orig *.rej core postgresql-*
8285

‎configure

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 forPostgresPro 9.5.1.3.
3+
# Generated by GNU Autoconf 2.69 forPostgreSQL 9.5.2.
44
#
5-
# Report bugs to <pgsql-bugs@postgrespro.com>.
5+
# Report bugs to <bugs@postgrespro.ru>.
66
#
77
#
88
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -270,10 +270,10 @@ fi
270270
$as_echo"$0: be upgraded to zsh 4.3.4 or later."
271271
else
272272
$as_echo"$0: Please tell bug-autoconf@gnu.org and
273-
$0:pgsql-bugs@postgrespro.com about your system, including
274-
$0:anyerror possibly output before this message. Then
275-
$0:installa modern shell, or manually run the script
276-
$0:under such ashell if you do have one."
273+
$0: bugs@postgrespro.ru about your system, including any
274+
$0: error possibly output before this message. Then install
275+
$0: a modern shell, or manually run the script under such a
276+
$0: shell if you do have one."
277277
fi
278278
exit 1
279279
fi
@@ -581,11 +581,11 @@ MFLAGS=
581581
MAKEFLAGS=
582582

583583
# Identity of this package.
584-
PACKAGE_NAME='PostgresPro'
584+
PACKAGE_NAME='PostgreSQL'
585585
PACKAGE_TARNAME='postgrespro'
586-
PACKAGE_VERSION='9.5.1.3'
587-
PACKAGE_STRING='PostgresPro 9.5.1.3'
588-
PACKAGE_BUGREPORT='pgsql-bugs@postgrespro.com'
586+
PACKAGE_VERSION='9.5.2'
587+
PACKAGE_STRING='PostgreSQL 9.5.2'
588+
PACKAGE_BUGREPORT='bugs@postgrespro.ru'
589589
PACKAGE_URL=''
590590

591591
ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -627,6 +627,7 @@ ac_includes_default="\
627627
#endif"
628628

629629
ac_subst_vars='LTLIBOBJS
630+
PGPRO_VERSION
630631
vpath_build
631632
PG_VERSION_NUM
632633
PROVE
@@ -754,6 +755,7 @@ build_os
754755
build_vendor
755756
build_cpu
756757
build
758+
PGPRO_PACKAGE_NAME
757759
PG_MAJORVERSION
758760
configure_args
759761
target_alias
@@ -1398,7 +1400,7 @@ if test "$ac_init_help" = "long"; then
13981400
# Omit some internal or obsolete options to make the list less imposing.
13991401
# This message is too long to be a string in the A/UX 3.1 sh.
14001402
cat<<_ACEOF
1401-
\`configure' configuresPostgresPro 9.5.1.3 to adapt to many kinds of systems.
1403+
\`configure' configuresPostgreSQL 9.5.2 to adapt to many kinds of systems.
14021404
14031405
Usage:$0 [OPTION]... [VAR=VALUE]...
14041406
@@ -1463,7 +1465,7 @@ fi
14631465

14641466
iftest -n"$ac_init_help";then
14651467
case$ac_init_helpin
1466-
short | recursive )echo"Configuration ofPostgresPro 9.5.1.3:";;
1468+
short | recursive )echo"Configuration ofPostgreSQL 9.5.2:";;
14671469
esac
14681470
cat<<\_ACEOF
14691471
@@ -1551,7 +1553,7 @@ Some influential environment variables:
15511553
Use these variables to override the choices made by`configure' or to help
15521554
it to find libraries and programs with nonstandard names/locations.
15531555
1554-
Report bugs to <pgsql-bugs@postgrespro.com>.
1556+
Report bugs to <bugs@postgrespro.ru>.
15551557
_ACEOF
15561558
ac_status=$?
15571559
fi
@@ -1614,7 +1616,7 @@ fi
16141616
test -n "$ac_init_help" && exit $ac_status
16151617
if $ac_init_version; then
16161618
cat <<\_ACEOF
1617-
PostgresPro configure 9.5.1.3
1619+
PostgreSQL configure 9.5.2
16181620
generated by GNU Autoconf 2.69
16191621
16201622
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1889,9 +1891,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
18891891
$as_echo"$as_me: WARNING:$2: section\"Present But Cannot Be Compiled\"">&2;}
18901892
{$as_echo"$as_me:${as_lineno-$LINENO}: WARNING:$2: proceeding with the compiler's result">&5
18911893
$as_echo"$as_me: WARNING:$2: proceeding with the compiler's result">&2;}
1892-
($as_echo"## ----------------------------------------- ##
1893-
## Report this topgsql-bugs@postgrespro.com ##
1894-
## ----------------------------------------- ##"
1894+
($as_echo"## ---------------------------------- ##
1895+
## Report this to bugs@postgrespro.ru ##
1896+
## ---------------------------------- ##"
18951897
)| sed"s/^/$as_me: WARNING: /">&2
18961898
;;
18971899
esac
@@ -2326,7 +2328,7 @@ cat >config.log <<_ACEOF
23262328
This file contains any messages produced by compilers while
23272329
running configure, to aid debugging if configure makes a mistake.
23282330
2329-
It was created byPostgresPro$as_me 9.5.1.3, which was
2331+
It was created byPostgreSQL$as_me 9.5.2, which was
23302332
generated by GNU Autoconf 2.69. Invocation command line was
23312333
23322334
$$0$@
@@ -2674,7 +2676,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
26742676
ac_compiler_gnu=$ac_cv_c_compiler_gnu
26752677

26762678

2677-
2679+
PACKAGE_TARNAME=postgrespro
26782680

26792681

26802682

@@ -2743,11 +2745,26 @@ fi
27432745

27442746

27452747

2748+
PGPRO_VERSION="$PACKAGE_VERSION.3"
2749+
PGPRO_PACKAGE_NAME="PostgresPro"
2750+
2751+
2752+
27462753
cat>>confdefs.h<<_ACEOF
27472754
#define PG_VERSION "$PG_VERSION"
27482755
_ACEOF
27492756

27502757

2758+
cat>>confdefs.h<<_ACEOF
2759+
#define PGPRO_PACKAGE_NAME "$PGPRO_PACKAGE_NAME"
2760+
_ACEOF
2761+
2762+
2763+
cat>>confdefs.h<<_ACEOF
2764+
#define PGPRO_VERSION "$PGPRO_VERSION"
2765+
_ACEOF
2766+
2767+
27512768
# Make sure we can run config.sub.
27522769
$SHELL"$ac_aux_dir/config.sub" sun4>/dev/null2>&1||
27532770
as_fn_error$?"cannot run$SHELL$ac_aux_dir/config.sub""$LINENO" 5
@@ -17492,10 +17509,14 @@ fi
1749217509

1749317510

1749417511
cat>>confdefs.h<<_ACEOF
17495-
#define PG_VERSION_STR "PostgresPro$PG_VERSION on$host, compiled by$cc_string,`expr$ac_cv_sizeof_void_p\* 8`-bit"
17512+
#define PG_VERSION_STR "PostgreSQL$PG_VERSION on$host, compiled by$cc_string,`expr$ac_cv_sizeof_void_p\* 8`-bit"
1749617513
_ACEOF
1749717514

1749817515

17516+
cat>>confdefs.h<<_ACEOF
17517+
#define PGPRO_VERSION_STR "PostgresPro 9.5.2.3 on$host, compiled by$cc_string,`expr$ac_cv_sizeof_void_p\* 8`-bit"
17518+
_ACEOF
17519+
1749917520
# Supply a numeric version string for use by 3rd party add-ons
1750017521
# awk -F is a regex on some platforms, and not on others, so make "." a tab
1750117522
PG_VERSION_NUM="`echo"$PACKAGE_VERSION"| sed's/[A-Za-z].*$//'|
@@ -17540,6 +17561,7 @@ fi
1754017561

1754117562

1754217563

17564+
1754317565
ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
1754417566

1754517567

@@ -18067,7 +18089,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1806718089
# report actual input values of CONFIG_FILES etc. instead of their
1806818090
# values after options handling.
1806918091
ac_log="
18070-
This file was extended byPostgresPro $as_me 9.5.1.3, which was
18092+
This file was extended byPostgreSQL $as_me 9.5.2, which was
1807118093
generated by GNU Autoconf 2.69. Invocation command line was
1807218094
1807318095
CONFIG_FILES = $CONFIG_FILES
@@ -18131,13 +18153,13 @@ $config_links
1813118153
Configuration commands:
1813218154
$config_commands
1813318155
18134-
Report bugs to<pgsql-bugs@postgrespro.com>."
18156+
Report bugs to<bugs@postgrespro.ru>."
1813518157
1813618158
_ACEOF
1813718159
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1813818160
ac_cs_config="`$as_echo"$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1813918161
ac_cs_version="\\
18140-
PostgresPro config.status 9.5.1.3
18162+
PostgreSQL config.status 9.5.2
1814118163
configured by$0, generated by GNU Autoconf 2.69,
1814218164
with options\\"\$ac_cs_config\\"
1814318165

‎configure.in

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgresPro], [9.5.1.3], [bugs@postgrespro.ru])
21-
20+
dnl AC_INIT([PostgresPro], [9.5.1.3], [bugs@postgrespro.ru])
21+
AC_INIT([PostgreSQL], [9.5.2], [bugs@postgrespro.ru],[postgrespro])
22+
PACKAGE_TARNAME=postgrespro
2223
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
2324
Untested combinations of 'autoconf' and PostgreSQL versions are not
2425
recommended. You can remove the check from 'configure.in' but it is then
@@ -37,7 +38,14 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major versio
3738
PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
3839
[PG_VERSION="$PACKAGE_VERSION$withval"],
3940
[PG_VERSION="$PACKAGE_VERSION"])
41+
42+
PGPRO_VERSION="$PACKAGE_VERSION.3"
43+
PGPRO_PACKAGE_NAME="PostgresPro"
44+
AC_SUBST(PGPRO_PACKAGE_NAME)
45+
4046
AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])
47+
AC_DEFINE_UNQUOTED(PGPRO_PACKAGE_NAME, "$PGPRO_PACKAGE_NAME", [PostgresPro name as a string])
48+
AC_DEFINE_UNQUOTED(PGPRO_VERSION, "$PGPRO_VERSION", [PostgresPro version as a string])
4149

4250
AC_CANONICAL_HOST
4351

@@ -2205,9 +2213,11 @@ else
22052213
fi
22062214

22072215
AC_DEFINE_UNQUOTED(PG_VERSION_STR,
2208-
["PostgresPro $PG_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
2216+
["PostgreSQL $PG_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
2217+
[A string containing the version number, platform, and C compiler])
2218+
AC_DEFINE_UNQUOTED(PGPRO_VERSION_STR,
2219+
["PostgresPro 9.5.2.3 on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
22092220
[A string containing the version number, platform, and C compiler])
2210-
22112221
# Supply a numeric version string for use by 3rd party add-ons
22122222
# awk -F is a regex on some platforms, and not on others, so make "." a tab
22132223
[PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' |
@@ -2242,6 +2252,7 @@ else
22422252
fi
22432253
AC_SUBST(vpath_build)
22442254

2255+
AC_SUBST(PGPRO_VERSION)
22452256

22462257
AC_CONFIG_FILES([GNUmakefile src/Makefile.global])
22472258

‎doc/src/sgml/Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,12 @@ ifeq ($(STYLE),website)
100100
JADE.html.call += -V website-stylesheet
101101
endif
102102

103+
ifeq ($(PGPRO_PACKAGE_NAME),)
104+
PRODUCT_NAME=$(PACKAGE_NAME)
105+
else
106+
PRODUCT_NAME=$(PGPRO_PACKAGE_NAME)
107+
endif
108+
103109
# The draft target creates HTML output in draft mode, without index (for faster build).
104110
draft: postgres.sgml$(ALMOSTALLSGML) stylesheet.dsl
105111
$(MKDIR_P) html
@@ -143,7 +149,7 @@ version.sgml: $(top_srcdir)/configure
143149
{ \
144150
echo"<!ENTITY version\"$(VERSION)\">";\
145151
echo"<!ENTITY majorversion\"$(MAJORVERSION)\">";\
146-
echo"<!ENTITY productname\"$(PACKAGE_NAME)\">";\
152+
echo"<!ENTITY productname\"$(PRODUCT_NAME)\">";\
147153
}>$@
148154

149155
features-supported.sgml:$(top_srcdir)/src/backend/catalog/sql_feature_packages.txt$(top_srcdir)/src/backend/catalog/sql_features.txt

‎src/Makefile.global.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ all:
3737

3838
# PostgreSQL version number
3939
VERSION = @PACKAGE_VERSION@
40+
PGPRO_VERSION = @PGPRO_VERSION@
41+
PGPRO_PACKAGE_NAME = @PGPRO_PACKAGE_NAME@
4042
MAJORVERSION = @PG_MAJORVERSION@
4143
VERSION_NUM = @PG_VERSION_NUM@
4244
PACKAGE_NAME = @PACKAGE_NAME@

‎src/backend/utils/adt/version.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,9 @@ pgsql_version(PG_FUNCTION_ARGS)
2222
{
2323
PG_RETURN_TEXT_P(cstring_to_text(PG_VERSION_STR));
2424
}
25+
26+
Datum
27+
pgpro_version(PG_FUNCTION_ARGS)
28+
{
29+
PG_RETURN_TEXT_P(cstring_to_text(PGPRO_VERSION_STR));
30+
}

‎src/include/catalog/pg_proc.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5335,6 +5335,11 @@ DESCR("get an individual replication origin's replication progress");
53355335
DATA(insert OID = 6014 ( pg_show_replication_origin_status PGNSP PGUID 12 1 100 0 0 f f f f f t v 0 0 2249 "" "{26,25,3220,3220}" "{o,o,o,o}" "{local_id, external_id, remote_lsn, local_lsn}" _null_ _null_ pg_show_replication_origin_status _null_ _null_ _null_ ));
53365336
DESCR("get progress for all replication origins");
53375337

5338+
/* pgpro version */
5339+
DATA(insert OID = 6015 ( pgpro_version PGNSP PGUID 12 1 0 0 0 f f f f t f s 0 0 25 "" _null_ _null_ _null_ _null_ _null_ pgpro_version _null_ _null_ _null_ ));
5340+
DESCR("PostgresPro version string");
5341+
5342+
53385343
/* rls */
53395344
DATA(insert OID = 3298 ( row_security_active PGNSP PGUID 12 1 0 0 0 f f f f t f s 1 0 16 "26" _null_ _null_ _null_ _null_ _null_row_security_active _null_ _null_ _null_ ));
53405345
DESCR("row security for current context active on table by table oid");

‎src/include/pg_config.h.in

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,6 @@
288288
/* Define to 1 if you have the `crypto' library (-lcrypto). */
289289
#undef HAVE_LIBCRYPTO
290290

291-
/* Define to 1 if you have the `icui18n' library (-licui18n). */
292-
#undef HAVE_LIBICUI18N
293-
294291
/* Define to 1 if you have the `icuuc' library (-licuuc). */
295292
#undef HAVE_LIBICUUC
296293

@@ -726,6 +723,15 @@
726723
/* Define to the version of this package. */
727724
#undef PACKAGE_VERSION
728725

726+
/* PostgresPro name as a string */
727+
#undef PGPRO_PACKAGE_NAME
728+
729+
/* PostgresPro version as a string */
730+
#undef PGPRO_VERSION
731+
732+
/* A string containing the version number, platform, and C compiler */
733+
#undef PGPRO_VERSION_STR
734+
729735
/* Define to the name of a signed 128-bit integer type. */
730736
#undef PG_INT128_TYPE
731737

@@ -799,9 +805,6 @@
799805
/* Define to 1 to build with Bonjour support. (--with-bonjour) */
800806
#undef USE_BONJOUR
801807

802-
/* Define to build with ICU support. (--with-icu) */
803-
#undef USE_ICU
804-
805808
/* Define to 1 if you want float4 values to be passed by value.
806809
(--enable-float4-byval) */
807810
#undef USE_FLOAT4_BYVAL
@@ -810,6 +813,9 @@
810813
(--enable-float8-byval) */
811814
#undef USE_FLOAT8_BYVAL
812815

816+
/* Define to build with ICU support. (--with-icu) */
817+
#undef USE_ICU
818+
813819
/* Define to 1 if you want 64-bit integer timestamp and interval support.
814820
(--enable-integer-datetimes) */
815821
#undef USE_INTEGER_DATETIMES

‎src/include/pg_config.h.win32

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -560,13 +560,13 @@
560560
#define PACKAGE_BUGREPORT "bugs@postgrespro.ru"
561561

562562
/* Define to the full name of this package. */
563-
#define PACKAGE_NAME "PostgresPro"
563+
#define PACKAGE_NAME "PostgreSQL"
564564

565565
/* Define to the full name and version of this package. */
566-
#define PACKAGE_STRING "PostgresPro 9.5.1.3"
566+
#define PACKAGE_STRING "PostgreSQL 9.5.2"
567567

568568
/* Define to the version of this package. */
569-
#define PACKAGE_VERSION "9.5.1.3"
569+
#define PACKAGE_VERSION "9.5.2"
570570

571571
/* Define to the name of a signed 128-bit integer type. */
572572
#undef PG_INT128_TYPE
@@ -575,10 +575,16 @@
575575
#define PG_INT64_TYPE long long int
576576

577577
/* PostgreSQL version as a string */
578-
#define PG_VERSION "9.5.1.3"
578+
#define PG_VERSION "9.5.2"
579579

580580
/* PostgreSQL version as a number */
581-
#define PG_VERSION_NUM 90501
581+
#define PG_VERSION_NUM 90502
582+
583+
#define PGPRO_PACKAGE_NAME "PostgresPro"
584+
585+
#define PGPRO_PACKAGE_VERSION "9.5.2.3"
586+
587+
#define PGPRO_PACKAGE_STR "PostgresPro 9.5.2.3"
582588

583589
/* Define to the one symbol short name of this package. */
584590
#define PACKAGE_TARNAME "postgrespro"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp