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

Commit218b4e8

Browse files
committed
Append major version number and for libraries soname major version number
to the gettext domain name, to simplify parallel installations.Also, rename set_text_domain() to pg_bindtextdomain(), because that is whatit does.
1 parent5536822 commit218b4e8

File tree

39 files changed

+125
-78
lines changed

39 files changed

+125
-78
lines changed

‎configure‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,7 @@ build_alias
656656
host_alias
657657
target_alias
658658
configure_args
659+
PG_MAJORVERSION
659660
build
660661
build_cpu
661662
build_vendor
@@ -1910,6 +1911,13 @@ cat >>confdefs.h <<_ACEOF
19101911
#define PG_VERSION "$PACKAGE_VERSION"
19111912
_ACEOF
19121913

1914+
PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\.[0-9][0-9]*\)'`
1915+
1916+
1917+
cat >>confdefs.h <<_ACEOF
1918+
#define PG_MAJORVERSION "$PG_MAJORVERSION"
1919+
_ACEOF
1920+
19131921

19141922
# Make sure we can run config.sub.
19151923
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -27183,6 +27191,7 @@ build_alias!$build_alias$ac_delim
2718327191
host_alias!$host_alias$ac_delim
2718427192
target_alias!$target_alias$ac_delim
2718527193
configure_args!$configure_args$ac_delim
27194+
PG_MAJORVERSION!$PG_MAJORVERSION$ac_delim
2718627195
build!$build$ac_delim
2718727196
build_cpu!$build_cpu$ac_delim
2718827197
build_vendor!$build_vendor$ac_delim
@@ -27241,7 +27250,6 @@ EGREP!$EGREP$ac_delim
2724127250
ELF_SYS!$ELF_SYS$ac_delim
2724227251
LDFLAGS_SL!$LDFLAGS_SL$ac_delim
2724327252
LD!$LD$ac_delim
27244-
with_gnu_ld!$with_gnu_ld$ac_delim
2724527253
_ACEOF
2724627254

2724727255
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -27283,6 +27291,7 @@ _ACEOF
2728327291
ac_delim='%!_!# '
2728427292
for ac_last_try in false false false false false :; do
2728527293
cat >conf$$subs.sed <<_ACEOF
27294+
with_gnu_ld!$with_gnu_ld$ac_delim
2728627295
ld_R_works!$ld_R_works$ac_delim
2728727296
RANLIB!$RANLIB$ac_delim
2728827297
STRIP!$STRIP$ac_delim
@@ -27343,7 +27352,7 @@ vpath_build!$vpath_build$ac_delim
2734327352
LTLIBOBJS!$LTLIBOBJS$ac_delim
2734427353
_ACEOF
2734527354

27346-
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` =58; then
27355+
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` =59; then
2734727356
break
2734827357
elif $ac_last_try; then
2734927358
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

‎configure.in‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.576 2008/12/07 08:36:21 petere Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.577 2008/12/11 07:34:07 petere Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -30,6 +30,9 @@ AC_PREFIX_DEFAULT(/usr/local/pgsql)
3030
AC_SUBST(configure_args, [$ac_configure_args])
3131

3232
AC_DEFINE_UNQUOTED(PG_VERSION, "$PACKAGE_VERSION", [PostgreSQL version as a string])
33+
[PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\.[0-9][0-9]*\)'`]
34+
AC_SUBST(PG_MAJORVERSION)
35+
AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major version as a string])
3336

3437
AC_CANONICAL_HOST
3538

‎doc/src/sgml/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# PostgreSQL documentation makefile
44
#
5-
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.113 2008/11/26 11:26:54 petere Exp $
5+
# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.114 2008/12/11 07:34:07 petere Exp $
66
#
77
#----------------------------------------------------------------------------
88

@@ -126,7 +126,7 @@ HTML.index:
126126
version.sgml:$(top_builddir)/src/Makefile.global
127127
{ \
128128
echo"<!entity version\"$(VERSION)\">";\
129-
echo"<!entity majorversion\"`expr$(VERSION):'\([0-9][0-9]*\.[0-9][0-9]*\)'`\">";\
129+
echo"<!entity majorversion\"$(MAJORVERSION)\">";\
130130
}>$@
131131

