SERVER-22371 Migrate ICU build system integration from 56.1 to 57.1

3 files changed, 26 insertions, 22 deletions

diff --git a/src/third_party/SConscript b/src/third_party/SConscript
index 8da73288748..9d061868442 100644
--- a/src/third_party/SConscript
+++ b/src/third_party/SConscript
@@ -9,7 +9,7 @@ zlibSuffix = '-1.2.8'
 pcreSuffix = "-8.38"
 mozjsSuffix = '-38'
 yamlSuffix = '-0.5.3'
-icuSuffix = '-56.1'
+icuSuffix = '-57.1'
 
 thirdPartyIncludePathList = [
     ('s2', '#/src/third_party/s2'),
diff --git a/src/third_party/icu4c-56.1/source/SConscript b/src/third_party/icu4c-57.1/source/SConscript
index 1d4e95493f8..5042c14d989 100644
--- a/src/third_party/icu4c-56.1/source/SConscript
+++ b/src/third_party/icu4c-57.1/source/SConscript
@@ -38,26 +38,26 @@ env.Library(
         'i18n/chnsecal.cpp',
         'i18n/choicfmt.cpp',
         'i18n/coleitr.cpp',
+        'i18n/coll.cpp',
+        'i18n/collation.cpp',
         'i18n/collationbuilder.cpp',
         'i18n/collationcompare.cpp',
-        'i18n/collationdatabuilder.cpp',
         'i18n/collationdata.cpp',
+        'i18n/collationdatabuilder.cpp',
         'i18n/collationdatareader.cpp',
         'i18n/collationdatawriter.cpp',
-        'i18n/collationfastlatinbuilder.cpp',
         'i18n/collationfastlatin.cpp',
+        'i18n/collationfastlatinbuilder.cpp',
         'i18n/collationfcd.cpp',
         'i18n/collationiterator.cpp',
         'i18n/collationkeys.cpp',
-        'i18n/collation.cpp',
-        'i18n/collationrootelements.cpp',
         'i18n/collationroot.cpp',
+        'i18n/collationrootelements.cpp',
         'i18n/collationruleparser.cpp',
         'i18n/collationsets.cpp',
         'i18n/collationsettings.cpp',
         'i18n/collationtailoring.cpp',
         'i18n/collationweights.cpp',
-        'i18n/coll.cpp',
         'i18n/compactdecimalformat.cpp',
         'i18n/coptccal.cpp',
         'i18n/cpdtrans.cpp',
@@ -75,15 +75,16 @@ env.Library(
         'i18n/currunit.cpp',
         'i18n/dangical.cpp',
         'i18n/datefmt.cpp',
+        'i18n/dayperiodrules.cpp',
         'i18n/dcfmtsym.cpp',
         'i18n/decContext.c',
+        'i18n/decNumber.c',
         'i18n/decfmtst.cpp',
         'i18n/decimalformatpattern.cpp',
-        'i18n/decimfmtimpl.cpp',
         'i18n/decimfmt.cpp',
-        'i18n/decNumber.c',
-        'i18n/digitaffixesandpadding.cpp',
+        'i18n/decimfmtimpl.cpp',
         'i18n/digitaffix.cpp',
+        'i18n/digitaffixesandpadding.cpp',
         'i18n/digitformatter.cpp',
         'i18n/digitgrouping.cpp',
         'i18n/digitinterval.cpp',
@@ -95,8 +96,8 @@ env.Library(
         'i18n/dtrule.cpp',
         'i18n/esctrn.cpp',
         'i18n/ethpccal.cpp',
-        'i18n/fmtable_cnv.cpp',
         'i18n/fmtable.cpp',
+        'i18n/fmtable_cnv.cpp',
         'i18n/format.cpp',
         'i18n/fphdlimp.cpp',
         'i18n/fpositer.cpp',
@@ -110,7 +111,6 @@ env.Library(
         'i18n/inputext.cpp',
         'i18n/islamcal.cpp',
         'i18n/japancal.cpp',
-        'i18n/locdspnm.cpp',
         'i18n/measfmt.cpp',
         'i18n/measunit.cpp',
         'i18n/measure.cpp',
@@ -129,11 +129,11 @@ env.Library(
         'i18n/plurfmt.cpp',
         'i18n/plurrule.cpp',
         'i18n/precision.cpp',
-        'i18n/quantityformatter.cpp',
         'i18n/quant.cpp',
+        'i18n/quantityformatter.cpp',
         'i18n/rbnf.cpp',
-        'i18n/rbt_data.cpp',
         'i18n/rbt.cpp',
+        'i18n/rbt_data.cpp',
         'i18n/rbt_pars.cpp',
         'i18n/rbt_rule.cpp',
         'i18n/rbt_set.cpp',
@@ -159,6 +159,7 @@ env.Library(
         'i18n/smpdtfmt.cpp',
         'i18n/smpdtfst.cpp',
         'i18n/sortkey.cpp',
+        'i18n/standardplural.cpp',
         'i18n/strmatch.cpp',
         'i18n/strrepl.cpp',
         'i18n/stsearch.cpp',
@@ -175,20 +176,19 @@ env.Library(
         'i18n/tridpars.cpp',
         'i18n/tzfmt.cpp',
         'i18n/tzgnames.cpp',
-        'i18n/tznames_impl.cpp',
         'i18n/tznames.cpp',
+        'i18n/tznames_impl.cpp',
         'i18n/tzrule.cpp',
         'i18n/tztrans.cpp',
         'i18n/ucal.cpp',
         'i18n/ucln_in.cpp',
-        'i18n/ucoleitr.cpp',
         'i18n/ucol.cpp',
         'i18n/ucol_res.cpp',
         'i18n/ucol_sit.cpp',
+        'i18n/ucoleitr.cpp',
         'i18n/ucsdet.cpp',
-        'i18n/ucurr.cpp',
-        'i18n/udateintervalformat.cpp',
         'i18n/udat.cpp',
+        'i18n/udateintervalformat.cpp',
         'i18n/udatpg.cpp',
         'i18n/ufieldpositer.cpp',
         'i18n/uitercollationiterator.cpp',
@@ -199,14 +199,14 @@ env.Library(
         'i18n/unum.cpp',
         'i18n/unumsys.cpp',
         'i18n/upluralrules.cpp',
-        'i18n/uregexc.cpp',
         'i18n/uregex.cpp',
+        'i18n/uregexc.cpp',
         'i18n/uregion.cpp',
         'i18n/usearch.cpp',
+        'i18n/uspoof.cpp',
         'i18n/uspoof_build.cpp',
         'i18n/uspoof_conf.cpp',
         'i18n/uspoof_impl.cpp',
-        'i18n/uspoof.cpp',
         'i18n/uspoof_wsconf.cpp',
         'i18n/utf16collationiterator.cpp',
         'i18n/utf8collationiterator.cpp',
@@ -249,6 +249,7 @@ commonEnv.Library(
         'common/chariter.cpp',
         'common/charstr.cpp',
         'common/cmemory.c',
+        'common/cstr.cpp',
         'common/cstring.c',
         'common/cwchar.c',
         'common/dictbe.cpp',
@@ -264,6 +265,7 @@ commonEnv.Library(
         'common/locavailable.cpp',
         'common/locbased.cpp',
         'common/locdispnames.cpp',
+        'common/locdspnm.cpp',
         'common/locid.cpp',
         'common/loclikely.cpp',
         'common/locmap.c',
@@ -290,6 +292,7 @@ commonEnv.Library(
         'common/rbbitblb.cpp',
         'common/resbund.cpp',
         'common/resbund_cnv.cpp',
+        'common/resource.cpp',
         'common/ruleiter.cpp',
         'common/schriter.cpp',
         'common/serv.cpp',
@@ -300,7 +303,7 @@ commonEnv.Library(
         'common/servrbf.cpp',
         'common/servslkf.cpp',
         'common/sharedobject.cpp',
-        'common/simplepatternformatter.cpp',
+        'common/simpleformatter.cpp',
         'common/stringpiece.cpp',
         'common/stringtriebuilder.cpp',
         'common/uarrsort.c',
@@ -344,6 +347,7 @@ commonEnv.Library(
         'common/ucnvscsu.c',
         'common/ucnvsel.cpp',
         'common/ucol_swp.cpp',
+        'common/ucurr.cpp',
         'common/udata.cpp',
         'common/udatamem.c',
         'common/udataswp.c',
@@ -382,7 +386,7 @@ commonEnv.Library(
         'common/uprops.cpp',
         'common/ures_cnv.c',
         'common/uresbund.cpp',
-        'common/uresdata.c',
+        'common/uresdata.cpp',
         'common/usc_impl.c',
         'common/uscript.c',
         'common/uscript_props.cpp',
diff --git a/src/third_party/scripts/icu_get_sources.sh b/src/third_party/scripts/icu_get_sources.sh
index 246d3388b4c..e6b4a303495 100755
--- a/src/third_party/scripts/icu_get_sources.sh
+++ b/src/third_party/scripts/icu_get_sources.sh
@@ -5,7 +5,7 @@ set -o errexit
 # This script fetches and creates a copy of sources for ICU.
 
 NAME=icu4c
-MAJOR_VERSION=56
+MAJOR_VERSION=57
 MINOR_VERSION=1
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}