From: Yoshito Umaoka Date: Wed, 31 May 2017 16:50:38 +0000 (+0000) Subject: ICU-13159 Updating ICU version in trunk to 60.0.1 (60m1) - merging changes from my... X-Git-Tag: milestone-60-0-1~50 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=694142470ed0b28b597aef272e21453a803ec55f;p=icu ICU-13159 Updating ICU version in trunk to 60.0.1 (60m1) - merging changes from my work branch. X-SVN-Rev: 40145 --- diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj index 41563ef5bf6..055e849cd43 100644 --- a/icu4c/source/common/common.vcxproj +++ b/icu4c/source/common/common.vcxproj @@ -110,7 +110,7 @@ 0x0409 - ..\..\bin\icuuc59.dll + ..\..\bin\icuuc60.dll true .\..\..\lib\icuuc.pdb true @@ -152,7 +152,7 @@ 0x0409 - ..\..\bin\icuuc59d.dll + ..\..\bin\icuuc60d.dll true true .\..\..\lib\icuucd.pdb @@ -191,7 +191,7 @@ 0x0409 - ..\..\bin64\icuuc59.dll + ..\..\bin64\icuuc60.dll true .\..\..\lib64\icuuc.pdb true @@ -231,7 +231,7 @@ 0x0409 - ..\..\bin64\icuuc59d.dll + ..\..\bin64\icuuc60d.dll true true .\..\..\lib64\icuucd.pdb diff --git a/icu4c/source/common/ucurr.cpp b/icu4c/source/common/ucurr.cpp index f2cae13ce33..e2ccf50841a 100644 --- a/icu4c/source/common/ucurr.cpp +++ b/icu4c/source/common/ucurr.cpp @@ -588,7 +588,7 @@ ucurr_forLocale(const char* locale, idDelim[0] = 0; } - const UChar* s; // Currency code from data file. + const UChar* s = NULL; // Currency code from data file. if (id[0] == 0) { // No point looking in the data for an empty string. // This is what we would get. diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index cae59ad880c..4dcc119aafb 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -58,19 +58,19 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION_MAJOR_NUM 59 +#define U_ICU_VERSION_MAJOR_NUM 60 /** The current ICU minor version as an integer. * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_MINOR_NUM 1 +#define U_ICU_VERSION_MINOR_NUM 0 /** 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 0 +#define U_ICU_VERSION_PATCHLEVEL_NUM 1 /** The current ICU build level version as an integer. * This value is for use by ICU clients. It defaults to 0. @@ -84,7 +84,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_SUFFIX _59 +#define U_ICU_VERSION_SUFFIX _60 /** * \def U_DEF2_ICU_ENTRY_POINT_RENAME @@ -119,14 +119,14 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "59.1" +#define U_ICU_VERSION "60.0.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 * @stable ICU 2.6 */ #if U_PLATFORM_HAS_WINUWP_API == 0 -#define U_ICU_VERSION_SHORT "59" +#define U_ICU_VERSION_SHORT "60" #else // U_DISABLE_RENAMING does not impact dat file name #define U_ICU_VERSION_SHORT @@ -136,7 +136,7 @@ /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "59.1" +#define U_ICU_DATA_VERSION "60.0.1" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index 37613135976..c985d0c0454 100644 --- a/icu4c/source/data/makedata.mak +++ b/icu4c/source/data/makedata.mak @@ -12,10 +12,10 @@ ############################################################################## # Keep the following in sync with the version - see common/unicode/uvernum.h -U_ICUDATA_NAME=icudt59 +U_ICUDATA_NAME=icudt60 ############################################################################## !IF "$(UWP)" == "UWP" -U_ICUDATA_NAME=icudt +U_ICUDATA_NAME=icudt60 !ENDIF U_ICUDATA_ENDIAN_SUFFIX=l UNICODE_VERSION=10.0 diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj index 1c8f17c2949..3be00882cfb 100644 --- a/icu4c/source/i18n/i18n.vcxproj +++ b/icu4c/source/i18n/i18n.vcxproj @@ -113,7 +113,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin\icuin59.dll + ..\..\bin\icuin60.dll true .\..\..\lib\icuin.pdb true @@ -158,7 +158,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin\icuin59d.dll + ..\..\bin\icuin60d.dll true true .\..\..\lib\icuind.pdb @@ -200,7 +200,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuin59.dll + ..\..\bin64\icuin60.dll true .\..\..\lib64\icuin.pdb true @@ -243,7 +243,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuin59d.dll + ..\..\bin64\icuin60d.dll true true .\..\..\lib64\icuind.pdb diff --git a/icu4c/source/io/io.vcxproj b/icu4c/source/io/io.vcxproj index 19e6041f63e..375b716c9ac 100644 --- a/icu4c/source/io/io.vcxproj +++ b/icu4c/source/io/io.vcxproj @@ -113,7 +113,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icuio59.dll + ..\..\bin\icuio60.dll true .\..\..\lib\icuio.pdb true @@ -158,7 +158,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icuio59d.dll + ..\..\bin\icuio60d.dll true true .\..\..\lib\icuiod.pdb @@ -200,7 +200,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuio59.dll + ..\..\bin64\icuio60.dll true .\..\..\lib64\icuio.pdb true @@ -243,7 +243,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuio59d.dll + ..\..\bin64\icuio60d.dll true true .\..\..\lib64\icuiod.pdb diff --git a/icu4c/source/layoutex/layoutex.vcxproj b/icu4c/source/layoutex/layoutex.vcxproj index f7f8f1007ed..63fec118cb9 100644 --- a/icu4c/source/layoutex/layoutex.vcxproj +++ b/icu4c/source/layoutex/layoutex.vcxproj @@ -112,7 +112,7 @@ 0x0409 - ..\..\bin\iculx59.dll + ..\..\bin\iculx60.dll true .\..\..\lib\iculx.pdb true @@ -156,7 +156,7 @@ 0x0409 - ..\..\bin\iculx59d.dll + ..\..\bin\iculx60d.dll true true .\..\..\lib\iculxd.pdb @@ -197,7 +197,7 @@ 0x0409 - ..\..\bin64\iculx59.dll + ..\..\bin64\iculx60.dll true .\..\..\lib64\iculx.pdb true @@ -239,7 +239,7 @@ 0x0409 - ..\..\bin64\iculx59d.dll + ..\..\bin64\iculx60d.dll true true .\..\..\lib64\iculxd.pdb diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj index 4079f7b5b9f..f296c11fd6e 100644 --- a/icu4c/source/stubdata/stubdata.vcxproj +++ b/icu4c/source/stubdata/stubdata.vcxproj @@ -118,7 +118,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\icudt59.dll + ..\..\bin\icudt60.dll true true .\x86\Release\icudt.pdb @@ -165,7 +165,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\icudt59.dll + ..\..\bin\icudt60.dll true .\x86\Debug/icudt.pdb true @@ -212,7 +212,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\icudt59.dll + ..\..\bin64\icudt60.dll true true .\x64\Release\icudt.pdb @@ -257,7 +257,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\icudt59.dll + ..\..\bin64\icudt60.dll true .\x64\Debug/icudt.pdb true diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcxproj b/icu4c/source/tools/ctestfw/ctestfw.vcxproj index 62ca73f5f47..444860fa975 100644 --- a/icu4c/source/tools/ctestfw/ctestfw.vcxproj +++ b/icu4c/source/tools/ctestfw/ctestfw.vcxproj @@ -113,7 +113,7 @@ 0x0409 - ..\..\..\bin\icutest59.dll + ..\..\..\bin\icutest60.dll true .\..\..\..\lib\icutest.pdb true @@ -157,7 +157,7 @@ 0x0409 - ..\..\..\bin\icutest59d.dll + ..\..\..\bin\icutest60d.dll true true .\..\..\..\lib\icutestd.pdb @@ -198,7 +198,7 @@ 0x0409 - ..\..\..\bin64\icutest59.dll + ..\..\..\bin64\icutest60.dll true .\..\..\..\lib64\icutest.pdb true @@ -240,7 +240,7 @@ 0x0409 - ..\..\..\bin64\icutest59d.dll + ..\..\..\bin64\icutest60d.dll true true .\..\..\..\lib64\icutestd.pdb diff --git a/icu4c/source/tools/toolutil/toolutil.vcxproj b/icu4c/source/tools/toolutil/toolutil.vcxproj index fa3a80b7f62..7197635071e 100644 --- a/icu4c/source/tools/toolutil/toolutil.vcxproj +++ b/icu4c/source/tools/toolutil/toolutil.vcxproj @@ -113,7 +113,7 @@ 0x0409 - ..\..\..\bin\icutu59.dll + ..\..\..\bin\icutu60.dll true ..\..\..\lib;%(AdditionalLibraryDirectories) .\..\..\..\lib\icutu.pdb @@ -158,7 +158,7 @@ 0x0409 - ..\..\..\bin\icutu59d.dll + ..\..\..\bin\icutu60d.dll true ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -201,7 +201,7 @@ 0x0409 - ..\..\..\bin64\icutu59.dll + ..\..\..\bin64\icutu60.dll true ..\..\..\lib64;%(AdditionalLibraryDirectories) .\..\..\..\lib64\icutu.pdb @@ -244,7 +244,7 @@ 0x0409 - ..\..\..\bin64\icutu59d.dll + ..\..\..\bin64\icutu60d.dll true ..\..\..\lib64;%(AdditionalLibraryDirectories) true diff --git a/icu4j/build.properties b/icu4j/build.properties index 35f976f383c..64378cc07af 100644 --- a/icu4j/build.properties +++ b/icu4j/build.properties @@ -4,8 +4,8 @@ #* Copyright (C) 2009-2016, International Business Machines Corporation and * #* others. All Rights Reserved. * #******************************************************************************* -api.report.version = 59 -api.report.prev.version = 58 -release.file.ver = 59_1 -api.doc.version = 59.1 +api.report.version = 60 +api.report.prev.version = 59 +release.file.ver = 60m1 +api.doc.version = 60 Milestone 1 diff --git a/icu4j/eclipse-build/build.properties b/icu4j/eclipse-build/build.properties index f8cefc94a36..057c5094242 100644 --- a/icu4j/eclipse-build/build.properties +++ b/icu4j/eclipse-build/build.properties @@ -4,6 +4,6 @@ #* Copyright (C) 2010-2016, International Business Machines Corporation and * #* others. All Rights Reserved. * #******************************************************************************* -icu4j.plugin.impl.version.string=59.1.0 +icu4j.plugin.impl.version.string=60.0.1 copyright.eclipse=(C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html#License -icu4j.data.version.number=59 +icu4j.data.version.number=60 diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java index e9fc7393fa5..e8495dc80a4 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java @@ -188,7 +188,7 @@ public final class VersionInfo implements Comparable * @deprecated This API is ICU internal only. */ @Deprecated - public static final String ICU_DATA_VERSION_PATH = "59b"; + public static final String ICU_DATA_VERSION_PATH = "60b"; /** * Data version in ICU4J. @@ -567,8 +567,8 @@ public final class VersionInfo implements Comparable UNICODE_9_0 = getInstance(9, 0, 0, 0); UNICODE_10_0 = getInstance(10, 0, 0, 0); - ICU_VERSION = getInstance(59, 1, 0, 0); - ICU_DATA_VERSION = getInstance(59, 1, 0, 0); + ICU_VERSION = getInstance(60, 0, 1, 0); + ICU_DATA_VERSION = getInstance(60, 0, 1, 0); UNICODE_VERSION = UNICODE_10_0; UCOL_RUNTIME_VERSION = getInstance(9); diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties index 313cb85da95..cfa1325156e 100644 --- a/icu4j/main/shared/build/common.properties +++ b/icu4j/main/shared/build/common.properties @@ -6,9 +6,9 @@ #******************************************************************************* # Version numbers, etc. -icu4j.spec.version = 59 -icu4j.impl.version = 59.1 -icu4j.data.version = 59 +icu4j.spec.version = 60 +icu4j.impl.version = 60.0.1 +icu4j.data.version = 60 default.exec.env = JavaSE-1.6 copyright = \u00A9 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html#License diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 5b83ace0de2..bb8c2613761 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f74f204e65aaf327708ebed125e17dc49b3e74d026e4bf762f48978ae8155d6a -size 12153152 +oid sha256:62de07e43f02c66f75b59dd69fb8b1d9ae3e1744968c46caa71656b0c205db54 +size 12153000 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index b7681e35380..4d898f00779 100755 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c8e833db5b89ace58dde83087599684772a68742408e8a99c9a43b1c9d00c7f +oid sha256:61b81228f35697d75a11dc8bbe0bea969f95580ceb9f2e45b6de4802eecc4884 size 92449 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index ec62cc58be0..4c9056a59c7 100755 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d89be50b6c79631d5e94465c715277894b0278f35f99705c369d09bc4d485987 -size 812726 +oid sha256:6a1feb490dd618c3dc8d6eb794c3d6da6506db9c0350853fad09c32c55bb946c +size 812719 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java index 8f47d5f94c2..7f300aa4fc7 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java @@ -10,7 +10,7 @@ package com.ibm.icu.dev.test.util; public class DebugUtilitiesData extends Object { - public static final String ICU4C_VERSION="59.1"; + public static final String ICU4C_VERSION="60.0.1"; public static final int UDebugEnumType = 0; public static final int UCalendarDateFields = 1; public static final int UCalendarMonths = 2; diff --git a/icu4j/pom.xml b/icu4j/pom.xml index 62d3a09d89c..e5a6ae8dcef 100644 --- a/icu4j/pom.xml +++ b/icu4j/pom.xml @@ -13,7 +13,7 @@ com.ibm.icu icu4j - 59.1 + 60-SNAPSHOT ICU4J