Issue #1971 - Part 2: Update ICU source to 63.2.

2026-09-21 07:47:32 +09:00 · 2022-07-24 21:03:27 +08:00 · 2022-07-24 21:03:27 +08:00 · 1e69214382
commit 1e69214382
parent 8df84683be
3160 changed files with 275815 additions and 234203 deletions
--- a/intl/icu/source/extra/scrptrun/scrptrun.cpp
+++ b/intl/icu/source/extra/scrptrun/scrptrun.cpp
@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
--- a/intl/icu/source/extra/scrptrun/scrptrun.h
+++ b/intl/icu/source/extra/scrptrun/scrptrun.h
@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
--- a/intl/icu/source/extra/scrptrun/srtest.cpp
+++ b/intl/icu/source/extra/scrptrun/srtest.cpp
@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 /*
 * %W% %E%
--- a/intl/icu/source/extra/uconv/Makefile.in
+++ b/intl/icu/source/extra/uconv/Makefile.in
@ -44,7 +44,7 @@ CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES)
 ## Target information
 TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT)

-CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
+CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil
 CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit
 LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

--- a/intl/icu/source/extra/uconv/makedata.mak
+++ b/intl/icu/source/extra/uconv/makedata.mak
@ -8,7 +8,7 @@
 # invoke with
 # nmake /f makedata.mak icup=<path_to_icu_instalation> [Debug|Release]
 #
-#	12/10/1999	weiv	Created
+#   12/10/1999  weiv    Created

 #If no config, we default to debug
 !IF "$(CFG)" == ""
@ -38,6 +38,7 @@ CFG=Debug
 !ERROR Can't find path!
 !ENDIF
 !MESSAGE ICU path is $(ICUP)
+
 RESNAME=uconvmsg
 RESDIR=resources
 RESFILES=resfiles.mk
@ -58,6 +59,16 @@ ICUTOOLS=$(ICUP)\bin
 PATH = $(ICUP)\bin;$(PATH)
 !ENDIF

+# Make sure the necessary tools exist before continuing. (This is to prevent cryptic errors from NMAKE).
+!IF !EXISTS($(ICUTOOLS)\pkgdata.exe)
+!MESSAGE Unable to find "$(ICUTOOLS)\pkgdata.exe"
+!ERROR The tool 'pkgdata.exe' does not exist! (Have you built all of ICU yet?).
+!ENDIF
+!IF !EXISTS($(ICUTOOLS)\genrb.exe)
+!MESSAGE Unable to find "$(ICUTOOLS)\genrb.exe"
+!ERROR The tool 'genrb.exe' does not exist! (Have you built all of ICU yet?).
+!ENDIF
+
 # Suffixes for data files
 .SUFFIXES : .ucm .cnv .dll .dat .res .txt .c

@ -81,13 +92,13 @@ OUTPUT = "$(DLL_OUTPUT)\$(RESNAME).lib"
 !ENDIF

 ALL : $(OUTPUT)
-	@echo All targets are up to date (mode $(PKGMODE))
+    @echo All targets are up to date (mode $(PKGMODE))


 # invoke pkgdata - static
 "$(DLL_OUTPUT)\$(RESNAME).lib" : $(RB_FILES) $(RESFILES)
-	@echo Building $(RESNAME).lib
-	@"$(ICUTOOLS)\pkgdata" -f -v -m static -c -p $(RESNAME) -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
+    @echo Building $(RESNAME).lib
+    @"$(ICUTOOLS)\pkgdata" -f -v -m static -c -p $(RESNAME) -d "$(DLL_OUTPUT)" -s "$(RESDIR)" <<pkgdatain.txt
 $(RES_FILES:.res =.res
 )
 <<KEEP
@ -95,14 +106,12 @@ $(RES_FILES:.res =.res
 # This is to remove all the data files
 CLEAN :
    -@erase "$(RB_FILES)"
-	-@erase "$(CFG)\*uconvmsg*.*"
+    -@erase "$(CFG)\*uconvmsg*.*"
    -@"$(ICUTOOLS)\pkgdata" -f --clean -v -m static -c -p $(RESNAME) -d "$(DLL_OUTPUT)" -s "$(RESDIR)" pkgdatain.txt

 # Inference rule for creating resource bundles
 {$(RESDIR)}.txt{$(RESDIR)}.res:
-	@echo Making Resource Bundle files
-	"$(ICUTOOLS)\genrb" -s $(@D) -d $(@D) $(?F)
-
+    @echo Making Resource Bundle files
+    "$(ICUTOOLS)\genrb" -s $(@D) -d $(@D) $(?F)

 $(RESSRC) : {"$(ICUTOOLS)"}genrb.exe
-
--- a/intl/icu/source/extra/uconv/resources/fr.txt
+++ b/intl/icu/source/extra/uconv/resources/fr.txt
@ -1,4 +1,4 @@
-// -*- Coding: utf-8; -*-  [all uconv resource files]
+// -*- Coding: utf-8; -*-  [all uconv resource files]
 // Copyright (C) 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 //
--- a/intl/icu/source/extra/uconv/resources/root.txt
+++ b/intl/icu/source/extra/uconv/resources/root.txt
@ -1,4 +1,4 @@
-// -*- Coding: utf-8; -*-  [all uconv resource files]
+// -*- Coding: utf-8; -*-  [all uconv resource files]
 // Copyright (C) 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 //
--- a/intl/icu/source/extra/uconv/samples/utf8/armenian.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/armenian.txt
@ -1,4 +1,4 @@
-Աեցեհի իմ լավ ?ւղիե լավարար,
+Աեցեհի իմ լավ ?ւղիե լավարար,
 Կյաեբս չտայի կասկածի մհգիե...
 Այեպհս կ?ւզհի մհկե իեծ ?ավատր,
 Այեպհս կ?ւզհի ?ավատալ մհկիե։
--- a/intl/icu/source/extra/uconv/samples/utf8/banviet.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/banviet.txt
@ -1,4 +1,4 @@
-Bần chỉ là một anh nghèo xác, ngày ngày lang-thang 
+Bần chỉ là một anh nghèo xác, ngày ngày lang-thang 
 khắp xóm này qua xóm khác xin ăn. Quần áo 
 rách-mướp Bần cũng chả coi sao, chân không có giầy và 
 đầu cũng chẳng có mũ. Giời nắng hay giời mưa Bần 
--- a/intl/icu/source/extra/uconv/samples/utf8/chinese-ulysses.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/chinese-ulysses.txt
@ -1,4 +1,4 @@
-　　俺正和首都警署的老特洛伊在凉亭山街角那儿寒喧呢，该死的，冷不丁儿的来了一名扫烟囱的背时家伙，他那长玩意儿差点儿戳进了俺那眼睛里头去。俺转回脑袋，正打算狠々地教训他一顿，没曾想一眼看见石头斜墻街那儿来了个人，道是谁呢，原来是约・哈因斯。
+　　俺正和首都警署的老特洛伊在凉亭山街角那儿寒喧呢，该死的，冷不丁儿的来了一名扫烟囱的背时家伙，他那长玩意儿差点儿戳进了俺那眼睛里头去。俺转回脑袋，正打算狠々地教训他一顿，没曾想一眼看见石头斜墻街那儿来了个人，道是谁呢，原来是约・哈因斯。
 　　___囉，约，俺说。你怎么样？那个扫烟囱的背时家伙，用他的长把儿刷子差点儿把我的眼睛捅掉。你看见了吗？
 　　___煤烟到，运气好，约说。你刚才说话的那个老小子是谁？
 　　___老特洛伊呗，俺说，原来是部队的。那家伙又是扫帚又是梯子，把交通都堵塞起来了，俺恨不得把他逮起来。
--- a/intl/icu/source/extra/uconv/samples/utf8/croat.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/croat.txt
@ -1,2 +1,2 @@
-Dobar dan! Kako ste? Ja sam Marina
+Dobar dan! Kako ste? Ja sam Marina
 Dodigović. Kako se Vi zovete?
--- a/intl/icu/source/extra/uconv/samples/utf8/danish.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/danish.txt
@ -1,4 +1,4 @@
- Foto ______ det formodede fødehus, hjørnet ______ Hans Jensensstræde og Bangs Boder.
+ Foto ______ det formodede fødehus, hjørnet ______ Hans Jensensstræde og Bangs Boder.
 (H. C. Andersens Hus, Odense).

 BARNDOMSOMGIVELSERNE</b>
--- a/intl/icu/source/extra/uconv/samples/utf8/greek.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/greek.txt
@ -1,4 +1,4 @@
-<html lang="gr" dir="ltr">
+<html lang="gr" dir="ltr">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UNICODE-1-1-UTF-8">
 </head>
--- a/intl/icu/source/extra/uconv/samples/utf8/hangul.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/hangul.txt
@ -1,2 +1,2 @@
-도서관
+도서관
 한국
--- a/intl/icu/source/extra/uconv/samples/utf8/hania.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/hania.txt
@ -1,2 +1,2 @@
-圖書館 
+圖書館 
 韓國
--- a/intl/icu/source/extra/uconv/samples/utf8/jap.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/jap.txt
@ -1,4 +1,4 @@
-ウインカリッスの日本語
+ウインカリッスの日本語
 　  「ユーザーフレンドリ」｜と｜呼ばれる｜
 　　りゆうは、ごく ｜普通の｜人がごく｜
 　　関単に  ｜使用 ｜方法を｜マスター｜でき、｜
--- a/intl/icu/source/extra/uconv/samples/utf8/korean.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/korean.txt
@ -1,4 +1,4 @@
-중앙일보 - 사건/사회 - 극지탐험　협회결
+중앙일보 - 사건/사회 - 극지탐험　협회결
 극지탐험　협회결성　체계적　연구
 　지구상의　３대　극지라　불리는　남극·북극·에베레스트를　한번이라
 도　다녀와야　정회원으로　들어갈　수　있는　한국극지협회가　발족다
--- a/intl/icu/source/extra/uconv/samples/utf8/linji.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/linji.txt
@ -1,4 +1,4 @@
-*臨濟語錄
+*臨濟語錄
 鎮州臨濟慧照禪師語錄序。
 延康殿學士金紫光祿大夫真。
 定府路安撫使兼馬步軍都總。
--- a/intl/icu/source/extra/uconv/samples/utf8/many.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/many.txt
@ -1,4 +1,4 @@
-外国語の勉強と教え
+外国語の勉強と教え
 Изучение и обучение иностранных языков
 語文教學・语文教学
 Enseñanza y estudio de idiomas
--- a/intl/icu/source/extra/uconv/samples/utf8/maopoem.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/maopoem.txt
@ -1,4 +1,4 @@
-和毛泽东 <<重上井冈山>>. 严永欣, 一九八八年
+和毛泽东 <<重上井冈山>>. 严永欣, 一九八八年
    和毛泽东 <<重上井冈山>>. 严永欣, 一九八八年.

        久有归天愿
--- a/intl/icu/source/extra/uconv/samples/utf8/russian.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/russian.txt
@ -1,4 +1,4 @@
-Американские суда находятся в международных водах. Япония
+Американские суда находятся в международных водах. Япония
 выразила серьезное беспокойство советскими действиями.
 Пентагон беспокойства не проявил. США проводят подобное слеже-
 ние за советскими судами в Карибском море. Правда, количество
--- a/intl/icu/source/extra/uconv/samples/utf8/simplechinese.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/simplechinese.txt
@ -1,4 +1,4 @@
-简介
+简介

     CALIS 是一个专为语文教学而设计的电脑软件。在当今这个电脑时代，＂电脑辅助教学＂是一个极为教师与学生所喜欢的教学媒体。

--- a/intl/icu/source/extra/uconv/samples/utf8/turkish.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/turkish.txt
@ -1,4 +1,4 @@
-Yukarda mavi gök, asağıda yağız yer yaratıldıkta; ikisinin arasında insan
+Yukarda mavi gök, asağıda yağız yer yaratıldıkta; ikisinin arasında insan
 oğlu yaratılmış. İnsan oğulları üzerine ecdadım Bumın hakan, İstemi hakan
 tahta oturmuş; oturarak Türk milletinin ülkesini, türesini, idare edivermiş,
 tanzim edivermis. Dört taraf hep düşman imiş. Asker sevk edip dört taraftaki
--- a/intl/icu/source/extra/uconv/samples/utf8/utf-8-demo.txt
+++ b/intl/icu/source/extra/uconv/samples/utf8/utf-8-demo.txt
@ -1,4 +1,4 @@
-UTF-8 encoded sample plain-text file
+UTF-8 encoded sample plain-text file
 ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 This file is a place-holder. The original file is available from Markus Kuhn's website at http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-demo.txt.

--- a/intl/icu/source/extra/uconv/uconv.1.in
+++ b/intl/icu/source/extra/uconv/uconv.1.in
@ -109,7 +109,7 @@ When calling
 it is possible to specify callbacks that are used to handle invalid
 characters in the input, or characters that cannot be transcoded to
 the destination encoding. Some encodings, for example, offer a default
-substitution character that can be used to represent the occurence of
+substitution character that can be used to represent the occurrence of
 such characters in the input. Other callbacks offer a useful visual
 representation of the invalid data.
 .PP
@ -188,7 +188,7 @@ Run the given
 .IR transliteration
 on the transcoded Unicode data,
 and use the transliterated data as input for the transcoding to
-the the destination encoding.
+the destination encoding.
 .TP
 .BI "\-\-to\-callback" " callback"
 Use
@ -278,7 +278,7 @@ is displayed when it is called with
 .PP
 .TP \w'\fBescape-unicode'u+3n
 .B substitute
-Write the the encoding's substitute sequence, or the Unicode
+Write the encoding's substitute sequence, or the Unicode
 replacement character
 .B U+FFFD
 when transcoding to Unicode.
@ -357,7 +357,7 @@ is the hexadecimal value of the Unicode codepoint.
 That hexadecimal string is of variable length and can use from 4 to
 6 digits.
 This is the format universally used to denote a Unicode codepoint in
-the litterature, delimited by curly braces for easy recognition of those
+the literature, delimited by curly braces for easy recognition of those
 substitutions in the output.
 .SH EXAMPLES
 Convert data from a given
@ -418,10 +418,10 @@ and map Katakana to Hiragana:
 .B "      \-x '::nfkc; [:Cc:] >; ::katakana-hiragana;'"
 .SH CAVEATS AND BUGS
 .B uconv
-does report errors as occuring at the first invalid byte
+does report errors as occurring at the first invalid byte
 encountered. This may be confusing to users of GNU
 .BR iconv (1),
-which reports errors as occuring at the first byte of an invalid
+which reports errors as occurring at the first byte of an invalid
 sequence. For multi-byte character sets or encodings, this means that
 .BR uconv
 error positions may be at a later offset in the input stream than
@ -432,7 +432,7 @@ The reporting of error positions when a transliterator is used may be
 inaccurate or unavailable, in which case
 .BR uconv
 will report the offset in the output stream at which the error
-occured.
+occurred.
 .SH AUTHORS
 Jonas Utterstroem
 .br
--- a/intl/icu/source/extra/uconv/uconv.cpp
+++ b/intl/icu/source/extra/uconv/uconv.cpp
@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 /*****************************************************************************
 *
--- a/intl/icu/source/extra/uconv/uconv.vcxproj
+++ b/intl/icu/source/extra/uconv/uconv.vcxproj
@ -1,50 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
+  <!-- The following import will include the 'default' configuration options for VS projects. -->
+  <Import Project="..\..\allinone\Build.Windows.ProjectConfiguration.props" />
  <PropertyGroup Label="Globals">
    <ProjectGuid>{DBA4088D-F6F9-4F8F-8820-082A4765C16C}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@ -81,6 +46,15 @@
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\Debug\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
  </PropertyGroup>
+  <!-- Options that are common to *all* project configurations -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\include;..\..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>UCONVMSG_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableLanguageExtensions>true</DisableLanguageExtensions>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <CustomBuildStep>
      <Command>copy "$(TargetPath)" ..\..\..\bin
@ -91,30 +65,18 @@
      <TypeLibraryName>.\x86\Release/uconv.tlb</TypeLibraryName>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\include;..\..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;UCONVMSG_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableLanguageExtensions>true</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
      <PrecompiledHeaderOutputFile>.\x86\Release/uconv.pch</PrecompiledHeaderOutputFile>
      <AssemblerListingLocation>.\x86\Release/</AssemblerListingLocation>
      <ObjectFileName>.\x86\Release/</ObjectFileName>
      <ProgramDataBaseFileName>.\x86\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>uconvmsg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>uconvmsg.lib;icuuc.lib;icuin.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>.\x86\Release/uconv.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>x86\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>x86\Release;..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x86\Release/uconv.pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
@ -132,32 +94,18 @@
      <TypeLibraryName>.\x86\Debug/uconv.tlb</TypeLibraryName>
    </Midl>
    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\include;..\..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;UCONVMSG_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <DisableLanguageExtensions>true</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
      <PrecompiledHeaderOutputFile>.\x86\Debug/uconv.pch</PrecompiledHeaderOutputFile>
      <AssemblerListingLocation>.\x86\Debug/</AssemblerListingLocation>
      <ObjectFileName>.\x86\Debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\x86\Debug/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>uconvmsg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>uconvmsg.lib;icuucd.lib;icuind.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>.\x86\Debug/uconv.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>x86\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>x86\Debug;..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x86\Debug/uconv.pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
@ -173,37 +121,23 @@
      <Outputs>$(ProjectDir)..\..\..\bin64\$(TargetFileName);%(Outputs)</Outputs>
    </CustomBuildStep>
    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
      <TypeLibraryName>.\x64\Release/uconv.tlb</TypeLibraryName>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\include;..\..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;UCONVMSG_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableLanguageExtensions>true</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
      <PrecompiledHeaderOutputFile>.\x64\Release/uconv.pch</PrecompiledHeaderOutputFile>
      <AssemblerListingLocation>.\x64\Release/</AssemblerListingLocation>
      <ObjectFileName>.\x64\Release/</ObjectFileName>
      <ProgramDataBaseFileName>.\x64\Release/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
      <CompileAs>Default</CompileAs>
    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>uconvmsg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>uconvmsg.lib;icuuc.lib;icuin.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>.\x64\Release/uconv.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>x64\Release;..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ProgramDatabaseFile>.\x64\Release/uconv.pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -213,40 +147,24 @@
      <Outputs>$(ProjectDir)..\..\..\bin64\$(TargetFileName);%(Outputs)</Outputs>
    </CustomBuildStep>
    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
      <TypeLibraryName>.\x64\Debug/uconv.tlb</TypeLibraryName>
    </Midl>
    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\include;..\..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;UCONVMSG_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <DisableLanguageExtensions>true</DisableLanguageExtensions>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
      <PrecompiledHeaderOutputFile>.\x64\Debug/uconv.pch</PrecompiledHeaderOutputFile>
      <AssemblerListingLocation>.\x64\Debug/</AssemblerListingLocation>
      <ObjectFileName>.\x64\Debug/</ObjectFileName>
      <ProgramDataBaseFileName>.\x64\Debug/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>uconvmsg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>uconvmsg.lib;icuucd.lib;icuind.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>.\x64\Debug/uconv.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>x64\Debug;..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>.\x64\Debug/uconv.pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
@ -275,24 +193,6 @@
    </CustomBuild>
    <None Include="resfiles.mk" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\common\common.vcxproj">
-      <Project>{73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\i18n\i18n.vcxproj">
-      <Project>{0178b127-6269-407d-b112-93877bb62776}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\tools\genrb\genrb.vcxproj">
-      <Project>{97521d06-ec47-45d4-8bd0-9e16b3f93b2a}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\tools\pkgdata\pkgdata.vcxproj">
-      <Project>{4c8454fe-81d3-4ca3-9927-29ba96f03dac}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/intl/icu/source/extra/uconv/uconv.vcxproj.filters
+++ b/intl/icu/source/extra/uconv/uconv.vcxproj.filters
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Source Files">
--- a/intl/icu/source/extra/uconv/unicode/uwmsg.h
+++ b/intl/icu/source/extra/uconv/unicode/uwmsg.h
@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
--- a/intl/icu/source/extra/uconv/uwmsg.c
+++ b/intl/icu/source/extra/uconv/uwmsg.c
@ -1,4 +1,4 @@
-// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************