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

This commit is contained in:
Job Bautista 2022-07-24 21:03:27 +08:00 committed by roytam1
commit 1e69214382
3160 changed files with 275815 additions and 234203 deletions

View file

@ -22,6 +22,9 @@ subdir = test
# harfbuzz.
@LAYOUTEX_TRUE@LETEST = letest
# no testdata without tools..
@TOOLS_TRUE@TESTDATA = testdata
# status dir
STATUS_TMP = tmp
STATUS_FULL = $(shell pwd)/$(STATUS_TMP)
@ -29,7 +32,7 @@ STATUS_FULL = $(shell pwd)/$(STATUS_TMP)
## Files to remove for 'make clean'
CLEANFILES = *~ $(STATUS_TMP)
SUBDIRS = testdata intltest $(IOTEST) cintltst $(LETEST)
SUBDIRS = $(TESTDATA) intltest $(IOTEST) cintltst $(LETEST)
## List of phony targets
.PHONY : everything all all-local all-recursive install install-local \
@ -85,7 +88,7 @@ xcheck-recursive check-recursive check-exhaustive-recursive:
@$(MKINSTALLDIRS) $(STATUS_TMP)
@mystatus=$(STATUS_FULL)/status.$$$$.deleteme ; \
$(RMV) "$$mystatus".* ; \
@goods=; \
goods=; \
bads=; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@ -134,8 +137,8 @@ $(STATUS_FULL)/status.$(STATUS_NUM).deleteme.%: pcheck_setup
# print out status
pcheck: $(STATUS_FILES)
@goods= ; \
bads= ; \
@goods=; \
bads=; \
echo "----------------------------------------"; \
for subdir in $(SUBDIRS); do \
if [ -s "$(MYSTATUS_R).$$subdir" ]; then \

View file

@ -48,13 +48,14 @@ cnmdptst.o cnormtst.o cnumtst.o crelativedateformattest.o crestst.o creststn.o c
cucdapi.o cucdtst.o custrtst.o cstrcase.o cutiltst.o nucnvtst.o nccbtst.o bocu1tst.o \
cbiditst.o cbididat.o eurocreg.o udatatst.o utf16tst.o utransts.o \
ncnvfbts.o ncnvtst.o putiltst.o cstrtest.o udatpg_test.o utf8tst.o \
stdnmtst.o usrchtst.o custrtrn.o sorttest.o trietest.o trie2test.o usettest.o \
stdnmtst.o usrchtst.o custrtrn.o sorttest.o trietest.o trie2test.o ucptrietest.o usettest.o \
uenumtst.o utmstest.o currtest.o \
idnatest.o nfsprep.o spreptst.o sprpdata.o \
hpmufn.o tracetst.o reapits.o uregiontest.o ulistfmttest.o\
utexttst.o ucsdetst.o spooftest.o \
cbiditransformtst.o \
cgendtst.o
cgendtst.o \
unumberformattertst.o
DEPS = $(OBJECTS:.o=.d)

View file

