Port Bug 1014976 - Slightly clean up ICU setup for windows debug builds. rs=port-by-build-system-peer for bustage fix for CLOSED TREE
authorMark Banner <standard8@mozilla.com>
Mon, 09 Jun 2014 12:37:49 +0100
changeset 16313 79a088faa9e484087c7d3a0cb809b6f6d8327faa
parent 16312 54d3f853c2f8e84503ed054a35b8144922150f3a
child 16314 37140ce93570d2e753a817adca02e6dfb275d4e9
push id10189
push usermbanner@mozilla.com
push dateMon, 09 Jun 2014 11:38:05 +0000
treeherdercomm-central@79a088faa9e4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersport-by-build-system-peer
bugs1014976
Port Bug 1014976 - Slightly clean up ICU setup for windows debug builds. rs=port-by-build-system-peer for bustage fix for CLOSED TREE
mail/installer/Makefile.in
mail/installer/package-manifest.in
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -112,16 +112,17 @@ DEFINES += -DBINPATH=$(BINPATH)
 
 DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
 ifdef MOZ_NATIVE_ICU
 DEFINES += -DMOZ_NATIVE_ICU
 endif
 ifdef MOZ_SHARED_ICU
 DEFINES += -DMOZ_SHARED_ICU
 endif
+EFINES += -DMOZ_ICU_DBG_SUFFIX=$(MOZ_ICU_DBG_SUFFIX)
 
 libs::
 	$(MAKE) -C $(DEPTH)/mail/locales langpack
 
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS = 
 else
 PKGCOMP_FIND_OPTS = -L
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -109,25 +109,19 @@
 #ifdef MOZ_D3DCOMPILER_XP_DLL
 @BINPATH@/@MOZ_D3DCOMPILER_XP_DLL@
 #endif
 
 #endif # MOZ_ANGLE_RENDERER
 #ifndef MOZ_NATIVE_ICU
 #ifdef MOZ_SHARED_ICU
 #ifdef XP_WIN
-#ifdef MOZ_DEBUG
-@BINPATH@/icudtd@MOZ_ICU_VERSION@.dll
-@BINPATH@/icuind@MOZ_ICU_VERSION@.dll
-@BINPATH@/icuucd@MOZ_ICU_VERSION@.dll
-#else
-@BINPATH@/icudt@MOZ_ICU_VERSION@.dll
-@BINPATH@/icuin@MOZ_ICU_VERSION@.dll
-@BINPATH@/icuuc@MOZ_ICU_VERSION@.dll
-#endif
+@BINPATH@/icudt@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll
+@BINPATH@/icuin@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll
+@BINPATH@/icuuc@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll
 #elif defined(XP_MACOSX)
 @BINPATH@/libicudata.@MOZ_ICU_VERSION@.dylib
 @BINPATH@/libicui18n.@MOZ_ICU_VERSION@.dylib
 @BINPATH@/libicuuc.@MOZ_ICU_VERSION@.dylib
 #elif defined(XP_UNIX)
 @BINPATH@/libicudata.so.@MOZ_ICU_VERSION@
 @BINPATH@/libicui18n.so.@MOZ_ICU_VERSION@
 @BINPATH@/libicuuc.so.@MOZ_ICU_VERSION@