patches/data.build.win.patch - Issue 822213003: ICU upgrade to 54.1 step 2

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: patches/data.build.win.patch

Issue 822213003: ICU upgrade to 54.1 step 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master

Patch Set: two more patches applied/updated Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« README.chromium ('K') | « patches/data.build.patch ('k') | patches/declspec.patch » ('j') | source/common/unicode/utypes.h » ('J')

OLD	NEW
1 Index: source/data/makedata.mak	1 diff --git a/source/data/makedata.mak b/source/data/makedata.mak

2 ===================================================================	2 index 5a4bdda..81de724 100644

3 --- source/data/makedata.mak» (revision 266014)	3 --- a/source/data/makedata.mak

4 +++ source/data/makedata.mak» (working copy)	4 +++ b/source/data/makedata.mak

5 @@ -478,7 +478,7 @@	5 @@ -500,7 +500,7 @@ COMMON_ICUDATA_ARGUMENTS=-f -e $(U_ICUDATA_NAME) -v $(ICU_PA CKAGE_MODE) -c -p $(

6 # Building the common dll in $(ICUBLD_PKG) uncondi tionally copies it to $(DLL_OUTPUT) too.	6 # Building the common dll in $(ICUBLD_PKG) uncondi tionally copies it to $(DLL_OUTPUT) too.

7 #	7 #

8 #############################################################################	8 #############################################################################

9 -ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat"	9 -ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat"

10 +ALL : GODATA "$(ICU_LIB_TARGET)"	10 +ALL : GODATA "$(ICU_LIB_TARGET)"

11 @echo All targets are up to date	11 @echo All targets are up to date

12	12

13 # The core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu)	13 # The core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu)

14 @@ -597,6 +597,7 @@	14 @@ -619,6 +619,7 @@ icu4j-data-install :

15 cd "$(ICUBLD_PKG)"	15 cd "$(ICUBLD_PKG)"

16 "$(ICUPBIN)\icupkg" -x * --list "$(ICUDATA_SOURCE_ARCHIVE)" > "$(ICUTMP) \icudata.lst"	16 "$(ICUPBIN)\icupkg" -x * --list "$(ICUDATA_SOURCE_ARCHIVE)" > "$(ICUTMP) \icudata.lst"

17 "$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) "$(ICUTMP)\icudata.lst"	17 "$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) "$(ICUTMP)\icudata.lst"

18 + editbin /NXCOMPAT /DYNAMICBASE "$(U_ICUDATA_NAME).dll"	18 + editbin /NXCOMPAT /DYNAMICBASE "$(U_ICUDATA_NAME).dll"

19 copy "$(U_ICUDATA_NAME).dll" "$(DLL_OUTPUT)"	19 copy "$(U_ICUDATA_NAME).dll" "$(DLL_OUTPUT)"

20 -@erase "$(U_ICUDATA_NAME).dll"	20 -@erase "$(U_ICUDATA_NAME).dll"

21 copy "$(ICUTMP)\$(ICUPKG).dat" "$(ICUOUT)\$(U_ICUDATA_NAME)$(U_ICUDATA_E NDIAN_SUFFIX).dat"	21 copy "$(ICUTMP)\$(ICUPKG).dat" "$(ICUOUT)\$(U_ICUDATA_NAME)$(U_ICUDATA_E NDIAN_SUFFIX).dat"

OLD	NEW