@ -114,11 +114,11 @@ drafttest:
@FAIL=0;for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/pfiles.txt`; do \
incfile=`basename $$file .h` ; \
echo "$@ unicode/$$incfile.h" ; \
echo '#define U_HIDE_DRAFT_API' > hd_$$incfile.c; \
echo '#include "'unicode/$$incfile'.h"' >> hd_$$incfile.c ; \
echo 'void junk(void);' >> hd_$$incfile.c ; \
echo 'void junk(){}' >> hd_$$incfile.c ; \
$(COMPILE.cc) -c $(cppflags) hd_$$incfile.c ||FAIL=1 ; \
echo '#define U_HIDE_DRAFT_API' > hd_$$incfile.cpp ; \
echo '#include "'unicode/$$incfile'.h"' >> hd_$$incfile.cpp ; \
echo 'void junk(void);' >> hd_$$incfile.cpp ; \
echo 'void junk(){}' >> hd_$$incfile.cpp ; \
$(COMPILE.cc) -c $(cppflags) hd_$$incfile.cpp ||FAIL=1 ; \
done ;\
exit $$FAIL
@ -126,11 +126,11 @@ deprtest:
@FAIL=0; for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/pfiles.txt`; do \
incfile=`basename $$file .h` ; \
echo "$@ unicode/$$incfile.h" ; \
echo '#define U_HIDE_DEPRECATED_API' > hdp_$$incfile.c; \
echo '#include "'unicode/$$incfile'.h"' >> hdp_$$incfile.c ; \
echo 'void junk(void);' >> hdp_$$incfile.c ; \
echo 'void junk(){}' >> hdp_$$incfile.c ; \
$(COMPILE.cc) -c $(cppflags) hdp_$$incfile.c || FAIL=1; \
echo '#define U_HIDE_DEPRECATED_API' > hdp_$$incfile.cpp ; \
echo '#include "'unicode/$$incfile'.h"' >> hdp_$$incfile.cpp ; \
echo 'void junk(void);' >> hdp_$$incfile.cpp ; \
echo 'void junk(){}' >> hdp_$$incfile.cpp ; \
$(COMPILE.cc) -c $(cppflags) hdp_$$incfile.cpp || FAIL=1; \
done ; \
exit $$FAIL
@ -139,11 +139,11 @@ internaltest:
for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/pfiles.txt`; do \
incfile=`basename $$file .h` ; \
echo "$@ unicode/$$incfile.h" ; \
echo '#define U_HIDE_INTERNAL_API' > hin_$$incfile.c; \
echo '#include "'unicode/$$incfile'.h"' >> hin_$$incfile.c ; \
echo 'void junk(void);' >> hin_$$incfile.c ; \
echo 'void junk(){}' >> hin_$$incfile.c ; \
$(COMPILE.cc) -c $(cppflags) hin_$$incfile.c || FAIL=1 ; \
echo '#define U_HIDE_INTERNAL_API' > hin_$$incfile.cpp ; \
echo '#include "'unicode/$$incfile'.h"' >> hin_$$incfile.cpp ; \
echo 'void junk(void);' >> hin_$$incfile.cpp ; \
echo 'void junk(){}' >> hin_$$incfile.cpp ; \
$(COMPILE.cc) -c $(cppflags) hin_$$incfile.cpp || FAIL=1 ; \
done ; \
exit $$FAIL
@ -151,11 +151,11 @@ obsoletetest:
@FAIL=0;for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/pfiles.txt`; do \
incfile=`basename $$file .h` ; \
echo "$@ unicode/$$incfile.h" ; \
echo '#define U_HIDE_OBSOLETE_API' > hob_$$incfile.c; \
echo '#include "'unicode/$$incfile'.h"' >> hob_$$incfile.c ; \
echo 'void junk(void);' >> hob_$$incfile.c ; \
echo 'void junk(){}' >> hob_$$incfile.c ; \
$(COMPILE.cc) -c $(cppflags) hob_$$incfile.c || FAIL=1 ; \
echo '#define U_HIDE_OBSOLETE_API' > hob_$$incfile.cpp ; \
echo '#include "'unicode/$$incfile'.h"' >> hob_$$incfile.cpp ; \
echo 'void junk(void);' >> hob_$$incfile.cpp ; \
echo 'void junk(){}' >> hob_$$incfile.cpp ; \
$(COMPILE.cc) -c $(cppflags) hob_$$incfile.cpp || FAIL=1 ; \
done ; \
exit $$FAIL

View file

