Skip to content

Commit 01908d0

Browse files
srl295jasnell
authored andcommittedOct 8, 2015
build: Intl: deps: bump ICU to 56.1 (GA)
* ICU 56 was just released yesterday. Update to it. * Notable changes: Unicode 8, CLDR 28, 2-3x number format perf, 20% improvement in Collator startup * more at http://site.icu-project.org/download/56 or in #2917 Also: * cleanup out/**/*.d and deps/icu on "make clean" * cleanup deps/icu on "vcbuild clean" When building from an non-clean directory, it's important to run `make clean` or `vcbuild clean` to remove the existing ICU 55 from the deps path before building. Fixes: #2917 PR-URL: #3281 Reviewed-By: James M Snell <[email protected]>
1 parent 8aa589c commit 01908d0

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed
 

‎Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ uninstall:
6767

6868
clean:
6969
-rm -rf out/Makefile $(NODE_EXE) $(NODE_G_EXE) out/$(BUILDTYPE)/$(NODE_EXE)
70-
@if [ -d out ]; then find out/ -name '*.o' -o -name '*.a' | xargs rm -rf; fi
70+
@if [ -d out ]; then find out/ -name '*.o' -o -name '*.a' -o -name '*.d' | xargs rm -rf; fi
7171
-rm -rf node_modules
72+
@if [ -d deps/icu ]; then echo deleting deps/icu; rm -rf deps/icu; fi
7273
-rm -f test.tap
7374

7475
distclean:

‎configure

+2-3
Original file line numberDiff line numberDiff line change
@@ -843,9 +843,8 @@ def glob_to_var(dir_base, dir_sub, patch_dir):
843843
def configure_intl(o):
844844
icus = [
845845
{
846-
'url': 'http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-src.zip',
847-
# from https://ssl.icu-project.org/files/icu4c/55.1/icu4c-src-55_1.md5:
848-
'md5': '4cddf1e1d47622fdd9de2cd7bb5001fd',
846+
'url': 'https://ssl.icu-project.org/files/icu4c/56.1/icu4c-56_1-src.zip',
847+
'md5': '61d71888f14bf00cc3e8a6f2c087d367',
849848
},
850849
]
851850
def icu_download(path):

‎vcbuild.bat

+5
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@ if "%i18n_arg%"=="full-icu" set i18n_arg=--with-intl=full-icu
9999
if "%i18n_arg%"=="small-icu" set i18n_arg=--with-intl=small-icu
100100
if "%i18n_arg%"=="intl-none" set i18n_arg=--with-intl=none
101101

102+
if not exist "%~dp0deps\icu" goto no-depsicu
103+
if "%target%"=="Clean" echo deleting %~dp0deps\icu
104+
if "%target%"=="Clean" rmdir /S /Q %~dp0deps\icu
105+
:no-depsicu
106+
102107
call :getnodeversion || exit /b 1
103108

104109
@rem Set environment for msbuild

0 commit comments

Comments
 (0)
Please sign in to comment.