Bug 415330 - XPInstall leftovers in package files, r=ted, a=blocker
authorphilringnalda@gmail.com
Fri, 08 Feb 2008 19:25:43 -0800
changeset 11443 66a9b26d07fe285c8100b18ef4caa0960bef7131
parent 11442 87d16e2a6e05f259351232af349937a1dafe5687
child 11444 fb3d71f8e695d7ec7e5507a0fe35b2a13567fdc5
push idunknown
push userunknown
push dateunknown
reviewersted, blocker
bugs415330
milestone1.9b4pre
Bug 415330 - XPInstall leftovers in package files, r=ted, a=blocker
browser/installer/removed-files.in
browser/installer/unix/packages-static
browser/installer/windows/packages-static
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -34,33 +34,32 @@ searchplugins/eBay.src
 searchplugins/eBay.gif
 searchplugins/google.src
 searchplugins/google.gif
 searchplugins/yahoo.src
 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
 components/xpinstal.dll
 #else
 components/@DLL_PREFIX@jsd@DLL_SUFFIX@
 components/@DLL_PREFIX@xpinstall@DLL_SUFFIX@
 #endif
-components/@DLL_PREFIX@jar50@DLL_SUFFIX@
 #else
 #ifdef XP_MACOSX
 XUL
 #else
 @DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #endif
+@DLL_PREFIX@xpistub@DLL_SUFFIX@
 component.reg
 components/compreg.dat
 components/@DLL_PREFIX@myspell@DLL_SUFFIX@
 components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
 components/@DLL_PREFIX@spellchk@DLL_SUFFIX@
 components/xpti.dat
 components/xptitemp.dat
 components/nsBackgroundUpdateService.js
@@ -524,16 +523,17 @@ extensions/talkback@mozilla.org/componen
 extensions/talkback@mozilla.org/components/talkback/talkback
 extensions/talkback@mozilla.org/components/talkback/XTalkback.ad
 extensions/talkback@mozilla.org/components/talkback/master.ini
 extensions/talkback@mozilla.org/components/talkback/talkback.so
 #endif
 #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
 res/html/gopher-image.gif
 res/html/gopher-menu.gif
 res/html/gopher-movie.gif
 res/html/gopher-sound.gif
 res/html/gopher-telnet.gif
@@ -575,8 +575,13 @@ init.d/README
 redo-prebinding.sh
 res/viewer.properties
 #endif
 #ifdef XP_UNIX
 readme.txt
 #endif
 dictionaries/PL.dic
 dictionaries/PL.aff
+#ifdef XP_WIN
+xpicleanup.exe
+#else
+xpicleanup
+#endif
--- a/browser/installer/unix/packages-static
+++ b/browser/installer/unix/packages-static
@@ -30,34 +30,31 @@ bin/updater.ini
 bin/dictionaries/*
 
 [xpcom]
 bin/libmozjs.so
 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
 bin/components/libjar50.so
 
 [browser]
 ; [Base Browser Files]
 bin/@MOZ_APP_NAME@-bin
 bin/@MOZ_APP_NAME@
 bin/application.ini
 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
 
 ; [Components]
 bin/components/alerts.xpt
 bin/components/accessibility.xpt
 bin/components/appshell.xpt
--- a/browser/installer/windows/packages-static
+++ b/browser/installer/windows/packages-static
@@ -34,35 +34,32 @@ bin\js3250.dll
 bin\plc4.dll
 bin\plds4.dll
 bin\xpcom.dll
 bin\nspr4.dll
 #ifdef MOZ_ENABLE_LIBXUL
 bin\xul.dll
 #else
 bin\xpcom_core.dll
-bin\xpistub.dll
 bin\components\xpinstal.dll
 bin\components\jar50.dll
 #endif
 bin\Microsoft.VC80.CRT.manifest
 bin\msvcm80.dll
 bin\msvcp80.dll
 bin\msvcr80.dll
 bin\mozcrt19.dll
 
 [browser]
 ; [Base Browser Files]
 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
 
 ; [Components]
 bin\components\alerts.xpt
 bin\AccessibleMarshal.dll
 bin\components\accessibility.xpt