organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-09 15:27:38 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-12738 Updated ICU4C version to 58.1. Also updated uvernum.h to use the Unicode copyright string, which will be embedded in ICU binary data files.

Browse source 
X-SVN-Rev: 39234
This commit is contained in:
Yoshito Umaoka 2016-09-15 03:02:38 +00:00
parent 3af8fe0e81
commit 416a42bdfc
4 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
icu4c/source/common/unicode/uvernum.h
View file

@ -34,13 +34,12 @@
* by running the UNIX makefile target 'update-windows-makefiles' in icu/source.
*
*
* source/common/common.vcproj - update 'Output file name' on the link tab so
* source/common/common.vcxproj - update 'Output file name' on the link tab so
* that it contains the new major/minor combination
* source/i18n/i18n.vcproj - same as for the common.vcproj
* source/layout/layout.vcproj - same as for the common.vcproj
* source/i18n/i18n.vcxproj - same as for the common.vcxproj
* source/layoutex/layoutex.vcproj - same
* source/stubdata/stubdata.vcproj - same as for the common.vcproj
* source/io/io.vcproj - same as for the common.vcproj
* source/stubdata/stubdata.vcproj - same as for the common.vcxproj
* source/io/io.vcproj - same as for the common.vcxproj
* source/data/makedata.mak - change U_ICUDATA_NAME so that it contains
* the new major/minor combination and the Unicode version.
*/
@ -53,7 +52,7 @@
* @stable ICU 2.4
*/
#define U_COPYRIGHT_STRING \
" Copyright (C) 2016, International Business Machines Corporation and others. All Rights Reserved. "
" Copyright (C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html "
/** The current ICU major version as an integer.
* This value will change in the subsequent releases of ICU
@ -65,13 +64,13 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_MINOR_NUM 0
#define U_ICU_VERSION_MINOR_NUM 1
/** The current ICU patchlevel version as an integer.
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION_PATCHLEVEL_NUM 1
#define U_ICU_VERSION_PATCHLEVEL_NUM 0
/** The current ICU build level version as an integer.
* This value is for use by ICU clients. It defaults to 0.
@ -120,7 +119,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION "58.0.1"
#define U_ICU_VERSION "58.1"
/** The current ICU library major/minor version as a string without dots, for library name suffixes.
* This value will change in the subsequent releases of ICU
@ -132,7 +131,7 @@
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
#define U_ICU_DATA_VERSION "58.0.1"
#define U_ICU_DATA_VERSION "58.1"
#endif /* U_HIDE_INTERNAL_API */
/*===========================================================================

34
icu4c/source/configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for ICU 58.0.1.
# Generated by GNU Autoconf 2.69 for ICU 58.1.
#
# Report bugs to <http://icu-project.org/bugs>.
#
@ -582,8 +582,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ICU'
PACKAGE_TARNAME='International Components for Unicode'
PACKAGE_VERSION='58.0.1'
PACKAGE_STRING='ICU 58.0.1'
PACKAGE_VERSION='58.1'
PACKAGE_STRING='ICU 58.1'
PACKAGE_BUGREPORT='http://icu-project.org/bugs'
PACKAGE_URL='http://icu-project.org'
@ -752,6 +752,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
@ -855,6 +856,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@ -1107,6 +1109,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1244,7 +1255,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@ -1357,7 +1368,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures ICU 58.0.1 to adapt to many kinds of systems.
\`configure' configures ICU 58.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1397,6 +1408,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@ -1423,7 +1435,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of ICU 58.0.1:";;
short | recursive ) echo "Configuration of ICU 58.1:";;
esac
cat <<\_ACEOF
@ -1559,7 +1571,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ICU configure 58.0.1
ICU configure 58.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2251,7 +2263,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by ICU $as_me 58.0.1, which was
It was created by ICU $as_me 58.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -7552,7 +7564,7 @@ else
U_HAVE_LAYOUTEX=0
fi
# Enable/disable layoutex
# Enable/disable layout
# Check whether --enable-layout was given.
if test "${enable_layout+set}" = set; then :
enableval=$enable_layout; case "${enableval}" in
@ -8348,7 +8360,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by ICU $as_me 58.0.1, which was
This file was extended by ICU $as_me 58.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -8402,7 +8414,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ICU config.status 58.0.1
ICU config.status 58.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

4
icu4c/source/data/misc/icuver.txt
View file

@ -8,6 +8,6 @@
// ***************************************************************************
icuver:table(nofallback){
DataVersion { "58.0.1.0" }
ICUVersion { "58.0.1.0" }
DataVersion { "58.1.0.0" }
ICUVersion { "58.1.0.0" }
}

6
icu4c/source/tools/gentest/gentest.c
View file

@ -30,7 +30,6 @@
#include "cstring.h"
#include "uoptions.h"
#include "gentest.h"
#include "toolutil.h"
#define DATA_NAME "test"
#define DATA_TYPE "icu"
@ -145,7 +144,6 @@ outputJavaStuff(const char* progname, const char *outputDir) {
int32_t i,t,count;
char file[512];
FILE *out;
int32_t year = getCurrentYear();
uprv_strcpy(file,outputDir);
if(*outputDir && /* don't put a trailing slash if outputDir is empty */
@ -162,7 +160,9 @@ outputJavaStuff(const char* progname, const char *outputDir) {
return 1;
}
fprintf(out, "/** Copyright (C) 2007-%d, International Business Machines Corporation and Others. All Rights Reserved. **/\n\n", year);
fprintf(out, "// Copyright (C) 2016 and later: Unicode, Inc. and others.\n");
fprintf(out, "// License & terms of use: http://www.unicode.org/copyright.html\n\n");
fprintf(out, "/** Copyright (C) 2007-2016, International Business Machines Corporation and Others. All Rights Reserved. **/\n\n");
fprintf(out, "/* NOTE: this file is AUTOMATICALLY GENERATED by gentest.\n"
" * See: {ICU4C}/source/data/icu4j-readme.txt for more information. \n"
" **/\n\n");