Bug 1022702 - Slightly clean up ICU setup for windows debug builds. r=Callek a=bustagefix
authorEdmund Wong <ewong@pw-wspx.org>
Thu, 07 Aug 2014 16:34:56 +0800
changeset 20284 25048ccd6305c00d4f7f5ac1dba2388352414226
parent 20283 9e0bc6702db21cafa20a005a9c1f396fcdb519fa
child 20285 30bbf5ac51f4b480fe97f18e3ef1ebd3b140309f
push id1194
push userewong@pw-wspx.org
push dateThu, 07 Aug 2014 08:37:23 +0000
treeherdercomm-beta@25048ccd6305 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek, bustagefix
bugs1022702
Bug 1022702 - Slightly clean up ICU setup for windows debug builds. r=Callek a=bustagefix
suite/installer/Makefile.in
suite/installer/package-manifest.in
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -155,16 +155,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
+DEFINES += -DMOZ_ICU_DBG_SUFFIX=$(MOZ_ICU_DBG_SUFFIX)
 
 libs::
 	$(MAKE) -C $(DEPTH)/suite/locales langpack
 
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS = 
 else
 PKGCOMP_FIND_OPTS = -L
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -111,25 +111,19 @@
 @BINPATH@/msvcp110.dll
 @BINPATH@/msvcr110.dll
 #endif
 #endif
 #endif
 #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@