@ -34,8 +34,8 @@ BUILDDIR := $(BUILDDIR:test\\intltest/../../=)
# Simplify the path for Windows 98
BUILDDIR := $(BUILDDIR:TEST\\INTLTEST/../../=)
CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/tools/ctestfw
CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT= -DUNISTR_FROM_STRING_EXPLICIT=
CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/tools/ctestfw
CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT= -DUNISTR_FROM_STRING_EXPLICIT= -DUCHAR_TYPE=char16_t
DEFS += -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"'
LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) $(LIB_THREAD)
@ -61,7 +61,12 @@ windttst.o winnmtst.o winutil.o csdetest.o tzrulets.o tzoffloc.o tzfmttst.o ssea
tufmtts.o itspoof.o simplethread.o bidiconf.o locnmtst.o dcfmtest.o alphaindextst.o listformattertest.o genderinfotest.o compactdecimalformattest.o regiontst.o \
reldatefmttest.o simpleformattertest.o measfmttest.o numfmtspectest.o unifiedcachetest.o quantityformattertest.o \
scientificnumberformattertest.o datadrivennumberformattestsuite.o \
numberformattesttuple.o numberformat2test.o pluralmaptest.o
numberformattesttuple.o pluralmaptest.o \
numbertest_affixutils.o numbertest_api.o numbertest_decimalquantity.o \
numbertest_modifiers.o numbertest_patternmodifier.o numbertest_patternstring.o \
numbertest_stringbuilder.o numbertest_stringsegment.o \
numbertest_parse.o numbertest_doubleconversion.o numbertest_skeletons.o \
static_unisets_test.o numfmtdatadriventest.o numbertest_range.o erarulestest.o
DEPS = $(OBJECTS:.o=.d)

View file

@ -34,7 +34,7 @@ BUILDDIR := $(BUILDDIR:test\\iotest/../../=)
# Simplify the path for Windows 98
BUILDDIR := $(BUILDDIR:TEST\\IOTEST/../../=)
CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/io
CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/io
CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT= -DUNISTR_FROM_STRING_EXPLICIT=
DEFS += -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"'
LIBS = $(LIBCTESTFW) $(LIBICUTOOLUTIL) $(LIBICUIO) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)

View file

@ -59,7 +59,7 @@ distclean-local: clean-local
$(RMV) Makefile
invoke check-local: all-local
ICU_DATA=$${ICU_DATA:-$(top_builddir)/data/} TZ=PST8PDT $(INVOKE) ./$(TARGET) ./howexpensive.xml
ICU_DATA=$${ICU_DATA:-$(top_builddir)/data/} TZ=PST8PDT $(INVOKE) ./$(TARGET) -f ./howexpensive.xml
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \

View file

@ -17,17 +17,20 @@ include $(top_builddir)/icudefs.mk
subdir = test/perf/normperf
## Extra files to remove for 'make clean'
CLEANFILES = *~ $(DEPS)
CLEANFILES = *~ $(DEPS) $(SIMPLE_DEPS)
## Target information
TARGET = normperf
SIMPLE = simplenormperf
CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/tools/ctestfw
LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M)
OBJECTS = normperf.o
SIMPLE_OBJ = simplenormperf.o
DEPS = $(OBJECTS:.o=.d)
SIMPLE_DEPS = $(SIMPLE_OBJ:.o=.d)
## List of phony targets
.PHONY : all all-local install install-local clean clean-local \
@ -44,7 +47,7 @@ distclean : distclean-local
dist: dist-local
check: all check-local
all-local: $(TARGET)
all-local: $(TARGET) $(SIMPLE)
install-local:
@ -52,7 +55,7 @@ dist-local:
clean-local:
test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
$(RMV) $(OBJECTS) $(TARGET)
$(RMV) $(OBJECTS) $(SIMPLE_OBJ) $(TARGET) $(SIMPLE)
distclean-local: clean-local
$(RMV) Makefile
@ -67,16 +70,21 @@ $(TARGET) : $(OBJECTS)
$(LINK.cc) -o $@ $^ $(LIBS)
$(POST_BUILD_STEP)
$(SIMPLE) : $(SIMPLE_OBJ)
$(LINK.cc) -o $@ $^ $(LIBS)
$(POST_BUILD_STEP)
invoke:
ICU_DATA=$${ICU_DATA:-$(top_builddir)/data/} TZ=PST8PDT $(INVOKE) $(INVOCATION)
ifeq (,$(MAKECMDGOALS))
-include $(DEPS)
-include $(SIMPLE_DEPS)
else
ifneq ($(patsubst %clean,,$(MAKECMDGOALS)),)
ifneq ($(patsubst %install,,$(MAKECMDGOALS)),)
-include $(DEPS)
-include $(SIMPLE_DEPS)
endif
endif
endif