From e98aab020c9c1ba614e3dc34c2095eb51cdc38cf Mon Sep 17 00:00:00 2001 From: Jeff Genovy <29107334+jefgen@users.noreply.github.com> Date: Sat, 17 Feb 2018 01:09:03 +0000 Subject: [PATCH] ICU-13581 Update ICU4C version number for 61.1 rc. X-SVN-Rev: 40945 --- icu4c/readme.html | 10 +++++----- icu4c/source/common/common.vcxproj | 8 ++++---- icu4c/source/common/common_uwp.vcxproj | 12 ++++++------ icu4c/source/common/unicode/uvernum.h | 10 +++++----- icu4c/source/configure | 16 ++++++++-------- icu4c/source/data/makedata.mak | 6 +++--- icu4c/source/data/misc/icuver.txt | 4 ++-- icu4c/source/i18n/i18n.vcxproj | 8 ++++---- icu4c/source/i18n/i18n_uwp.vcxproj | 12 ++++++------ icu4c/source/io/io.vcxproj | 8 ++++---- icu4c/source/layoutex/layoutex.vcxproj | 8 ++++---- icu4c/source/stubdata/stubdata.vcxproj | 8 ++++---- icu4c/source/tools/ctestfw/ctestfw.vcxproj | 8 ++++---- icu4c/source/tools/toolutil/toolutil.vcxproj | 8 ++++---- 14 files changed, 63 insertions(+), 63 deletions(-) diff --git a/icu4c/readme.html b/icu4c/readme.html index 66f4dd55ac6..c42a08e73ed 100644 --- a/icu4c/readme.html +++ b/icu4c/readme.html @@ -3,7 +3,7 @@ - ReadMe for ICU 60.1 + ReadMe for ICU 61.1 - +

Note: This is a draft readme.

@@ -32,7 +32,7 @@ International Components for Unicode
Release Candidate (Milestone Release) - ICU 60.1 ReadMe + ICU 61.1 ReadMe

@@ -44,7 +44,7 @@

This is a release candidate version of ICU4C. It is not recommended for production use.

-

Last updated: 2017-Oct-29
+

Last updated: 2018-Feb-16
Copyright © 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html
Copyright © 1997-2016 International Business Machines Corporation and others. @@ -233,7 +233,7 @@

What Is New In This Release?

-

See the ICU 60 download page +

See the ICU 61 download page for an overview of this release, important changes, new features, bug fixes, known issues, changes to supported platforms and build environments, and migration issues for existing applications migrating from previous ICU releases.

diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj index aa589d65425..70124cd22f9 100644 --- a/icu4c/source/common/common.vcxproj +++ b/icu4c/source/common/common.vcxproj @@ -111,7 +111,7 @@ 0x0409 - ..\..\bin\icuuc60.dll + ..\..\bin\icuuc61.dll true .\..\..\lib\icuuc.pdb true @@ -154,7 +154,7 @@ 0x0409 - ..\..\bin\icuuc60d.dll + ..\..\bin\icuuc61d.dll true true .\..\..\lib\icuucd.pdb @@ -194,7 +194,7 @@ 0x0409 - ..\..\bin64\icuuc60.dll + ..\..\bin64\icuuc61.dll true .\..\..\lib64\icuuc.pdb true @@ -235,7 +235,7 @@ 0x0409 - ..\..\bin64\icuuc60d.dll + ..\..\bin64\icuuc61d.dll true true .\..\..\lib64\icuucd.pdb diff --git a/icu4c/source/common/common_uwp.vcxproj b/icu4c/source/common/common_uwp.vcxproj index ae0b90b2f5f..eaa8b01737e 100644 --- a/icu4c/source/common/common_uwp.vcxproj +++ b/icu4c/source/common/common_uwp.vcxproj @@ -192,7 +192,7 @@ .\x86\ReleaseUWP/ - ..\..\bin32uwp\icuuc60.dll + ..\..\bin32uwp\icuuc61.dll .\..\..\lib32uwp\icuuc.pdb ..\..\lib32uwp\icuuc.lib @@ -208,7 +208,7 @@ .\x86\DebugUWP/ - ..\..\bin32uwp\icuuc60d.dll + ..\..\bin32uwp\icuuc61d.dll .\..\..\lib32uwp\icuucd.pdb ..\..\lib32uwp\icuucd.lib @@ -224,7 +224,7 @@ .\x64\ReleaseUWP/ - ..\..\bin64uwp\icuuc60.dll + ..\..\bin64uwp\icuuc61.dll .\..\..\lib64uwp\icuuc.pdb ..\..\lib64uwp\icuuc.lib @@ -240,7 +240,7 @@ .\x64\DebugUWP/ - ..\..\bin64uwp\icuuc60d.dll + ..\..\bin64uwp\icuuc61d.dll .\..\..\lib64uwp\icuucd.pdb ..\..\lib64uwp\icuucd.lib @@ -256,7 +256,7 @@ .\ARM\ReleaseUWP/ - ..\..\binARMuwp\icuuc60.dll + ..\..\binARMuwp\icuuc61.dll .\..\..\libARMuwp\icuuc.pdb ..\..\libARMuwp\icuuc.lib @@ -272,7 +272,7 @@ .\ARM\DebugUWP/ - ..\..\binARMuwp\icuuc60d.dll + ..\..\binARMuwp\icuuc61d.dll .\..\..\libARMuwp\icuucd.pdb ..\..\libARMuwp\icuucd.lib diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index db558962e09..0427bcb03db 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -58,7 +58,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION_MAJOR_NUM 60 +#define U_ICU_VERSION_MAJOR_NUM 61 /** The current ICU minor version as an integer. * This value will change in the subsequent releases of ICU @@ -84,7 +84,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_SUFFIX _60 +#define U_ICU_VERSION_SUFFIX _61 /** * \def U_DEF2_ICU_ENTRY_POINT_RENAME @@ -119,7 +119,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "60.1" +#define U_ICU_VERSION "61.1" /** * The current ICU library major version number as a string, for library name suffixes. @@ -132,13 +132,13 @@ * * @stable ICU 2.6 */ -#define U_ICU_VERSION_SHORT "60" +#define U_ICU_VERSION_SHORT "61" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "60.1" +#define U_ICU_DATA_VERSION "61.1" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/configure b/icu4c/source/configure index 36c06f9ef52..d3190426fe4 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ICU 60.1. +# Generated by GNU Autoconf 2.69 for ICU 61.1. # # Report bugs to . # @@ -582,8 +582,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ICU' PACKAGE_TARNAME='International Components for Unicode' -PACKAGE_VERSION='60.1' -PACKAGE_STRING='ICU 60.1' +PACKAGE_VERSION='61.1' +PACKAGE_STRING='ICU 61.1' PACKAGE_BUGREPORT='http://icu-project.org/bugs' PACKAGE_URL='http://icu-project.org' @@ -1368,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 60.1 to adapt to many kinds of systems. +\`configure' configures ICU 61.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1435,7 +1435,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ICU 60.1:";; + short | recursive ) echo "Configuration of ICU 61.1:";; esac cat <<\_ACEOF @@ -1571,7 +1571,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ICU configure 60.1 +ICU configure 61.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2263,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 60.1, which was +It was created by ICU $as_me 61.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8409,7 +8409,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 60.1, which was +This file was extended by ICU $as_me 61.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index 6e3bde5ce8d..1b6f7ea6035 100644 --- a/icu4c/source/data/makedata.mak +++ b/icu4c/source/data/makedata.mak @@ -12,11 +12,11 @@ ############################################################################## # Keep the following in sync with the version - see common/unicode/uvernum.h -U_ICUDATA_NAME=icudt60 +U_ICUDATA_NAME=icudt61 ############################################################################## !IF "$(UWP)" == "UWP" # Optionally change the name of the data file for the UWP version. -U_ICUDATA_NAME=icudt60 +U_ICUDATA_NAME=icudt61 !ENDIF U_ICUDATA_ENDIAN_SUFFIX=l UNICODE_VERSION=10.0 @@ -38,7 +38,7 @@ ICU_LIB_TARGET=$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll ICUOUT=$(ICUMAKE)\out -# the prefix "icudt21_" for use in filenames +# the prefix "icudt61_" for use in filenames ICUPKG=$(U_ICUDATA_NAME)$(U_ICUDATA_ENDIAN_SUFFIX) # need to nuke \\ for .NET... diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index 1938d4f3063..dcc4bfbb137 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -8,6 +8,6 @@ // *************************************************************************** icuver:table(nofallback){ - DataVersion { "59.1.0.0" } - ICUVersion { "59.1.0.0" } + DataVersion { "61.1.0.0" } + ICUVersion { "61.1.0.0" } } diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj index 9e310018c8e..837f8c74122 100644 --- a/icu4c/source/i18n/i18n.vcxproj +++ b/icu4c/source/i18n/i18n.vcxproj @@ -114,7 +114,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin\icuin60.dll + ..\..\bin\icuin61.dll true .\..\..\lib\icuin.pdb true @@ -160,7 +160,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin\icuin60d.dll + ..\..\bin\icuin61d.dll true true .\..\..\lib\icuind.pdb @@ -203,7 +203,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuin60.dll + ..\..\bin64\icuin61.dll true .\..\..\lib64\icuin.pdb true @@ -247,7 +247,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuin60d.dll + ..\..\bin64\icuin61d.dll true true .\..\..\lib64\icuind.pdb diff --git a/icu4c/source/i18n/i18n_uwp.vcxproj b/icu4c/source/i18n/i18n_uwp.vcxproj index c0f301a928b..1dbd4d0ce84 100644 --- a/icu4c/source/i18n/i18n_uwp.vcxproj +++ b/icu4c/source/i18n/i18n_uwp.vcxproj @@ -182,7 +182,7 @@ .\x86\ReleaseUWP/ - ..\..\bin32uwp\icuin60.dll + ..\..\bin32uwp\icuin61.dll .\..\..\lib32uwp\icuin.pdb ..\..\lib32uwp\icuin.lib ..\..\lib32uwp\icuuc.lib;%(AdditionalDependencies) @@ -199,7 +199,7 @@ .\x86\DebugUWP/ - ..\..\bin32uwp\icuin60d.dll + ..\..\bin32uwp\icuin61d.dll .\..\..\lib32uwp\icuind.pdb ..\..\lib32uwp\icuind.lib ..\..\lib32uwp\icuucd.lib;%(AdditionalDependencies) @@ -216,7 +216,7 @@ .\x64\ReleaseUWP/ - ..\..\bin64uwp\icuin60.dll + ..\..\bin64uwp\icuin61.dll .\..\..\lib64uwp\icuin.pdb ..\..\lib64uwp\icuin.lib ..\..\lib64uwp\icuuc.lib;%(AdditionalDependencies) @@ -233,7 +233,7 @@ .\x64\DebugUWP/ - ..\..\bin64uwp\icuin60d.dll + ..\..\bin64uwp\icuin61d.dll .\..\..\lib64uwp\icuind.pdb ..\..\lib64uwp\icuind.lib ..\..\lib64uwp\icuucd.lib;%(AdditionalDependencies) @@ -250,7 +250,7 @@ .\ARM\ReleaseUWP/ - ..\..\binARMuwp\icuin60.dll + ..\..\binARMuwp\icuin61.dll .\..\..\libARMuwp\icuin.pdb ..\..\libARMuwp\icuin.lib ..\..\libARMuwp\icuuc.lib;%(AdditionalDependencies) @@ -267,7 +267,7 @@ .\ARM\DebugUWP/ - ..\..\binARMuwp\icuin60d.dll + ..\..\binARMuwp\icuin61d.dll .\..\..\libARMuwp\icuind.pdb ..\..\libARMuwp\icuind.lib ..\..\libARMuwp\icuucd.lib;%(AdditionalDependencies) diff --git a/icu4c/source/io/io.vcxproj b/icu4c/source/io/io.vcxproj index 38f2a24eac9..78535f8faf9 100644 --- a/icu4c/source/io/io.vcxproj +++ b/icu4c/source/io/io.vcxproj @@ -114,7 +114,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icuio60.dll + ..\..\bin\icuio61.dll true .\..\..\lib\icuio.pdb true @@ -160,7 +160,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icuio60d.dll + ..\..\bin\icuio61d.dll true true .\..\..\lib\icuiod.pdb @@ -203,7 +203,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuio60.dll + ..\..\bin64\icuio61.dll true .\..\..\lib64\icuio.pdb true @@ -247,7 +247,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuio60d.dll + ..\..\bin64\icuio61d.dll true true .\..\..\lib64\icuiod.pdb diff --git a/icu4c/source/layoutex/layoutex.vcxproj b/icu4c/source/layoutex/layoutex.vcxproj index 63fec118cb9..44e6233d47e 100644 --- a/icu4c/source/layoutex/layoutex.vcxproj +++ b/icu4c/source/layoutex/layoutex.vcxproj @@ -112,7 +112,7 @@ 0x0409 - ..\..\bin\iculx60.dll + ..\..\bin\iculx61.dll true .\..\..\lib\iculx.pdb true @@ -156,7 +156,7 @@ 0x0409 - ..\..\bin\iculx60d.dll + ..\..\bin\iculx61d.dll true true .\..\..\lib\iculxd.pdb @@ -197,7 +197,7 @@ 0x0409 - ..\..\bin64\iculx60.dll + ..\..\bin64\iculx61.dll true .\..\..\lib64\iculx.pdb true @@ -239,7 +239,7 @@ 0x0409 - ..\..\bin64\iculx60d.dll + ..\..\bin64\iculx61d.dll true true .\..\..\lib64\iculxd.pdb diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj index 2bc7f69eeb6..98395cce8a5 100644 --- a/icu4c/source/stubdata/stubdata.vcxproj +++ b/icu4c/source/stubdata/stubdata.vcxproj @@ -120,7 +120,7 @@ echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt" - ..\..\bin\icudt60.dll + ..\..\bin\icudt61.dll true true .\x86\Release\icudt.pdb @@ -169,7 +169,7 @@ echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt" - ..\..\bin\icudt60.dll + ..\..\bin\icudt61.dll true .\x86\Debug/icudt.pdb true @@ -218,7 +218,7 @@ echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt" - ..\..\bin64\icudt60.dll + ..\..\bin64\icudt61.dll true true .\x64\Release\icudt.pdb @@ -265,7 +265,7 @@ echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt" - ..\..\bin64\icudt60.dll + ..\..\bin64\icudt61.dll true .\x64\Debug/icudt.pdb true diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcxproj b/icu4c/source/tools/ctestfw/ctestfw.vcxproj index 183e40c48ae..1c63c341b27 100644 --- a/icu4c/source/tools/ctestfw/ctestfw.vcxproj +++ b/icu4c/source/tools/ctestfw/ctestfw.vcxproj @@ -114,7 +114,7 @@ 0x0409 - ..\..\..\bin\icutest60.dll + ..\..\..\bin\icutest61.dll true .\..\..\..\lib\icutest.pdb true @@ -159,7 +159,7 @@ 0x0409 - ..\..\..\bin\icutest60d.dll + ..\..\..\bin\icutest61d.dll true true .\..\..\..\lib\icutestd.pdb @@ -201,7 +201,7 @@ 0x0409 - ..\..\..\bin64\icutest60.dll + ..\..\..\bin64\icutest61.dll true .\..\..\..\lib64\icutest.pdb true @@ -244,7 +244,7 @@ 0x0409 - ..\..\..\bin64\icutest60d.dll + ..\..\..\bin64\icutest61d.dll true true .\..\..\..\lib64\icutestd.pdb diff --git a/icu4c/source/tools/toolutil/toolutil.vcxproj b/icu4c/source/tools/toolutil/toolutil.vcxproj index c4fc4c68963..dee5143785a 100644 --- a/icu4c/source/tools/toolutil/toolutil.vcxproj +++ b/icu4c/source/tools/toolutil/toolutil.vcxproj @@ -114,7 +114,7 @@ 0x0409 - ..\..\..\bin\icutu60.dll + ..\..\..\bin\icutu61.dll true ..\..\..\lib;%(AdditionalLibraryDirectories) .\..\..\..\lib\icutu.pdb @@ -160,7 +160,7 @@ 0x0409 - ..\..\..\bin\icutu60d.dll + ..\..\..\bin\icutu61d.dll true ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -204,7 +204,7 @@ 0x0409 - ..\..\..\bin64\icutu60.dll + ..\..\..\bin64\icutu61.dll true ..\..\..\lib64;%(AdditionalLibraryDirectories) .\..\..\..\lib64\icutu.pdb @@ -248,7 +248,7 @@ 0x0409 - ..\..\..\bin64\icutu60d.dll + ..\..\..\bin64\icutu61d.dll true ..\..\..\lib64;%(AdditionalLibraryDirectories) true