Bug 955443 - Remove last vestiges of WINCE support, r=florian.
authorPatrick Cloke <clokep@gmail.com>
Thu, 03 Oct 2013 16:58:25 -0400
changeset 15491 938fb582b400ee57067f7574771f0bff0e0e0b48
parent 15490 5e24720a776590f5f521d1313f2fb62f01b676dd
child 15492 ab50f4fdc1333ffcd4a72a6af9f2edea7c66eed4
push id9778
push userflorian@queze.net
push dateSun, 12 Jan 2014 18:25:45 +0000
treeherdercomm-central@f81a23bfefcd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian
bugs955443
Bug 955443 - Remove last vestiges of WINCE support, r=florian.
im/app/Makefile.in
im/build.mk
im/themes/Makefile.in
im/themes/accounts.css
--- a/im/app/Makefile.in
+++ b/im/app/Makefile.in
@@ -41,27 +41,27 @@ DIRS		= profile
 
 PREF_JS_EXPORTS = \
     $(srcdir)/profile/all-instantbird.js \
     $(srcdir)/profile/channel-prefs.js \
     $(NULL)
 
 ifndef LIBXUL_SDK
 
-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
 
 CPPSRCS = nsMain.cpp
 else
 
-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 STUBNAME = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 STUBNAME = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 endif # LIBXUL_SDK
 
 DIST_FILES = application.ini
 
@@ -109,26 +109,18 @@ endif
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
 NSDISTMODE = copy
 
 include $(topsrcdir)/config/config.mk
 
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
-endif
-
-ifdef WINCE
-EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,corelibc)
-endif
 
 ifdef NS_TRACE_MALLOC
 EXTRA_DSO_LIBS += tracemalloc
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 # Extract the icons we care about embedding into the EXE
 embedded-icons::
@@ -137,17 +129,17 @@ embedded-icons::
 	$(call png2ico,$(topsrcdir)/chat/themes/offline-16.png,0,0,16,offline-16.ico)
 
 GARBAGE += available-16.ico away-16.ico offline-16.ico
 
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
 endif
 
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 RCINCLUDE = splash.rc
 ifndef GNU_CC
 RCFLAGS += -DMOZ_INSTANTBIRD -I$(srcdir)
 else
 RCFLAGS += -DMOZ_INSTANTBIRD --include-dir $(srcdir)
 endif
 endif
 
--- a/im/build.mk
+++ b/im/build.mk
@@ -29,17 +29,17 @@ BUILD_YEAR := $(shell echo $(BUILDID) | 
 BUILD_MONTH := $(shell echo $(BUILDID) | cut -c 5-6)
 BUILD_DAY := $(shell echo $(BUILDID) | cut -c 7-8)
 BUILD_HOUR := $(shell echo $(BUILDID) | cut -c 9-10)
 
 ifndef PKG_SUFFIX
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 PKG_SUFFIX = .dmg
 else
-ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 PKG_SUFFIX = .zip
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 PKG_SUFFIX = .tar.bz2
 else
 PKG_SUFFIX = .tar.gz
 endif
 endif
--- a/im/themes/Makefile.in
+++ b/im/themes/Makefile.in
@@ -4,13 +4,9 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef WINCE
-DEFINES += -DWINCE
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/im/themes/accounts.css
+++ b/im/themes/accounts.css
@@ -50,23 +50,16 @@ notification > hbox {
 }
 #noAccountDesc {
   font-size: 110%;
 }
 
 #accountlist {
   margin: 0 0;
   -moz-appearance: none;
-%ifdef WINCE
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-%else
 %ifndef XP_MACOSX
   border-bottom: 2px solid;
   -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
 %endif
 }
 
 #bottombuttons {
 %ifdef XP_MACOSX