Bug 544321 Update c-c TB unified package manifest for OS/2. r=philringnalda
authorWalter Meinl <wuno@lsvw.de>
Mon, 29 Mar 2010 16:05:41 +0100
changeset 5315 1491c416905722c9f07aebc171b9e279a2393a6f
parent 5314 32adc634eb7cb81e6934cf0fdbebaf203c81f6af
child 5316 867fb51b75d88228d17d79b60c48883ece6d38e1
push idunknown
push userunknown
push dateunknown
reviewersphilringnalda
bugs544321
Bug 544321 Update c-c TB unified package manifest for OS/2. r=philringnalda
mail/installer/package-manifest.in
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -31,38 +31,46 @@
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
 @BINPATH@/update.locale
 @BINPATH@/updater.ini
 
 [xpcom]
 @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+#ifdef XP_OS2
+@BINPATH@/@DLL_PREFIX@xpcomcor@DLL_SUFFIX@
+#else
 @BINPATH@/@DLL_PREFIX@xpcom_core@DLL_SUFFIX@
+#endif
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
 #ifdef MOZ_IPC
 @BINPATH@/mozilla-runtime@BIN_SUFFIX@
 #endif
 #ifndef MOZILLA_1_9_2_BRANCH
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #elifdef XP_WIN32
 @BINPATH@/@DLL_PREFIX@js3250@DLL_SUFFIX@
 #else
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
-#ifdef XP_UNIX
+#ifndef XP_WIN32
 @BINPATH@/components/@DLL_PREFIX@jsd@DLL_SUFFIX@
 #else
 @BINPATH@/components/@DLL_PREFIX@jsd3250@DLL_SUFFIX@
 #endif
 #ifndef MOZILLA_1_9_2_BRANCH
+#ifndef XP_OS2
 @BINPATH@/components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@
-#elifdef XP_WIN32
+#else
+@BINPATH@/components/@DLL_PREFIX@xpinstal@DLL_SUFFIX@
+#endif
+#elifndef XP_UNIX
 @BINPATH@/components/@DLL_PREFIX@xpinstal@DLL_SUFFIX@
 #else
 @BINPATH@/components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@
 #endif
 #ifdef XP_WIN32
 #ifndef MOZ_MEMORY
 @BINPATH@/Microsoft.VC80.CRT.manifest
 @BINPATH@/msvcm80.dll
@@ -100,23 +108,32 @@
 #endif
 #endif
 @BINPATH@/application.ini
 @BINPATH@/platform.ini
 @BINPATH@/README.txt
 #ifdef MOZILLA_1_9_2_BRANCH
 @BINPATH@/@DLL_PREFIX@sqlite3@DLL_SUFFIX@
 #else
+#ifdef XP_OS2
+@BINPATH@/@DLL_PREFIX@mozsqlt3@DLL_SUFFIX@
+#else
 @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 #endif
