Bug 398855 - clean up some disappeared files, use the preprocessor to cut down on packages-static noise, r=bsmedberg, a=mconnor

browser/installer/unix/packages-static

@@ -34,12 +34,15 @@ bin/libmozjs.so
 bin/libplc4.so
 bin/libplds4.so
 bin/libxpcom.so
+bin/libnspr4.so
+#ifdef MOZ_ENABLE_LIBXUL
+bin/libxul.so
+#else
 bin/libxpcom_core.so
 bin/libxpistub.so
-bin/libnspr4.so
-bin/libxul.so
 bin/components/libxpinstall.so
 bin/components/libjar50.so
+#endif
 
 [browser]
 ; [Base Browser Files]
@@ -111,14 +114,14 @@ bin/components/filepicker.xpt
 bin/components/find.xpt
 bin/components/fuel.xpt
 bin/components/gfx.xpt
-bin/components/helperAppDlg.xpt
 bin/components/htmlparser.xpt
 bin/components/imglib2.xpt
 ; bin/components/imgicon.xpt
 bin/components/intl.xpt
 bin/components/jar.xpt
-bin/components/jsconsole.xpt
+#ifndef MOZ_ENABLE_LIBXUL
 bin/components/libjsd.so
+#endif
 bin/components/libimgicon.so
 bin/components/jsdservice.xpt
 bin/components/layout_base.xpt
@@ -140,7 +143,6 @@ bin/components/necko_dns.xpt
 bin/components/necko_file.xpt
 bin/components/necko_ftp.xpt
 bin/components/necko_http.xpt
-bin/components/necko_jar.xpt
 bin/components/necko_res.xpt
 bin/components/necko_socket.xpt
 bin/components/necko_strconv.xpt
@@ -152,13 +154,11 @@ bin/components/places.xpt
 bin/components/plugin.xpt
 bin/components/prefetch.xpt
 bin/components/pref.xpt
-bin/components/progressDlg.xpt
 bin/components/proxyObjInst.xpt
 bin/components/toolkitremote.xpt
 bin/components/rdf.xpt
 bin/components/satchel.xpt
 bin/components/saxparser.xpt
-bin/components/search.xpt
 bin/components/shistory.xpt
 bin/components/storage.xpt
 bin/components/profile.xpt
@@ -171,7 +171,6 @@ bin/components/uriloader.xpt
 bin/components/webBrowser_core.xpt
 bin/components/webbrowserpersist.xpt
 bin/components/webshell_idls.xpt
-bin/components/websrvcs.xpt
 bin/components/widget.xpt
 bin/components/windowds.xpt
 bin/components/windowwatcher.xpt
@@ -184,7 +183,6 @@ bin/components/xpcom_threads.xpt
 bin/components/xpcom_xpti.xpt
 bin/components/xpconnect.xpt
 bin/components/xpinstall.xpt
-bin/components/xremoteservice.xpt
 bin/components/xulapp.xpt
 bin/components/xuldoc.xpt
 bin/components/xultmpl.xpt
@@ -209,16 +207,11 @@ bin/components/nsLoginManagerPrompter.js
 bin/components/storage-Legacy.js
 bin/components/jsconsole-clhandler.js
 bin/components/nsTryToClose.js
-bin/components/nsDictionary.js
 bin/components/nsFilePicker.js
 bin/components/nsHelperAppDlg.js
 bin/components/nsDownloadManagerUI.js
-bin/components/nsInterfaceInfoToIDL.js
-; bin/components/nsProgressDialog.js   not needed for firefox
 bin/components/nsProxyAutoConfig.js
-; bin/components/nsResetPref.js    not needed for firefox
 bin/components/nsSidebar.js
-; bin/components/nsUpdateNotifier.js not needed for firefox
 bin/components/nsExtensionManager.js
 bin/components/nsBlocklistService.js
 bin/components/nsUpdateService.js
@@ -257,7 +250,6 @@ bin/components/libauth.so
 
 ; GNOME hooks
 bin/components/libmozgnome.so
-bin/components/mozgnome.xpt
 
 ; [Browser Chrome Files]
 bin/chrome/browser.jar
@@ -296,7 +288,6 @@ bin/res/ua.css
 bin/res/html.css
 bin/res/quirk.css
 bin/res/forms.css
-bin/res/platform-forms.css
 bin/res/EditorOverride.css
 bin/res/contenteditable.css
 bin/res/designmode.css
@@ -353,7 +344,6 @@ bin/libfreebl3.chk
 bin/libfreebl3.so
 bin/libssl3.so
 bin/libnssdbm3.so
-bin/chrome/pipnss.jar
 bin/chrome/pippki.jar
 bin/chrome/pippki.manifest
 

browser/installer/windows/packages-static

@@ -34,12 +34,15 @@ 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\nspr4.dll
-bin\xul.dll
 bin\components\xpinstal.dll
 bin\components\jar50.dll
+#endif
 bin\Microsoft.VC80.CRT.manifest
 bin\msvcm80.dll
 bin\msvcp80.dll
@@ -121,7 +124,9 @@ bin\components\imgicon.xpt
 bin\components\intl.xpt
 bin\components\jar.xpt
 bin\components\jsconsole-clhandler.js
+#ifndef MOZ_ENABLE_LIBXUL
 bin\components\jsd3250.dll
+#endif
 bin\components\jsdservice.xpt
 bin\components\layout_base.xpt
 bin\components\layout_printing.xpt
@@ -154,28 +159,24 @@ bin\components\plugin.xpt
 bin\components\pref.xpt
 bin\components\prefetch.xpt
 bin\components\profile.xpt
-bin\components\progressDlg.xpt
 bin\components\proxyObject.xpt
 bin\components\rdf.xpt
 bin\components\satchel.xpt
 bin\components\saxparser.xpt
 bin\components\shistory.xpt
-bin\components\signonviewer.xpt
 bin\components\storage.xpt
 bin\components\toolkitprofile.xpt
 bin\components\txtsvc.xpt
 bin\components\txmgr.xpt
+#ifdef MOZ_USE_NATIVE_UCONV
 bin\components\ucnative.xpt
+#endif
 bin\components\uconv.xpt
 bin\components\unicharutil.xpt
 bin\components\uriloader.xpt
-bin\components\wallet.xpt
-bin\components\walleteditor.xpt
-bin\components\walletpreview.xpt
 bin\components\webBrowser_core.xpt
 bin\components\webbrowserpersist.xpt
 bin\components\webshell_idls.xpt
-bin\components\websrvcs.xpt
 bin\components\widget.xpt
 bin\components\windowds.xpt
 bin\components\windowwatcher.xpt
@@ -203,7 +204,6 @@ bin\components\nsBrowserContentHandler.js
 bin\components\nsBrowserGlue.js
 bin\components\nsSetDefaultBrowser.js
 bin\components\nsTryToClose.js
-bin\components\nsDictionary.js
 bin\components\nsHelperAppDlg.js
 bin\components\nsDownloadManagerUI.js
 bin\components\nsProxyAutoConfig.js