--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -67,23 +67,16 @@ RCFLAGS += -DMOZ_SUITE -I$(srcdir)
else
RCFLAGS += -DMOZ_SUITE --include-dir $(srcdir)
endif
ifdef DEBUG
RCFLAGS += -DDEBUG
endif
endif
-ifeq ($(OS_ARCH),OS2)
-RESFILE = splashos2.res
-RCFLAGS += -DMOZ_SUITE
-RCFLAGS += -i $(MOZILLA_SRCDIR)/toolkit/xre
-RCFLAGS += -DSEAMONKEY_ICO=\"$(DIST)/branding/seamonkey.ico\"
-endif
-
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),WINNT)
#
# Control the default heap size.
# This is the heap returned by GetProcessHeap().
# As we use the CRT heap, the default size is too large and wastes VM.
#
@@ -104,29 +97,29 @@ endif
libs::
ifeq ($(OS_ARCH),WINNT)
$(EXIT_ON_ERROR) \
$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/suite/installer/license.txt > $(DIST)/bin/license.txt
else
$(INSTALL) $(IFLAGS1) $(topsrcdir)/suite/installer/license.txt $(DIST)/bin/
endif
-ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
+ifneq ($(OS_ARCH),WINNT)
libs::
cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
endif
endif # LIBXUL_SDK
libs:: blocklist.xml
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
-ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
+ifneq (,$(filter-out WINNT Darwin,$(OS_ARCH)))
$(MOZ_APP_NAME).1: seamonkey.man.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
@sed -e "s|\@bindir\@|$(bindir)|g" -e "s|\@mozappdir\@|$(mozappdir)|g" \
-e "s|\@MOZ_APP_DISPLAYNAME\@|$(MOZ_APP_DISPLAYNAME)|g" \
-e "s|\@MOZ_APP_NAME\@|$(MOZ_APP_NAME)|g" \
-e "s|\@MOZ_APP_VERSION\@|${MOZ_APP_VERSION}|g" < $< > $@
libs:: $(MOZ_APP_NAME).1
$(INSTALL) $< $(DIST)/man/man1
--- a/suite/app/nsSuiteApp.cpp
+++ b/suite/app/nsSuiteApp.cpp
@@ -87,17 +87,17 @@ static bool IsArg(const char* arg, const
{
if (*arg == '-')
{
if (*++arg == '-')
++arg;
return !strcasecmp(arg, s);
}
-#if defined(XP_WIN) || defined(XP_OS2)
+#if defined(XP_WIN)
if (*arg == '/')
return !strcasecmp(++arg, s);
#endif
return false;
}
/**
deleted file mode 100644
--- a/suite/app/splashos2.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include <os2.h>
-#include "nsNativeAppSupportOS2.h"
-
-ICON 1 SEAMONKEY_ICO
-
-STRINGTABLE DISCARDABLE
-BEGIN
- ID_DDE_APPLICATION_NAME, "Mozilla"
-END
-
-#ifdef MOZ_STATIC_BUILD
-#include "wdgtos2rc.h"
-
-POINTER IDC_SELECTANCHOR "..\\..\\mozilla\\widget\\src\\os2\\res\\select.ptr"
-POINTER IDC_GRAB "..\\..\\mozilla\\widget\\src\\os2\\res\\grab.ptr"
-POINTER IDC_GRABBING "..\\..\\mozilla\\widget\\src\\os2\\res\\grabbing.ptr"
-POINTER IDC_CELL "..\\..\\mozilla\\widget\\src\\os2\\res\\cell.ptr"
-POINTER IDC_COPY "..\\..\\mozilla\\widget\\src\\os2\\res\\copy.ptr"
-POINTER IDC_ALIAS "..\\..\\mozilla\\widget\\src\\os2\\res\\aliasb.ptr"
-POINTER IDC_ZOOMIN "..\\..\\mozilla\\widget\\src\\os2\\res\\zoom_in.ptr"
-POINTER IDC_ZOOMOUT "..\\..\\mozilla\\widget\\src\\os2\\res\\zoom_out.ptr"
-
-POINTER IDC_ARROWWAIT "..\\..\\mozilla\\widget\\src\\os2\\res\\arrow_wait.ptr"
-POINTER IDC_CROSS "..\\..\\mozilla\\widget\\src\\os2\\res\\crosshair.ptr"
-POINTER IDC_HELP "..\\..\\mozilla\\widget\\src\\os2\\res\\help.ptr"
-POINTER IDC_NONE "..\\..\\mozilla\\widget\\src\\os2\\res\\none.ptr"
-
-ICON IDC_DNDURL "..\\..\\mozilla\\widget\\src\\os2\\res\\dndurl.ico"
-ICON IDC_DNDTEXT "..\\..\\mozilla\\widget\\src\\os2\\res\\dndtext.ico"
-#endif
-
--- a/suite/branding/nightly/Makefile.in
+++ b/suite/branding/nightly/Makefile.in
@@ -7,18 +7,18 @@ DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# Note: mac icons are handled in /suite/app during the final application
# packaging
-ifneq (,$(filter windows os2 gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
-ifneq (,$(filter windows os2,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter windows gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
ICON_SUFFIX=.ico
else
ICON_SUFFIX=.png
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ICON_DIR=gtk
else
@@ -98,11 +98,8 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
$(NSINSTALL) -D $(DIST)/branding
$(NSINSTALL) -D $(DIST)/branding/icons
cp $(srcdir)/icons/mac/document.icns $(DIST)/branding/icons/document.icns
cp $(srcdir)/icons/mac/seamonkey.icns $(DIST)/branding/icons/seamonkey.icns
cp $(srcdir)/package/mac/dsstore $(DIST)/branding/dsstore
cp $(srcdir)/package/mac/background.png $(DIST)/branding/background.png
cp $(srcdir)/package/mac/disk.icns $(DIST)/branding/disk.icns
endif
-ifeq ($(OS_ARCH),OS2)
- cp $(srcdir)/icons/os2/seamonkey.ico $(DIST)/branding/seamonkey.ico
-endif
deleted file mode 100644
index 0b49b012922aaeaaef76f24026020aea94dde446..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 17940f4057b846b5e10b941ffd4b117ef62d1cc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b0822a270448705f2e9aa7cce3080ddff95e2d3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 82a253d8e8c633e3b4cab6ef634e57c4aff1ca71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3b7e9791072fa83024d6f07e07bccecb7d5beedf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index dfbf2ae64b37f9af1e5516a5f93fb99e5d896b7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index bcd829662012bc627ee09931c33df1771b5122f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 958d68a85f4e616e1fcea7ff30f1097e2e2c30a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2e4cfa48d37bbfb151df2a4011a89cc41a3c2840..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index aa5a0d6a40d94937f63f0c75c131d68db24cb70a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 243f1cee2f7573402a81d058904202c54bd0980a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index cdefaae99ac7d57ed81a60f1e6df7461590d49ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index fd6ca24544b7187fca99e69603361de67c2a6714..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7d93c035cc7bb759dcb6ab83f412a840300fed17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3b69d60ca194dd25ebf6a0d95e51d5116e5497fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index cdefaae99ac7d57ed81a60f1e6df7461590d49ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1ae72c2721b85b89a5500b4b8212f755f8cd2a64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/suite/browser/jar.mn
+++ b/suite/browser/jar.mn
@@ -34,24 +34,19 @@ comm.jar:
#ifdef XP_MACOSX
content/navigator/platformNavigationBindings.xul (mac/platformNavigationBindings.xul)
content/navigator/platformMailOverlay.xul (mac/platformMailOverlay.xul)
#else
#ifdef XP_WIN32
content/navigator/platformNavigationBindings.xul (win/platformNavigationBindings.xul)
content/navigator/platformMailOverlay.xul (win/platformMailOverlay.xul)
#else
-#ifdef XP_OS2
- content/navigator/platformNavigationBindings.xul (win/platformNavigationBindings.xul)
- content/navigator/platformMailOverlay.xul (win/platformMailOverlay.xul)
-#else
content/navigator/platformNavigationBindings.xul (unix/platformNavigationBindings.xul)
content/navigator/platformMailOverlay.xul (unix/platformMailOverlay.xul)
#endif
#endif
-#endif
content/navigator/pageinfo/feeds.js (pageinfo/feeds.js)
content/navigator/pageinfo/feeds.xml (pageinfo/feeds.xml)
content/navigator/pageinfo/pageInfo.css (pageinfo/pageInfo.css)
content/navigator/pageinfo/pageInfo.js (pageinfo/pageInfo.js)
content/navigator/pageinfo/pageInfo.xul (pageinfo/pageInfo.xul)
content/navigator/pageinfo/permissions.js (pageinfo/permissions.js)
content/navigator/pageinfo/security.js (pageinfo/security.js)
--- a/suite/common/jar.mn
+++ b/suite/common/jar.mn
@@ -93,23 +93,19 @@ comm.jar:
content/communicator/viewZoomOverlay.xul
content/communicator/viewZoomOverlay.js
#ifdef XP_MACOSX
content/communicator/platformCommunicatorOverlay.xul (mac/platformCommunicatorOverlay.xul)
#else
#ifdef XP_WIN32
* content/communicator/platformCommunicatorOverlay.xul (win/platformCommunicatorOverlay.xul)
#else
-#ifdef XP_OS2
-* content/communicator/platformCommunicatorOverlay.xul (win/platformCommunicatorOverlay.xul)
-#else
content/communicator/platformCommunicatorOverlay.xul (unix/platformCommunicatorOverlay.xul)
#endif
#endif
-#endif
content/communicator/bindings/findbar.xml (bindings/findbar.xml)
content/communicator/bindings/general.xml (bindings/general.xml)
content/communicator/bindings/notification.xml (bindings/notification.xml)
content/communicator/bindings/toolbar.xml (bindings/toolbar.xml)
* content/communicator/bindings/prefwindow.xml (bindings/prefwindow.xml)
content/communicator/bookmarks/bm-panel.js (bookmarks/bm-panel.js)
content/communicator/bookmarks/bm-panel.xul (bookmarks/bm-panel.xul)
content/communicator/bookmarks/bm-props.js (bookmarks/bm-props.js)
--- a/suite/configure.in
+++ b/suite/configure.in
@@ -11,17 +11,17 @@ AC_SUBST(MOZ_COMPOSER)
AC_SUBST(SEAMONKEY_VERSION)
dnl Optional parts of the build.
AC_SUBST(MOZ_MORK)
if test "$MOZ_MORK"; then
AC_DEFINE(MOZ_MORK)
MORK_MODULE="MODULE(nsMorkModule)"
fi
-if test "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2"; then
+if test "$OS_ARCH" != "WINNT"; then
MOZ_MOVEMAIL=1
HAVE_MOVEMAIL=1
AC_DEFINE(HAVE_MOVEMAIL)
fi
AC_SUBST(MOZ_MOVEMAIL)
dnl Get other versions (for the calendar plugin)
if test "$COMM_BUILD" = "1"; then
@@ -59,18 +59,16 @@ MOZ_ARG_DISABLE_BOOL(ldap,
if test "$MOZ_LDAP_XPCOM"; then
LDAP_CFLAGS='-I${DIST}/public/ldap'
if test "$OS_ARCH" = "WINNT"; then
if test -n "$GNU_CC"; then
LDAP_LIBS='-L$(DIST)/lib -lnsldap32v60 -lnsldappr32v60 -lnsldif32v60'
else
LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)nsldap32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldappr32v60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)nsldif32v60.${IMPORT_LIB_SUFFIX}'
fi
- elif test "$OS_ARCH" = "OS2"; then
- LDAP_LIBS='$(DIST)/lib/$(LIB_PREFIX)ldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)prldap60.${IMPORT_LIB_SUFFIX} $(DIST)/lib/$(LIB_PREFIX)ldif60.${IMPORT_LIB_SUFFIX}'
else
LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap60 -lprldap60 -lldif60'
fi
LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
fi
AC_SUBST(MOZ_LDAP_XPCOM)
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -105,20 +105,16 @@ endif
ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
DEFINES += -DMOZ_SHARED_MOZGLUE=1
endif
ifneq (en-US, $(AB_CD))
DEFINES += -DLOCALE_BUILD=1
endif
-ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
-DEFINES += -DWIN_OR_OS2=1
-endif
-
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = package-manifest
$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $< -o $@)
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -105,36 +105,32 @@
@BINPATH@/msvcp110.dll
@BINPATH@/msvcr110.dll
#endif
#endif
#endif
[browser]
; [Base Browser Files]
-#ifdef WIN_OR_OS2
+#ifdef XP_WIN32
@BINPATH@/@MOZ_APP_NAME@.exe
#else
@BINPATH@/@MOZ_APP_NAME@-bin
@BINPATH@/@MOZ_APP_NAME@
#endif
@BINPATH@/application.ini
@BINPATH@/platform.ini
#ifdef MOZ_UPDATER
@BINPATH@/update-settings.ini
#endif
-#ifdef XP_OS2
-@BINPATH@/@DLL_PREFIX@mozsqlt3@DLL_SUFFIX@
-#else
#ifndef MOZ_NATIVE_SQLITE
#ifndef MOZ_FOLD_LIBS
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
#endif
#endif
-#endif
@BINPATH@/license.txt
@BINPATH@/blocklist.xml
#ifdef UNIX_BUT_NOT_MAC
@BINPATH@/mozilla-xremote-client
@BINPATH@/run-mozilla.sh
#endif
; [Components]
@@ -538,43 +534,41 @@
@BINPATH@/chrome/icons/default/main-window48.png
@BINPATH@/chrome/icons/default/places.png
@BINPATH@/chrome/icons/default/places16.png
@BINPATH@/chrome/icons/default/places48.png
@BINPATH@/chrome/icons/default/seamonkey.png
#ifdef MOZ_UPDATER
@BINPATH@/icons/updater.png
#endif
-#elifdef WIN_OR_OS2
+#elifdef XP_WIN32
@BINPATH@/chrome/icons/default/bookmarkproperties.ico
@BINPATH@/chrome/icons/default/downloadManager.ico
@BINPATH@/chrome/icons/default/editorWindow.ico
@BINPATH@/chrome/icons/default/findBookmarkWindow.ico
@BINPATH@/chrome/icons/default/findHistoryWindow.ico
+@BINPATH@/chrome/icons/default/gif-file.ico
@BINPATH@/chrome/icons/default/history-window.ico
+@BINPATH@/chrome/icons/default/html-file.ico
+@BINPATH@/chrome/icons/default/image-file.ico
+@BINPATH@/chrome/icons/default/jpeg-file.ico
@BINPATH@/chrome/icons/default/JSConsoleWindow.ico
@BINPATH@/chrome/icons/default/main-window.ico
+@BINPATH@/chrome/icons/default/misc-file.ico
@BINPATH@/chrome/icons/default/places.ico
-#ifdef XP_WIN32
-@BINPATH@/chrome/icons/default/gif-file.ico
-@BINPATH@/chrome/icons/default/html-file.ico
-@BINPATH@/chrome/icons/default/misc-file.ico
-@BINPATH@/chrome/icons/default/image-file.ico
-@BINPATH@/chrome/icons/default/jpeg-file.ico
@BINPATH@/chrome/icons/default/script-file.ico
@BINPATH@/chrome/icons/default/xml-file.ico
@BINPATH@/chrome/icons/default/xul-file.ico
#endif
-#endif
; Although venkman-window is an extension, its icon is still suite-specific
#ifdef MOZ_GTK2
@BINPATH@/chrome/icons/default/venkman-window.png
@BINPATH@/chrome/icons/default/venkman-window16.png
@BINPATH@/chrome/icons/default/venkman-window48.png
-#elifdef WIN_OR_OS2
+#elifdef XP_WIN32
@BINPATH@/chrome/icons/default/venkman-window.ico
#endif
; [Default Preferences]
; All the browser/general pref files must be part of base to prevent migration bugs
@BINPATH@/@PREF_DIR@/browser-prefs.js
#ifdef LIBXUL_SDK
@BINPATH@/@PREF_DIR@/channel-prefs.js
@@ -710,23 +704,16 @@ bin/libfreebl_32int64_3.so
#endif
#endif
@BINPATH@/crashreporter-override.ini
#ifdef MOZ_CRASHREPORTER_INJECTOR
@BINPATH@/breakpadinjector.dll
#endif
#endif
-; [OS/2]
-#ifdef XP_OS2
-@BINPATH@/MozSounds.cmd
-@BINPATH@/*.xqs
-@BINPATH@/components/*.xqs
-#endif
-
[mail]
; MailNews component xpts
@BINPATH@/components/addrbook.xpt
@BINPATH@/components/nsAddrbook.manifest
@BINPATH@/components/fts3tok.xpt
@BINPATH@/components/import.xpt
@BINPATH@/components/ldapComponents.manifest
@BINPATH@/components/mailview.xpt
@@ -784,17 +771,17 @@ bin/libfreebl_32int64_3.so
@BINPATH@/chrome/icons/default/addressbookWindow16.png
@BINPATH@/chrome/icons/default/addressbookWindow48.png
@BINPATH@/chrome/icons/default/messengerWindow.png
@BINPATH@/chrome/icons/default/messengerWindow16.png
@BINPATH@/chrome/icons/default/messengerWindow48.png
@BINPATH@/chrome/icons/default/msgcomposeWindow.png
@BINPATH@/chrome/icons/default/msgcomposeWindow16.png
@BINPATH@/chrome/icons/default/msgcomposeWindow48.png
-#elifdef WIN_OR_OS2
+#elifdef XP_WIN32
@BINPATH@/chrome/icons/default/abcardWindow.ico
@BINPATH@/chrome/icons/default/ablistWindow.ico
@BINPATH@/chrome/icons/default/addressbookWindow.ico
@BINPATH@/chrome/icons/default/messengerWindow.ico
@BINPATH@/chrome/icons/default/msgcomposeWindow.ico
#endif
; [MailNews Default Preferences]
@@ -830,17 +817,17 @@ bin/libfreebl_32int64_3.so
[chatzilla]
#ifdef MOZ_OMNIJAR
@BINPATH@/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
#else
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/chatzilla@JAREXT@
#ifdef MOZ_GTK2
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm
-#elifdef WIN_OR_OS2
+#elifdef XP_WIN32
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.ico
#endif
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/components.list
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf
#endif
#ifdef LOCALE_BUILD
@@ -882,18 +869,16 @@ bin/libfreebl_32int64_3.so
@BINPATH@/extensions/inspector@mozilla.org/install.rdf
@BINPATH@/extensions/inspector@mozilla.org/chrome.manifest
@BINPATH@/extensions/inspector@mozilla.org/chrome/inspector@JAREXT@
#ifdef MOZ_GTK2
@BINPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
@BINPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
#elifdef XP_WIN32
@BINPATH@/extensions/inspector@mozilla.org/platform/WINNT/chrome/icons/default/winInspectorMain.ico
-#elifdef XP_OS2
-@BINPATH@/extensions/inspector@mozilla.org/platform/OS2/chrome/icons/default/winInspectorMain.ico
#endif
@BINPATH@/extensions/inspector@mozilla.org/components/components.list
@BINPATH@/extensions/inspector@mozilla.org/components/inspector-cmdline.js
@BINPATH@/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
#endif
[debugqa]
#ifdef MOZ_PACKAGE_DEBUGQA
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -166,28 +166,23 @@ components/walleteditor.xpt
components/walletpreview.xpt
components/@DLL_PREFIX@walletviewers@DLL_SUFFIX@
components/winhooks.xpt
#ifdef XP_WIN
components/wlltvwrs.dll
#endif
components/xml-rpc.xpt
components/@DLL_PREFIX@xmlextras@DLL_SUFFIX@
-#ifdef XP_OS2
-components/@DLL_PREFIX@xpconect@DLL_SUFFIX@
-components/@DLL_PREFIX@xpinstal@DLL_SUFFIX@
-#else
#ifdef XP_WIN
components/xpc3250.dll
components/xpinstal.dll
#else
components/@DLL_PREFIX@xpconnect@DLL_SUFFIX@
#endif
components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@
-#endif
components/xpti.dat
components/nsAboutAbout.js
components/nsAddonRepository.js
#ifdef XP_WIN
components/nsIQTScriptablePlugin.xpt
#endif
D3DCompiler_42.dll
d3dx9_42.dll
@@ -390,19 +385,17 @@ omni.jar
plugins/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.properties
plugins/MRJPlugin.plugin/Contents/PkgInfo
plugins/MRJPlugin.plugin/Contents/Resources/English.lproj/InfoPlist.strings
plugins/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc
regxpcom
run-mozilla.sh
updater.app/Contents/MacOS/updater.ini
#endif
-#ifdef XP_OS2
-plugins/npnulos2.dll
-#elifdef XP_WIN
+#ifdef XP_WIN
plugins/npnul32.dll
#elifdef XP_UNIX
plugins/libnullplugin.so
#endif
#ifdef XP_WIN
regxpcom.exe
#endif
res/arrow.gif
@@ -574,20 +567,17 @@ Throbber-small.gif
#ifdef XP_MACOSX
updater.app/
#else
updater@BIN_SUFFIX@
#endif
updater.ini
#endif
@DLL_PREFIX@xpcom@DLL_SUFFIX@
-#ifdef XP_OS2
- @DLL_PREFIX@xpcomcor@DLL_SUFFIX@
-#else
- @DLL_PREFIX@xpcom_core@DLL_SUFFIX@
+@DLL_PREFIX@xpcom_core@DLL_SUFFIX@
#endif
xpicleanup@BIN_SUFFIX@
@DLL_PREFIX@xpistub@DLL_SUFFIX@
#ifdef MOZ_OMNIJAR
chrome/be.jar
chrome/ca.jar
chrome/cs.jar
@@ -785,17 +775,16 @@ xpicleanup@BIN_SUFFIX@
extensions/inspector@mozilla.org/chrome/inspector.jar
extensions/inspector@mozilla.org/platform/
extensions/inspector@mozilla.org/platform/Linux/
extensions/inspector@mozilla.org/platform/Linux/chrome/
extensions/inspector@mozilla.org/platform/Linux/chrome/icons/
extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/
extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
- extensions/inspector@mozilla.org/platform/OS2/chrome/icons/default/winInspectorMain.ico
extensions/inspector@mozilla.org/platform/WINNT/chrome/icons/default/winInspectorMain.ico
extensions/inspector@mozilla.org/components/
extensions/inspector@mozilla.org/components/inspector-cmdline.js
extensions/inspector@mozilla.org/defaults/
extensions/inspector@mozilla.org/defaults/preferences/
extensions/inspector@mozilla.org/defaults/preferences/inspector.js
extensions/inspector@mozilla.org.xpi
extensions/langpack-ca@chatzilla.mozilla.org/chrome/chatzilla.jar
@@ -1158,38 +1147,26 @@ xpicleanup@BIN_SUFFIX@
; pre-libxul static mail library
components/@DLL_PREFIX@mail@DLL_SUFFIX@
; shared mail libraries
components/@DLL_PREFIX@addrbook@DLL_SUFFIX@
components/@DLL_PREFIX@bayesflt@DLL_SUFFIX@
components/@DLL_PREFIX@fts3tok@DLL_SUFFIX@
components/@DLL_PREFIX@mailview@DLL_SUFFIX@
components/@DLL_PREFIX@mime@DLL_SUFFIX@
-#ifdef XP_OS2
-components/mimeemit.dll
-#else
components/@DLL_PREFIX@mimeemitter@DLL_SUFFIX@
-#endif
components/@DLL_PREFIX@msgbase@DLL_SUFFIX@
-#ifdef XP_OS2
-components/msgcompo.dll
-#else
components/@DLL_PREFIX@msgcompose@DLL_SUFFIX@
-#endif
components/@DLL_PREFIX@msgdb@DLL_SUFFIX@
components/@DLL_PREFIX@msgimap@DLL_SUFFIX@
components/@DLL_PREFIX@msglocal@DLL_SUFFIX@
components/@DLL_PREFIX@msgmdn@DLL_SUFFIX@
components/@DLL_PREFIX@msgnews@DLL_SUFFIX@
components/@DLL_PREFIX@vcard@DLL_SUFFIX@
-#ifdef XP_OS2
-msgbsutl.dll
-#else
@DLL_PREFIX@msgbaseutil@DLL_SUFFIX@
-#endif
#ifdef XP_WIN
components/@DLL_PREFIX@jsd3250@DLL_SUFFIX@
#else
components/@DLL_PREFIX@jsd@DLL_SUFFIX@
#endif
; pre-static-build, pre-libxul shared libraries
components/@DLL_PREFIX@accessibility@DLL_SUFFIX@
--- a/suite/mailnews/jar.mn
+++ b/suite/mailnews/jar.mn
@@ -111,14 +111,11 @@ messenger.jar:
content/messenger/addressbook/pref-addressing.js (addrbook/prefs/pref-addressing.js)
content/messenger/addressbook/pref-addressing.xul (addrbook/prefs/pref-addressing.xul)
#ifdef XP_MACOSX
content/messenger/platformMailnewsOverlay.xul (mac/platformMailnewsOverlay.xul)
#else
#ifdef XP_WIN32
content/messenger/platformMailnewsOverlay.xul (win/platformMailnewsOverlay.xul)
#else
-#ifdef XP_OS2
- content/messenger/platformMailnewsOverlay.xul (win/platformMailnewsOverlay.xul)
-#else
content/messenger/platformMailnewsOverlay.xul (unix/platformMailnewsOverlay.xul)
#endif
#endif
--- a/suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp
+++ b/suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp
@@ -203,21 +203,16 @@ nsThunderbirdProfileMigrator::FillProfil
thunderbirdData->Append(NS_LITERAL_STRING("Thunderbird"));
#elif defined(XP_UNIX)
fileLocator->Get(NS_UNIX_HOME_DIR, NS_GET_IID(nsIFile),
getter_AddRefs(thunderbirdData));
thunderbirdData->Append(NS_LITERAL_STRING(".thunderbird"));
-#elif defined(XP_OS2)
- fileLocator->Get(NS_OS2_HOME_DIR, NS_GET_IID(nsIFile),
- getter_AddRefs(thunderbirdData));
-
- thunderbirdData->Append(NS_LITERAL_STRING("Thunderbird"));
#else
// On other OS just abort
return NS_ERROR_FILE_NOT_FOUND;
#endif
// Try profiles.ini first
return GetProfileDataFromProfilesIni(thunderbirdData,
mProfileNames,
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -52,21 +52,17 @@ classic.jar:
skin/classic/communicator/toolbar/toolbar-gradient22.png (mac/communicator/toolbar/toolbar-gradient22.png)
skin/classic/communicator/toolbar/toolbar-gradient34.png (mac/communicator/toolbar/toolbar-gradient34.png)
#else
skin/classic/communicator/aboutPrivateBrowsing.css (communicator/aboutPrivateBrowsing.css)
skin/classic/communicator/aboutSessionRestore.css (communicator/aboutSessionRestore.css)
skin/classic/communicator/button.css (communicator/button.css)
skin/classic/communicator/communicator.css (communicator/communicator.css)
skin/classic/communicator/helpOverlay.css (communicator/helpOverlay.css)
-#ifdef XP_OS2
- skin/classic/communicator/toolbar.css (os2/communicator/toolbar.css)
-#else
skin/classic/communicator/toolbar.css (communicator/toolbar.css)
-#endif
skin/classic/communicator/viewSourceOverlay.css (communicator/viewSourceOverlay.css)
skin/classic/communicator/bookmarks/bookmark-folder-closed.png (communicator/bookmarks/bookmark-folder-closed.png)
skin/classic/communicator/bookmarks/bookmark-folder-dis.png (communicator/bookmarks/bookmark-folder-dis.png)
skin/classic/communicator/bookmarks/bookmark-folder-open.png (communicator/bookmarks/bookmark-folder-open.png)
skin/classic/communicator/bookmarks/bookmarks.css (communicator/bookmarks/bookmarks.css)
skin/classic/communicator/bookmarks/bookmarksManager.css (communicator/bookmarks/bookmarksManager.css)
skin/classic/communicator/bookmarks/bookmarksMenu.png (communicator/bookmarks/bookmarksMenu.png)
skin/classic/communicator/bookmarks/bookmarksToolbar.css (communicator/bookmarks/bookmarksToolbar.css)
deleted file mode 100644
--- a/suite/themes/classic/os2/communicator/toolbar.css
+++ /dev/null
@@ -1,78 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* ===== toolbar.css ====================================================
- == Styles used by XUL grippytoolbar in addition to general toolbar styles.
- ======================================================================= */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* ::::: toolbar & menubar ::::: */
-
-.toolbar-holder {
- border: 0;
-}
-
-toolbaritem > menubar,
-toolbar > menubar {
- border-bottom: 0px none;
-}
-
-/* ::::: toolbargrippy ::::: */
-
-toolbargrippy {
- -moz-box-orient: vertical;
- -moz-box-align: center;
- border: 0;
- width: 10px;
- padding: 2px 1px;
- list-style-image: url("chrome://communicator/skin/toolbar/tbgrip-arrow.gif");
-}
-
-toolbargrippy:hover {
- background-color: ThreeDHighlight;
-}
-
-.toolbargrippy-texture {
- margin-top: 2px;
- width: 6px;
- background: url("chrome://communicator/skin/toolbar/tbgrip-texture.gif");
-}
-
-/* ::::: collapsed tray and grippies ::::: */
-
-toolbargrippy[tbgrippy-collapsed="true"] {
- -moz-box-orient: horizontal;
- border-left: 1px solid ThreeDHighlight;
- border-top: 1px solid ThreeDHighlight;
- border-right: 1px solid ThreeDShadow;
- border-bottom: 1px solid ThreeDShadow;
- width: 40px;
- height: 10px;
- padding: 1px 2px;
- list-style-image: url("chrome://communicator/skin/toolbar/tbgrip-arrow-clps.gif");
-}
-
-toolbargrippy[tbgrippy-collapsed="true"] > .toolbargrippy-texture {
- margin-top: 0;
- -moz-margin-start: 2px;
- width: 0px;
- height: 6px;
-}
-
-.collapsed-tray-spacer {
- /*border-bottom: 1px solid ThreeDShadow;*/
-}
-
-/* ::::: solid background status bar panel ::::: */
-
-.statusbarpanel-backgroundbox {
- -moz-box-align: stretch;
- padding: 0px;
-}
-
-.statusbarpanel-backgroundbox > .statusbarpanel-contentbox {
- padding: 0px 1px;
- -moz-box-align: center;
-}