From 79ee08d9ac66232fed113e05dd4c15d79d0160ea Mon Sep 17 00:00:00 2001 From: "philringnalda%gmail.com" Date: Sat, 9 Feb 2008 03:25:44 +0000 Subject: [PATCH] Bug 415330 - XPInstall leftovers in package files, r=ted, a=blocker git-svn-id: svn://10.0.0.236/trunk@245291 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/installer/removed-files.in | 9 +++++++-- mozilla/browser/installer/unix/packages-static | 3 --- mozilla/browser/installer/windows/packages-static | 3 --- mozilla/mail/installer/Makefile.in | 1 - mozilla/mail/installer/removed-files.in | 8 ++++++++ mozilla/mail/installer/windows/packages-static | 2 -- mozilla/suite/installer/removed-files.in | 7 +++++++ mozilla/suite/installer/unix/packages | 3 --- mozilla/suite/installer/windows/packages | 3 --- 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/mozilla/browser/installer/removed-files.in b/mozilla/browser/installer/removed-files.in index 7e30245b8cc..c8271752184 100644 --- a/mozilla/browser/installer/removed-files.in +++ b/mozilla/browser/installer/removed-files.in @@ -39,7 +39,6 @@ searchplugins/yahoo.gif searchplugins/ #ifdef MOZ_ENABLE_LIBXUL @DLL_PREFIX@xpcom_core@DLL_SUFFIX@ -@DLL_PREFIX@xpistub@DLL_SUFFIX@ components/@DLL_PREFIX@jar50@DLL_SUFFIX@ #ifdef XP_WIN components/jsd3250.dll @@ -48,7 +47,6 @@ components/xpinstal.dll components/@DLL_PREFIX@jsd@DLL_SUFFIX@ components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@ #endif -components/@DLL_PREFIX@jar50@DLL_SUFFIX@ #else #ifdef XP_MACOSX XUL @@ -56,6 +54,7 @@ XUL @DLL_PREFIX@xul@DLL_SUFFIX@ #endif #endif +@DLL_PREFIX@xpistub@DLL_SUFFIX@ component.reg components/compreg.dat components/@DLL_PREFIX@myspell@DLL_SUFFIX@ @@ -529,6 +528,7 @@ extensions/talkback@mozilla.org/components/talkback/talkback.so #endif components/airbag.xpt components/nsUrlClassifierTable.js +res/cmessage.txt res/html/gopher-audio.gif res/html/gopher-binary.gif res/html/gopher-find.gif @@ -580,3 +580,8 @@ readme.txt #endif dictionaries/PL.dic dictionaries/PL.aff +#ifdef XP_WIN +xpicleanup.exe +#else +xpicleanup +#endif diff --git a/mozilla/browser/installer/unix/packages-static b/mozilla/browser/installer/unix/packages-static index 6ab117670a6..5508c57d4cc 100644 --- a/mozilla/browser/installer/unix/packages-static +++ b/mozilla/browser/installer/unix/packages-static @@ -35,7 +35,6 @@ bin/libplc4.so bin/libplds4.so bin/libxpcom.so bin/libxpcom_core.so -bin/libxpistub.so bin/libnspr4.so bin/libxul.so bin/components/libxpinstall.so @@ -50,9 +49,7 @@ bin/platform.ini bin/mozilla-xremote-client bin/run-mozilla.sh bin/plugins/libnullplugin.so -bin/res/cmessage.txt bin/res/effective_tld_names.dat -bin/xpicleanup bin/libsqlite3.so bin/README.txt bin/libjemalloc.so diff --git a/mozilla/browser/installer/windows/packages-static b/mozilla/browser/installer/windows/packages-static index 796f9a51b85..564893124ba 100644 --- a/mozilla/browser/installer/windows/packages-static +++ b/mozilla/browser/installer/windows/packages-static @@ -39,7 +39,6 @@ bin\nspr4.dll bin\xul.dll #else bin\xpcom_core.dll -bin\xpistub.dll bin\components\xpinstal.dll bin\components\jar50.dll #endif @@ -55,9 +54,7 @@ bin\@MOZ_APP_NAME@.exe bin\application.ini bin\platform.ini bin\plugins\npnul32.dll -bin\res\cmessage.txt bin\res\effective_tld_names.dat -bin\xpicleanup.exe bin\LICENSE bin\README.txt bin\sqlite3.dll diff --git a/mozilla/mail/installer/Makefile.in b/mozilla/mail/installer/Makefile.in index 005e76cbd53..208b99cc9fc 100644 --- a/mozilla/mail/installer/Makefile.in +++ b/mozilla/mail/installer/Makefile.in @@ -71,7 +71,6 @@ NO_PKG_FILES = \ res/arrow.gif \ res/arrowd.gif \ res/bloatcycle.html \ - res/cmessage.txt \ res/html \ res/loading-image.gif \ res/rdf \ diff --git a/mozilla/mail/installer/removed-files.in b/mozilla/mail/installer/removed-files.in index 8a357b1bcb4..e944dd5c3b0 100644 --- a/mozilla/mail/installer/removed-files.in +++ b/mozilla/mail/installer/removed-files.in @@ -201,6 +201,7 @@ isp/gmail.rdf components/@DLL_PREFIX@xpcom_compat_c@DLL_SUFFIX@ @DLL_PREFIX@xpcom_compat@DLL_SUFFIX@ @DLL_PREFIX@zlib@DLL_SUFFIX@ +@DLL_PREFIX@xpistub@DLL_SUFFIX@ #Remove Talkback files from old location (in case user updates from 1.0.x) components/BrandRes.dll components/fullsoft.dll @@ -228,6 +229,7 @@ components/myspell/en-US.dic components/myspell/en-US.aff regxpcom.exe components/xmlextras.xpt +res/cmessage.txt res/html/gopher-audio.gif res/html/gopher-binary.gif res/html/gopher-find.gif @@ -295,3 +297,9 @@ extensions/talkback@mozilla.org/components/talkback.so #endif components/airbag.xpt components/nsUrlClassifierTable.js +components/nsScriptableIO.js +#ifdef XP_WIN +xpicleanup.exe +#else +xpicleanup +#endif diff --git a/mozilla/mail/installer/windows/packages-static b/mozilla/mail/installer/windows/packages-static index 2126920f8b6..d5dae89f863 100644 --- a/mozilla/mail/installer/windows/packages-static +++ b/mozilla/mail/installer/windows/packages-static @@ -15,7 +15,6 @@ bin\isp\@AB_CD@\* [xpcom] bin\xpcom.dll bin\xpcom_core.dll -bin\xpistub.dll bin\components\jar50.dll bin\nspr4.dll bin\plc4.dll @@ -39,7 +38,6 @@ bin\components\newsblog.js [mail] -bin\xpicleanup.exe bin\thunderbird.exe bin\application.ini bin\platform.ini diff --git a/mozilla/suite/installer/removed-files.in b/mozilla/suite/installer/removed-files.in index f79ffa6968b..752ac286681 100644 --- a/mozilla/suite/installer/removed-files.in +++ b/mozilla/suite/installer/removed-files.in @@ -64,3 +64,10 @@ components/search.xpt components/@DLL_PREFIX@srchsvc@DLL_SUFFIX@ components/urlwidgt.xpt components/venkman-service.js +@DLL_PREFIX@xpistub@DLL_SUFFIX@ +res/cmessage.txt +#ifdef XP_WIN +xpicleanup.exe +#else +xpicleanup +#endif diff --git a/mozilla/suite/installer/unix/packages b/mozilla/suite/installer/unix/packages index 3ec8c5b7e6e..2b63a6ec3d5 100644 --- a/mozilla/suite/installer/unix/packages +++ b/mozilla/suite/installer/unix/packages @@ -36,7 +36,6 @@ bin/libplds4.so bin/libthebes.so bin/libxpcom.so bin/libxpcom_core.so -bin/libxpistub.so bin/libnspr4.so bin/libxul.so bin/components/libxpinstall.so @@ -51,10 +50,8 @@ bin/mozilla-xremote-client bin/platform.ini bin/plugins/libnullplugin.so bin/README -bin/res/cmessage.txt bin/res/effective_tld_names.dat bin/run-mozilla.sh -bin/xpicleanup ; shared libraries bin/libgfxpsshar.so diff --git a/mozilla/suite/installer/windows/packages b/mozilla/suite/installer/windows/packages index 25c594002bd..2febcc449b3 100644 --- a/mozilla/suite/installer/windows/packages +++ b/mozilla/suite/installer/windows/packages @@ -40,7 +40,6 @@ bin\plc4.dll bin\plds4.dll bin\xpcom.dll bin\xpcom_core.dll -bin\xpistub.dll bin\nspr4.dll bin\xul.dll bin\components\jar50.dll @@ -58,7 +57,6 @@ bin\seamonkey.exe bin\application.ini bin\platform.ini bin\regxpcom.exe -bin\xpicleanup.exe bin\jsj3250.dll ; GFX files bin\thebes.dll @@ -366,7 +364,6 @@ bin\res\forms.css bin\res\contenteditable.css bin\res\designmode.css bin\res\viewsource.css -bin\res\cmessage.txt bin\res\effective_tld_names.dat bin\res\EditorOverride.css bin\res\broken-image.gif