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

Commitbf367a0

Browse files
committed
Merge branch 'PGPROEE9_6' into PGPRO-177_cfs_backup
2 parents4befab3 +d424023 commitbf367a0

File tree

140 files changed

+7041
-1385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+7041
-1385
lines changed

‎.ci/make_test_base‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ On success, starts database
99
"""
1010
importos,sys,subprocess,glob,re,os.path,time
1111

12-
datadir=sys.argv[1]
13-
14-
ifnotdatadir:
15-
print>>sys.stderr,"Usage %s directory"%sys.argv[0]
12+
iflen(sys.argv)!=2:
13+
print>>sys.stderr,"Usage %s data-directory"%sys.argv[0]
1614
sys.exit(1)
1715

16+
datadir=sys.argv[1]
17+
1818
ifos.access(datadir,os.R_OK):
1919
importshutil
2020
shutil.rmtree(datadir)

‎.ci/run_install_check‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
# Makes temporary installation and runs installcheck-world on it
33
# Should be run as non-privileged user.
44
# Exit on all errors
5+
# If run without arguments, makes installcheck-world
6+
# Otherwise first argument is interpreted as subdirectory
7+
# to change before runnning make installchedk
8+
# i.e
9+
# run_install_check .
10+
# test core only
11+
# run_install_check contrib
12+
# tests contrib only
13+
# etc.
14+
# All other arguments are passed to Makefile intact
15+
# To make possible pass arguments to installcheck-world
16+
# run_install_check world
17+
# does the same as no args
518
set -e
619
# Install
720
make install prefix=`pwd`/tmp_install
@@ -19,7 +32,13 @@ export PGPORT
1932
./.ci/make_test_base$PGDATA
2033
#run checks
2134
set +e
35+
if [-z"$1"-o"$1"="world" ];then
2236
make installcheck-world prefix=`pwd`/tmp_install NO_LOCALE=1
37+
else
38+
dir=$1
39+
shift
40+
make -C"$dir" installcheck prefix=`pwd`/tmp_install NO_LOCALE=1${@:+"$@"}
41+
fi
2342
code=$?
2443
pg_ctl stop -D$PGDATA
2544
exit$code

‎COPYRIGHT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PostgreSQL Database Management System
22
(formerly known as Postgres, then as Postgres95)
33

4-
Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
4+
Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
55

66
Portions Copyright (c) 1994, The Regents of the University of California
77

‎configure‎

Lines changed: 108 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2754,7 +2754,7 @@ else
27542754
fi
27552755

27562756

2757-
PGPRO_VERSION="$PACKAGE_VERSION.2"
2757+
PGPRO_VERSION="$PACKAGE_VERSION.3"
27582758
PGPRO_PACKAGE_NAME="PostgresPro"
27592759
PGPRO_EDITION="enterprise"
27602760

@@ -9898,6 +9898,62 @@ done
98989898
fi
98999899

99009900
if test "$with_icu" = yes ; then
9901+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_58" >&5
9902+
$as_echo_n "checking for library containing ucol_open_58... " >&6; }
9903+
if ${ac_cv_search_ucol_open_58+:} false; then :
9904+
$as_echo_n "(cached) " >&6
9905+
else
9906+
ac_func_search_save_LIBS=$LIBS
9907+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9908+
/* end confdefs.h. */
9909+
9910+
/* Override any GCC internal prototype to avoid an error.
9911+
Use char because int might match the return type of a GCC
9912+
builtin and then its argument prototype would still apply. */
9913+
#ifdef __cplusplus
9914+
extern "C"
9915+
#endif
9916+
char ucol_open_58 ();
9917+
int
9918+
main ()
9919+
{
9920+
return ucol_open_58 ();
9921+
;
9922+
return 0;
9923+
}
9924+
_ACEOF
9925+
for ac_lib in '' icui18n icuin; do
9926+
if test -z "$ac_lib"; then
9927+
ac_res="none required"
9928+
else
9929+
ac_res=-l$ac_lib
9930+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
9931+
fi
9932+
if ac_fn_c_try_link "$LINENO"; then :
9933+
ac_cv_search_ucol_open_58=$ac_res
9934+
fi
9935+
rm -f core conftest.err conftest.$ac_objext \
9936+
conftest$ac_exeext
9937+
if ${ac_cv_search_ucol_open_58+:} false; then :
9938+
break
9939+
fi
9940+
done
9941+
if ${ac_cv_search_ucol_open_58+:} false; then :
9942+
9943+
else
9944+
ac_cv_search_ucol_open_58=no
9945+
fi
9946+
rm conftest.$ac_ext
9947+
LIBS=$ac_func_search_save_LIBS
9948+
fi
9949+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_58" >&5
9950+
$as_echo "$ac_cv_search_ucol_open_58" >&6; }
9951+
ac_res=$ac_cv_search_ucol_open_58
9952+
if test "$ac_res" != no; then :
9953+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
9954+
9955+
else
9956+
99019957
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_57" >&5
99029958
$as_echo_n "checking for library containing ucol_open_57... " >&6; }
99039959
if ${ac_cv_search_ucol_open_57+:} false; then :
@@ -10900,6 +10956,54 @@ fi
1090010956

1090110957
fi
1090210958

10959+
10960+
fi
10961+
10962+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_58 in -licuuc" >&5
10963+
$as_echo_n "checking for ucnv_fromUChars_58 in -licuuc... " >&6; }
10964+
if ${ac_cv_lib_icuuc_ucnv_fromUChars_58+:} false; then :
10965+
$as_echo_n "(cached) " >&6
10966+
else
10967+
ac_check_lib_save_LIBS=$LIBS
10968+
LIBS="-licuuc $LIBS"
10969+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10970+
/* end confdefs.h. */
10971+
10972+
/* Override any GCC internal prototype to avoid an error.
10973+
Use char because int might match the return type of a GCC
10974+
builtin and then its argument prototype would still apply. */
10975+
#ifdef __cplusplus
10976+
extern "C"
10977+
#endif
10978+
char ucnv_fromUChars_58 ();
10979+
int
10980+
main ()
10981+
{
10982+
return ucnv_fromUChars_58 ();
10983+
;
10984+
return 0;
10985+
}
10986+
_ACEOF
10987+
if ac_fn_c_try_link "$LINENO"; then :
10988+
ac_cv_lib_icuuc_ucnv_fromUChars_58=yes
10989+
else
10990+
ac_cv_lib_icuuc_ucnv_fromUChars_58=no
10991+
fi
10992+
rm -f core conftest.err conftest.$ac_objext \
10993+
conftest$ac_exeext conftest.$ac_ext
10994+
LIBS=$ac_check_lib_save_LIBS
10995+
fi
10996+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_58" >&5
10997+
$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_58" >&6; }
10998+
if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_58" = xyes; then :
10999+
cat >>confdefs.h <<_ACEOF
11000+
#define HAVE_LIBICUUC 1
11001+
_ACEOF
11002+
11003+
LIBS="-licuuc $LIBS"
11004+
11005+
else
11006+
1090311007
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_57 in -licuuc" >&5
1090411008
$as_echo_n "checking for ucnv_fromUChars_57 in -licuuc... " >&6; }
1090511009
if ${ac_cv_lib_icuuc_ucnv_fromUChars_57+:} false; then :
@@ -11713,6 +11817,9 @@ fi
1171311817
fi
1171411818

1171511819

11820+
fi
11821+
11822+
1171611823
fi
1171711824

1171811825
fi

‎configure.in‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major versio
3838
PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
3939
[PG_VERSION="$PACKAGE_VERSION$withval"],
4040
[PG_VERSION="$PACKAGE_VERSION"])
41-
PGPRO_VERSION="$PACKAGE_VERSION.2"
41+
PGPRO_VERSION="$PACKAGE_VERSION.3"
4242
PGPRO_PACKAGE_NAME="PostgresPro"
4343
PGPRO_EDITION="enterprise"
4444
AC_SUBST(PGPRO_PACKAGE_NAME)
@@ -1162,6 +1162,7 @@ if test "$with_openssl" = yes ; then
11621162
fi
11631163

11641164
if test "$with_icu" = yes ; then
1165+
AC_SEARCH_LIBS(ucol_open_58, [icui18n icuin], [], [
11651166
AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
11661167
AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
11671168
AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
@@ -1195,6 +1196,8 @@ if test "$with_icu" = yes ; then
11951196
])
11961197
])
11971198
])
1199+
])
1200+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_58, [], [
11981201
AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
11991202
AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
12001203
AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [
@@ -1228,6 +1231,7 @@ if test "$with_icu" = yes ; then
12281231
])
12291232
])
12301233
])
1234+
])
12311235
fi
12321236

12331237
if test "$with_pam" = yes ; then

0 commit comments

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