organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 05:55:35 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 11

ICU-13159 Updating ICU version in trunk to 60.0.1 (60m1) - merging changes from my work branch.

Browse source 
X-SVN-Rev: 40145
This commit is contained in:
Yoshito Umaoka 2017-05-31 16:50:38 +00:00
parent d0d0b173b4
commit 694142470e
19 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4c/source/common/common.vcxproj
View file

@ -110,7 +110,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\icuuc59.dll</OutputFile>
<OutputFile>..\..\bin\icuuc60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\icuuc.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -152,7 +152,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\icuuc59d.dll</OutputFile>
<OutputFile>..\..\bin\icuuc60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\icuucd.pdb</ProgramDatabaseFile>
@ -191,7 +191,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\icuuc59.dll</OutputFile>
<OutputFile>..\..\bin64\icuuc60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\icuuc.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -231,7 +231,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\icuuc59d.dll</OutputFile>
<OutputFile>..\..\bin64\icuuc60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\icuucd.pdb</ProgramDatabaseFile>

2
icu4c/source/common/ucurr.cpp
View file

@ -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.

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

@ -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 */
/*===========================================================================

4
icu4c/source/data/makedata.mak
View file

@ -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

8
icu4c/source/i18n/i18n.vcxproj
View file

@ -113,7 +113,7 @@
<AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\icuin59.dll</OutputFile>
<OutputFile>..\..\bin\icuin60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\icuin.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -158,7 +158,7 @@
<AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\icuin59d.dll</OutputFile>
<OutputFile>..\..\bin\icuin60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\icuind.pdb</ProgramDatabaseFile>
@ -200,7 +200,7 @@
<AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\icuin59.dll</OutputFile>
<OutputFile>..\..\bin64\icuin60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\icuin.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -243,7 +243,7 @@
<AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\icuin59d.dll</OutputFile>
<OutputFile>..\..\bin64\icuin60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\icuind.pdb</ProgramDatabaseFile>

8
icu4c/source/io/io.vcxproj
View file

@ -113,7 +113,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\icuio59.dll</OutputFile>
<OutputFile>..\..\bin\icuio60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\icuio.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -158,7 +158,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\icuio59d.dll</OutputFile>
<OutputFile>..\..\bin\icuio60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\icuiod.pdb</ProgramDatabaseFile>
@ -200,7 +200,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\icuio59.dll</OutputFile>
<OutputFile>..\..\bin64\icuio60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\icuio.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -243,7 +243,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\icuio59d.dll</OutputFile>
<OutputFile>..\..\bin64\icuio60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\icuiod.pdb</ProgramDatabaseFile>

8
icu4c/source/layoutex/layoutex.vcxproj
View file

@ -112,7 +112,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\iculx59.dll</OutputFile>
<OutputFile>..\..\bin\iculx60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\iculx.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -156,7 +156,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\iculx59d.dll</OutputFile>
<OutputFile>..\..\bin\iculx60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\iculxd.pdb</ProgramDatabaseFile>
@ -197,7 +197,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\iculx59.dll</OutputFile>
<OutputFile>..\..\bin64\iculx60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\iculx.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -239,7 +239,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\iculx59d.dll</OutputFile>
<OutputFile>..\..\bin64\iculx60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\iculxd.pdb</ProgramDatabaseFile>

8
icu4c/source/stubdata/stubdata.vcxproj
View file

@ -118,7 +118,7 @@
<Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>
</PreLinkEvent>
<Link>
<OutputFile>..\..\bin\icudt59.dll</OutputFile>
<OutputFile>..\..\bin\icudt60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<ProgramDatabaseFile>.\x86\Release\icudt.pdb</ProgramDatabaseFile>
@ -165,7 +165,7 @@
<Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>
</PreLinkEvent>
<Link>
<OutputFile>..\..\bin\icudt59.dll</OutputFile>
<OutputFile>..\..\bin\icudt60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\x86\Debug/icudt.pdb</ProgramDatabaseFile>
<NoEntryPoint>true</NoEntryPoint>
@ -212,7 +212,7 @@
<Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>
</PreLinkEvent>
<Link>
<OutputFile>..\..\bin64\icudt59.dll</OutputFile>
<OutputFile>..\..\bin64\icudt60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<ProgramDatabaseFile>.\x64\Release\icudt.pdb</ProgramDatabaseFile>
@ -257,7 +257,7 @@
<Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>
</PreLinkEvent>
<Link>
<OutputFile>..\..\bin64\icudt59.dll</OutputFile>
<OutputFile>..\..\bin64\icudt60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\x64\Debug/icudt.pdb</ProgramDatabaseFile>
<NoEntryPoint>true</NoEntryPoint>

8
icu4c/source/tools/ctestfw/ctestfw.vcxproj
View file

@ -113,7 +113,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\..\bin\icutest59.dll</OutputFile>
<OutputFile>..\..\..\bin\icutest60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\..\lib\icutest.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -157,7 +157,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\..\bin\icutest59d.dll</OutputFile>
<OutputFile>..\..\..\bin\icutest60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\..\lib\icutestd.pdb</ProgramDatabaseFile>
@ -198,7 +198,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\..\bin64\icutest59.dll</OutputFile>
<OutputFile>..\..\..\bin64\icutest60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\..\lib64\icutest.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -240,7 +240,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\..\bin64\icutest59d.dll</OutputFile>
<OutputFile>..\..\..\bin64\icutest60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\..\lib64\icutestd.pdb</ProgramDatabaseFile>

8
icu4c/source/tools/toolutil/toolutil.vcxproj
View file

@ -113,7 +113,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\..\bin\icutu59.dll</OutputFile>
<OutputFile>..\..\..\bin\icutu60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile>.\..\..\..\lib\icutu.pdb</ProgramDatabaseFile>
@ -158,7 +158,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\..\bin\icutu59d.dll</OutputFile>
<OutputFile>..\..\..\bin\icutu60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -201,7 +201,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\..\bin64\icutu59.dll</OutputFile>
<OutputFile>..\..\..\bin64\icutu60.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ProgramDatabaseFile>.\..\..\..\lib64\icutu.pdb</ProgramDatabaseFile>
@ -244,7 +244,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\..\bin64\icutu59d.dll</OutputFile>
<OutputFile>..\..\..\bin64\icutu60d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>

8
icu4j/build.properties
View file

@ -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

4
icu4j/eclipse-build/build.properties
View file

@ -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

6
icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
View file

@ -188,7 +188,7 @@ public final class VersionInfo implements Comparable<VersionInfo>
* @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<VersionInfo>
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);

6
icu4j/main/shared/build/common.properties
View file

@ -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

4
icu4j/main/shared/data/icudata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f74f204e65aaf327708ebed125e17dc49b3e74d026e4bf762f48978ae8155d6a
size 12153152
oid sha256:62de07e43f02c66f75b59dd69fb8b1d9ae3e1744968c46caa71656b0c205db54
size 12153000

2
icu4j/main/shared/data/icutzdata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c8e833db5b89ace58dde83087599684772a68742408e8a99c9a43b1c9d00c7f
oid sha256:61b81228f35697d75a11dc8bbe0bea969f95580ceb9f2e45b6de4802eecc4884
size 92449

4
icu4j/main/shared/data/testdata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d89be50b6c79631d5e94465c715277894b0278f35f99705c369d09bc4d485987
size 812726
oid sha256:6a1feb490dd618c3dc8d6eb794c3d6da6506db9c0350853fad09c32c55bb946c
size 812719

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
View file

@ -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;

2
icu4j/pom.xml
View file

@ -13,7 +13,7 @@
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>59.1</version>
<version>60-SNAPSHOT</version>
<name>ICU4J</name>
<description>