+#endif
 #ifdef UNIX_BUT_NOT_MAC
 @BINPATH@/run-mozilla.sh
 @BINPATH@/icons/*.png
 #endif
 
+; [OS/2]
+#ifdef XP_OS2
+@BINPATH@/MozSounds.cmd
+#endif
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Mail Specific Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 @BINPATH@/defaults/messenger/mailViews.dat
 @BINPATH@/defaults/profile/localstore.rdf
 @BINPATH@/defaults/profile/prefs.js
 @BINPATH@/defaults/profile/mimeTypes.rdf
 
@@ -140,17 +157,19 @@
 @BINPATH@/components/import.xpt
 @BINPATH@/components/impComm4xMail.xpt
 @BINPATH@/components/mailview.xpt
 @BINPATH@/components/mailprofilemigration.xpt
 @BINPATH@/components/nsActivity.js
 @BINPATH@/components/nsActivityManager.js
 @BINPATH@/components/nsActivityManagerUI.js
 @BINPATH@/components/nsMailNewsCommandLineHandler.js
+#ifndef XP_OS2
 @BINPATH@/components/shellservice.xpt
+#endif
 @BINPATH@/components/xpcom_base.xpt
 @BINPATH@/components/xpcom_system.xpt
 @BINPATH@/components/xpcom_components.xpt
 @BINPATH@/components/xpcom_ds.xpt
 @BINPATH@/components/xpcom_io.xpt
 #ifndef MOZILLA_1_9_2_BRANCH
 @BINPATH@/components/xpcom_threads.xpt
 #elifdef XP_WIN32
@@ -160,17 +179,17 @@
 #endif
 @BINPATH@/components/xpcom_xpti.xpt
 @BINPATH@/chrome/toolkit.jar
 @BINPATH@/chrome/toolkit.manifest
 @BINPATH@/chrome/comm.jar
 @BINPATH@/chrome/comm.manifest
 @BINPATH@/chrome/messenger.jar
 @BINPATH@/chrome/messenger.manifest
-#ifdef XP_WIN32
+#ifndef XP_UNIX
 @BINPATH@/chrome/icons/default/abcardWindow.ico
 @BINPATH@/chrome/icons/default/addressbookWindow.ico
 @BINPATH@/chrome/icons/default/messengerWindow.ico
 @BINPATH@/chrome/icons/default/msgcomposeWindow.ico
 #elifdef UNIX_BUT_NOT_MAC
 @BINPATH@/chrome/icons/default/*.png
 #endif
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
@@ -188,17 +207,19 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 #ifdef XP_WIN32
 @BINPATH@/MapiProxy.dll
 @BINPATH@/mozMapi32.dll
 @BINPATH@/components/mapihook.xpt
 #endif
 @BINPATH@/components/mailContentHandler.js
 @BINPATH@/components/nsMailDefaultHandler.js
+#ifndef XP_OS2
 @BINPATH@/components/nsSetDefaultMail.js
+#endif
 @BINPATH@/components/offlineStartup.js
 @BINPATH@/components/steelApplication.js
 
 
 @BINPATH@/components/mdn-service.js
 
 @BINPATH@/components/smime-service.js
 @BINPATH@/components/msgsmime.xpt
@@ -640,58 +661,82 @@
 #else
 @BINPATH@/updater@BIN_SUFFIX@
 #endif
 
 ; [crash reporter]
 #ifdef XP_MACOSX
 @BINPATH@/crashreporter.app/
 #else
+#ifndef XP_OS2
 @BINPATH@/crashreporter@BIN_SUFFIX@
 @BINPATH@/crashreporter.ini
 #ifdef XP_UNIX
 @BINPATH@/Throbber-small.gif
 #endif
 #endif
+#endif
 
 ; GNOME hooks
 #ifdef MOZ_ENABLE_GNOME_COMPONENT
 @BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
 #endif
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; For packaging shared test builds
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 #ifndef MOZ_STATIC_BUILD
 #ifdef ACCESSIBILITY
+#ifdef XP_OS2
+@BINPATH@/components/@DLL_PREFIX@access@DLL_SUFFIX@
+#else
 @BINPATH@/components/@DLL_PREFIX@accessibility@DLL_SUFFIX@
 #endif
+#endif
 @BINPATH@/components/@DLL_PREFIX@appcomps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@auth@DLL_SUFFIX@
+#ifdef XP_OS2
+@BINPATH@/components/@DLL_PREFIX@autocfg@DLL_SUFFIX@
+#else
 @BINPATH@/components/@DLL_PREFIX@autoconfig@DLL_SUFFIX@
+#endif
 @BINPATH@/components/@DLL_PREFIX@caps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@chardet@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@chrome@DLL_SUFFIX@
 #ifndef MOZILLA_1_9_2_BRANCH
+#ifndef XP_OS2
 @BINPATH@/components/@DLL_PREFIX@commandlines@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@htmlpars@DLL_SUFFIX@
-#ifdef XP_WIN32
+#endif
+#ifndef XP_UNIX
 @BINPATH@/components/@DLL_PREFIX@mailcmp@DLL_SUFFIX@
 #else
 @BINPATH@/components/@DLL_PREFIX@mailcomps@DLL_SUFFIX@
 #endif
+#ifdef XP_OS2
+@BINPATH@/components/@DLL_PREFIX@cmdlines@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@gkparser@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@appshell@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@perms@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@spellchk@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@strgcmps@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@tkautoc@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@tkitcmps@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@xpautoc@DLL_SUFFIX@
+#else
 @BINPATH@/components/@DLL_PREFIX@nsappshell@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@permissions@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@storagecomps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@tkautocomplete@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
-#elifdef XP_WIN32
+#endif
+#elifndef XP_UNIX
 @BINPATH@/components/@DLL_PREFIX@cmdlines@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@gkparser@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@mailcmp@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@appshell@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@perms@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@spellchk@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@strgcmps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@tkautoc@DLL_SUFFIX@
@@ -707,32 +752,44 @@
 @BINPATH@/components/@DLL_PREFIX@storagecomps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@tkautocomplete@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
 #endif
 @BINPATH@/components/@DLL_PREFIX@composer@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@cookie@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@docshell@DLL_SUFFIX@
+#ifdef XP_OS2
+@BINPATH@/components/@DLL_PREFIX@embedcmp@DLL_SUFFIX@
+#else
 @BINPATH@/components/@DLL_PREFIX@embedcomponents@DLL_SUFFIX@
+#endif
 #ifdef UNIX_BUT_NOT_MAC
 @BINPATH@/components/@DLL_PREFIX@fileview@DLL_SUFFIX@
 #endif
+#ifdef XP_OS2
+@BINPATH@/components/@DLL_PREFIX@gkgfxthb@DLL_SUFFIX@
+#else
 @BINPATH@/components/@DLL_PREFIX@gkgfxthebes@DLL_SUFFIX@
+#endif
 @BINPATH@/components/@DLL_PREFIX@gklayout@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@gkplugin@DLL_SUFFIX@
 #ifdef XP_UNIX
 #ifdef XP_MACOSX
 @BINPATH@/components/@DLL_PREFIX@widget_mac@DLL_SUFFIX@
 #else
 @BINPATH@/components/@DLL_PREFIX@widget_gtk2@DLL_SUFFIX@
 #endif
 #else
+#ifdef XP_OS2
+@BINPATH@/components/@DLL_PREFIX@wdgtos2@DLL_SUFFIX@
+#else
 @BINPATH@/components/@DLL_PREFIX@gkwidget@DLL_SUFFIX@
 #endif
+#endif
 @BINPATH@/components/@DLL_PREFIX@i18n@DLL_SUFFIX@
 #ifndef UNIX_BUT_NOT_MAC
 @BINPATH@/components/@DLL_PREFIX@imgicon@DLL_SUFFIX@
 #endif
 @BINPATH@/components/@DLL_PREFIX@imglib2@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@import@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@intlapp@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@jar50@DLL_SUFFIX@
@@ -755,38 +812,55 @@
 #ifdef UNIX_BUT_NOT_MAC
 @BINPATH@/components/@DLL_PREFIX@remoteservice@DLL_SUFFIX@
 #endif
 @BINPATH@/components/@DLL_PREFIX@satchel@DLL_SUFFIX@
 #ifdef UNIX_BUT_NOT_MAC
 @BINPATH@/components/@DLL_PREFIX@system-pref@DLL_SUFFIX@
 #endif
 @BINPATH@/components/@DLL_PREFIX@txmgr@DLL_SUFFIX@
+#ifdef XP_OS2
+@BINPATH@/components/@DLL_PREFIX@mozuconv@DLL_SUFFIX@
+#else
 @BINPATH@/components/@DLL_PREFIX@uconv@DLL_SUFFIX@
+#endif
 @BINPATH@/components/@DLL_PREFIX@ucvmath@DLL_SUFFIX@
+#ifdef XP_OS2
+@BINPATH@/components/@DLL_PREFIX@ucdet@DLL_SUFFIX@
+#else
 @BINPATH@/components/@DLL_PREFIX@universalchardet@DLL_SUFFIX@
+#endif
+#ifndef XP_OS2
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
 @BINPATH@/components/@DLL_PREFIX@unixproxy@DLL_SUFFIX@
 #else
 @BINPATH@/components/@DLL_PREFIX@osxproxy@DLL_SUFFIX@
 #endif
 #else
 @BINPATH@/components/@DLL_PREFIX@windowsproxy@DLL_SUFFIX@
 #endif
+#endif
 @BINPATH@/components/@DLL_PREFIX@webbrwsr@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@windowds@DLL_SUFFIX@
 #ifdef XP_WIN32
 @BINPATH@/components/@DLL_PREFIX@xpc3250@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@xppref32@DLL_SUFFIX@
+#elifdef XP_OS2
+@BINPATH@/components/@DLL_PREFIX@xpconect@DLL_SUFFIX@
+@BINPATH@/components/@DLL_PREFIX@pref@DLL_SUFFIX@
 #else
 @BINPATH@/components/@DLL_PREFIX@xpconnect@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@pref@DLL_SUFFIX@
 #endif
+#ifdef XP_OS2
+@BINPATH@/components/@DLL_PREFIX@zipwrite@DLL_SUFFIX@
+#else
 @BINPATH@/components/@DLL_PREFIX@zipwriter@DLL_SUFFIX@
+#endif
 @BINPATH@/@DLL_PREFIX@gkgfx@DLL_SUFFIX@
 #ifdef UNIX_BUT_NOT_MAC
 @BINPATH@/@DLL_PREFIX@gfxpsshar@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@gtkxtbin@DLL_SUFFIX@
 #endif
 @BINPATH@/@DLL_PREFIX@mozz@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@thebes@DLL_SUFFIX@
 #ifdef XP_MACOSX