132132
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.248 2008/12/07 08:36:22 petere Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.249 2008/12/11 07:34:07 petere Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -30,6 +30,7 @@ all:
3030

3131
# PostgreSQL version number
3232
VERSION = @PACKAGE_VERSION@
33+
MAJORVERSION = @PG_MAJORVERSION@
3334

3435
# Support for VPATH builds
3536
vpath_build = @vpath_build@

‎src/Makefile.shlib‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.118 2008/11/24 11:59:37 petere Exp $
9+
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.119 2008/12/11 07:34:07 petere Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -115,6 +115,10 @@ endif
115115
# Try to keep the sections in some kind of order, folks...
116116

117117
override CFLAGS += $(CFLAGS_SL)
118+
ifdef SO_MAJOR_VERSION
119+
# libraries ought to use this to refer to versioned gettext domain names
120+
override CPPFLAGS += -DSO_MAJOR_VERSION=$(SO_MAJOR_VERSION)
121+
endif
118122

119123
ifeq ($(PORTNAME), aix)
120124
ifdef SO_MAJOR_VERSION

‎src/backend/main/main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
*
1515
* IDENTIFICATION
16-
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.110 2008/01/01 19:45:49 momjian Exp $
16+
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.111 2008/12/11 07:34:07 petere Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -87,7 +87,7 @@ main(int argc, char *argv[])
8787
* error messages to be localized.
8888
*/
8989

90-
set_pglocale_pgservice(argv[0],"postgres");
90+
set_pglocale_pgservice(argv[0],PG_TEXTDOMAIN("postgres"));
9191

9292
#ifdefWIN32
9393

‎src/backend/utils/init/miscinit.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.168 2008/10/09 17:24:05 alvherre Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.169 2008/12/11 07:34:07 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1214,7 +1214,7 @@ process_local_preload_libraries(void)
12141214
}
12151215

12161216
void
1217-
set_text_domain(constchar*domain)
1217+
pg_bindtextdomain(constchar*domain)
12181218
{
12191219
#ifdefENABLE_NLS
12201220
if (my_exec_path[0]!='\0')

‎src/bin/initdb/initdb.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* Portions Copyright (c) 1994, Regents of the University of California
4343
* Portions taken from FreeBSD.
4444
*
45-
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.164 2008/11/14 02:09:51 tgl Exp $
45+
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.165 2008/12/11 07:34:07 petere Exp $
4646
*
4747
*-------------------------------------------------------------------------
4848
*/
@@ -2511,7 +2511,7 @@ main(int argc, char *argv[])
25112511
};
25122512

25132513
progname=get_progname(argv[0]);
2514-
set_pglocale_pgservice(argv[0],"initdb");
2514+
set_pglocale_pgservice(argv[0],PG_TEXTDOMAIN("initdb"));
25152515

25162516
if (argc>1)
25172517
{

‎src/bin/pg_config/pg_config.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
1919
*
20-
* $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.28 2008/03/27 03:57:33 tgl Exp $
20+
* $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.29 2008/12/11 07:34:07 petere Exp $
2121
*
2222
*-------------------------------------------------------------------------
2323
*/
@@ -465,7 +465,7 @@ main(int argc, char **argv)
465465
intj;
466466
intret;
467467

468-
set_pglocale_pgservice(argv[0],"pg_config");
468+
set_pglocale_pgservice(argv[0],PG_TEXTDOMAIN("pg_config"));
469469

470470
progname=get_progname(argv[0]);
471471

‎src/bin/pg_controldata/pg_controldata.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;
77
* licence: BSD
88
*
9-
* $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.41 2008/09/24 08:59:42 mha Exp $
9+
* $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.42 2008/12/11 07:34:08 petere Exp $
1010
*/
1111
#include"postgres_fe.h"
1212

@@ -76,7 +76,7 @@ main(int argc, char *argv[])
7676
constchar*strftime_fmt="%c";
7777
constchar*progname;
7878

79-
set_pglocale_pgservice(argv[0],"pg_controldata");
79+
set_pglocale_pgservice(argv[0],PG_TEXTDOMAIN("pg_controldata"));
8080

8181
progname=get_progname(argv[0]);
8282

0 commit comments

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