Bug 1288533 - Don't use separate ICU data file on Windows. r=ewong a=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sat, 23 Jul 2016 12:25:55 +0800
changeset 27253 0e8f0295298db6bc6ca5ee126459a30b19245950
parent 27252 d37be8bdb8e3ee6d1a124374bbd93db442cf69fc
child 27254 3904a4a0fdf58f2848030d9513172b7ffe6c963f
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersewong, IanN
bugs1288533
Bug 1288533 - Don't use separate ICU data file on Windows. r=ewong a=IanN
suite/installer/Makefile.in
suite/installer/package-manifest.in
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -180,16 +180,19 @@ LPROJ_ROOT := $(subst -,_,$(AB_CD))
 endif
 endif
 DEFINES += -DLPROJ_ROOT=$(LPROJ_ROOT)
 
 DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
 ifdef MOZ_SYSTEM_ICU
 DEFINES += -DMOZ_SYSTEM_ICU
 endif
+ifdef MOZ_ICU_DATA_ARCHIVE
+DEFINES += -DMOZ_ICU_DATA_ARCHIVE
+endif
 DEFINES += -DMOZ_ICU_DBG_SUFFIX=$(MOZ_ICU_DBG_SUFFIX)
 DEFINES += -DICU_DATA_FILE=$(ICU_DATA_FILE)
 ifdef CLANG_CXX
 DEFINES += -DCLANG_CXX
 endif
 ifdef CLANG_CL
 DEFINES += -DCLANG_CL
 endif
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -109,17 +109,17 @@
 #if MOZ_PACKAGE_MSVC_DLLS
 @BINPATH@/@MSVC_C_RUNTIME_DLL@
 @BINPATH@/@MSVC_CXX_RUNTIME_DLL@
 @BINPATH@/api-ms-win-*.dll
 @BINPATH@/ucrtbase.dll
 #endif
 #endif
 
-#ifndef MOZ_SYSTEM_ICU
+#ifdef MOZ_ICU_DATA_ARCHIVE
 @RESPATH@/@ICU_DATA_FILE@
 #endif
 
 [browser]
 ; [Base Browser Files]
 #ifdef XP_WIN
 @BINPATH@/@MOZ_APP_NAME@.exe
 #else