Bug 653765 - Remove dead WINCE support from SeaMonkey; (Bv1) WINCE.
authorSerge Gautherie <sgautherie.bz@free.fr>
Mon, 30 May 2011 03:39:47 +0200
changeset 8065 c6bf2e2ff84198ed0e5fc34b4eedcba3952d0328
parent 8064 41df0c16c211cf119c3e9f2c135c3eeb1135dc0e
child 8066 8b4036c5e3aa1bcd102bb3ed885e913cbb31197d
push id84
push userbugzilla@standard8.plus.com
push dateTue, 16 Aug 2011 21:25:04 +0000
treeherdercomm-beta@6970c86be3cd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs653765
Bug 653765 - Remove dead WINCE support from SeaMonkey; (Bv1) WINCE. r=Callek.
suite/app/Makefile.in
suite/browser/browser-prefs.js
suite/installer/package-manifest.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -60,17 +60,17 @@ ifdef MOZ_SOURCE_STAMP
 DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)"
 endif
 
 SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
 ifdef SOURCE_REPO
 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
 endif
 
-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 = nsSuiteApp.cpp
 
--- a/suite/browser/browser-prefs.js
+++ b/suite/browser/browser-prefs.js
@@ -595,25 +595,23 @@ pref("xpinstall.whitelist.add.36", "getp
 pref("lightweightThemes.update.enabled", true);
 
 // Customizable toolbar stuff
 pref("custtoolbar.personal_toolbar_folder", "");
 // Use a popup window for the customize toolbar UI
 pref("toolbar.customization.usesheet", false);
 
 #ifdef XP_WIN
-#ifndef WINCE
 pref("browser.taskbar.lists.enabled", true);
 pref("browser.taskbar.lists.frequent.enabled", true);
 pref("browser.taskbar.lists.recent.enabled", false);
 pref("browser.taskbar.lists.maxListItemCount", 7);
 pref("browser.taskbar.lists.tasks.enabled", true);
 pref("browser.taskbar.lists.refreshInSeconds", 30);
 #endif
-#endif
 
 pref("sidebar.customize.all_panels.url", "http://sidebar-rdf.netscape.com/%LOCALE%/sidebar-rdf/%SIDEBAR_VERSION%/all-panels.rdf");
 pref("sidebar.customize.directory.url", "http://dmoz.org/Netscape/Sidebar/");
 pref("sidebar.customize.more_panels.url", "http://dmoz.org/Netscape/Sidebar/");
 pref("sidebar.num_tabs_in_view", 8);
 
 pref("browser.throbber.url","chrome://navigator-region/locale/region.properties");
 
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -34,20 +34,18 @@
 @BINPATH@/defaults/profile/panels.rdf
 @BINPATH@/defaults/profile/chrome/*
 @BINPATH@/@PREF_DIR@/suite-l10n.js
 @BINPATH@/dictionaries/*
 @BINPATH@/searchplugins/*
 @BINPATH@/update.locale
 @BINPATH@/updater.ini
 #ifdef XP_WIN32
-#ifndef WINCE
 @BINPATH@/uninstall/helper.exe
 #endif
-#endif
 
 [xpcom]
 @BINPATH@/dependentlibs.list
 #ifndef MOZ_STATIC_JS
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
 @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
@@ -67,19 +65,17 @@
 #endif
 ; ANGLE GLES-on-D3D rendering library
 #ifdef MOZ_ANGLE
 @BINPATH@/libEGL.dll
 @BINPATH@/libGLESv2.dll
 @BINPATH@/@MOZ_D3DX9_DLL@
 @BINPATH@/@MOZ_D3DCOMPILER_DLL@
 #endif
-#ifdef WINCE
-@BINPATH@/mozce_shunt.dll
-#elifdef XP_WIN32
+#ifdef XP_WIN32
 #ifndef MOZ_MEMORY
 #ifndef MOZ_DEBUG
 #if _MSC_VER == 1400
 @BINPATH@/Microsoft.VC80.CRT.manifest
 @BINPATH@/msvcm80.dll
 @BINPATH@/msvcp80.dll
 @BINPATH@/msvcr80.dll
 #elif _MSC_VER == 1500
@@ -269,19 +265,17 @@
 @BINPATH@/components/startupcache.xpt
 @BINPATH@/components/storage.xpt
 @BINPATH@/components/@DLL_PREFIX@suite@DLL_SUFFIX@
 @BINPATH@/components/SuiteBrowser.manifest
 @BINPATH@/components/suitecommon.xpt
 @BINPATH@/components/SuiteCommon.manifest
 @BINPATH@/components/suitefeeds.xpt
 @BINPATH@/components/SuiteFeeds.manifest
-#ifndef WINCE
 @BINPATH@/components/suitemigration.xpt
-#endif
 @BINPATH@/components/toolkitplaces.manifest
 @BINPATH@/components/toolkitprofile.xpt
 #ifdef UNIX_BUT_NOT_MAC
 @BINPATH@/components/toolkitremote.xpt
 #endif
 @BINPATH@/components/toolkitsearch.manifest
 @BINPATH@/components/txmgr.xpt
 @BINPATH@/components/txtsvc.xpt
@@ -649,27 +643,16 @@ bin/libfreebl_32int64_3.so
 @BINPATH@/crashreporter.ini
 #ifdef XP_UNIX
 @BINPATH@/Throbber-small.gif
 #endif
 #endif
 @BINPATH@/crashreporter-override.ini
 #endif
 
-; [ActiveX]
-; ToDo: check if this is needed or works at all (Bug 524008)
-#ifdef WINCE
-#ifndef MOZ_NO_ACTIVEX_SUPPORT
-@BINPATH@/components/nsAxSecurityPolicy.js
-@BINPATH@/@PREF_DIR@/activex.js
-@BINPATH@/plugins/npmozax.dll
-@BINPATH@/plugins/nsIMozAxPlugin.xpt
-#endif
-#endif
-
 ; [OS/2]
 #ifdef XP_OS2
 @BINPATH@/MozSounds.cmd
 @BINPATH@/*.xqs
 @BINPATH@/components/*.xqs
 #endif
 
 [mail]