From 7c9a9a0d494547df5524bb12ede224b52ce15e3b Mon Sep 17 00:00:00 2001 From: "nrthomas@gmail.com" Date: Wed, 23 Jan 2008 10:57:43 -0800 Subject: [PATCH] Bug 394046, packaging changes/fixes for major update to Fx3, r=bsmedberg, a=blocking1.9+ --- browser/app/Makefile.in | 9 ++--- browser/installer/removed-files.in | 40 ++++++++++++++++++++--- browser/installer/unix/packages-static | 2 ++ browser/installer/windows/packages-static | 1 + 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index b301a1e1bdf..9947fc0cb56 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -377,6 +377,9 @@ else APPFILES = MacOS endif +libs:: $(srcdir)/profile/prefs.js + $(INSTALL) $^ $(DIST)/bin/defaults/profile + libs repackage:: $(PROGRAM) application.ini mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj @@ -416,12 +419,6 @@ else $(INSTALL) $(topsrcdir)/LICENSE $(DIST)/bin endif -libs:: $(srcdir)/profile/prefs.js - $(INSTALL) $^ $(DIST)/bin/defaults/profile - -install:: $(srcdir)/profile/prefs.js - $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile - ifdef LIBXUL_SDK ifndef SKIP_COPY_XULRUNNER libs:: diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in index 389b2f08178..a77cda6820c 100644 --- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -39,6 +39,7 @@ 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 @@ -59,7 +60,6 @@ component.reg components/compreg.dat components/@DLL_PREFIX@myspell@DLL_SUFFIX@ components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@ -components/spellchecker.xpt components/@DLL_PREFIX@spellchk@DLL_SUFFIX@ components/xpti.dat components/xptitemp.dat @@ -90,6 +90,7 @@ extensions/reporter@mozilla.org/chrome/reporter.jar extensions/reporter@mozilla.org/defaults/preferences/reporter.js extensions/inspector@mozilla.org/components/inspector.xpt extensions/inspector@mozilla.org/components/@DLL_PREFIX@inspector@DLL_SUFFIX@ +extensions/inspector@mozilla.org/chrome/icons/default/winInspectorMain.ico uninstall/UninstallFirefox.exe uninstall/UninstallDeerPark.exe uninstall/uninst.exe @@ -522,8 +523,8 @@ extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resour #else extensions/talkback@mozilla.org/components/talkback/talkback extensions/talkback@mozilla.org/components/talkback/XTalkback.ad -extensions/talkback@mozilla.org/components/master.ini -extensions/talkback@mozilla.org/components/talkback.so +extensions/talkback@mozilla.org/components/talkback/master.ini +extensions/talkback@mozilla.org/components/talkback/talkback.so #endif #endif components/airbag.xpt @@ -546,4 +547,35 @@ res/fonts/mathfontMath4.properties res/fonts/mathfontMTExtra.properties res/fonts/mathfontPUA.properties res/fonts/mathfontSymbol.properties - +res/fonts/fontEncoding.properties +res/fonts/pangoFontEncoding.properties +res/fonts/fontNameMap.properties +@DLL_PREFIX@xpcom_compat@DLL_SUFFIX@ +components/nsDictionary.js +components/nsXmlRpcClient.js +components/nsInterfaceInfoToIDL.js +chrome/chromelist.txt +#ifdef XP_MACOSX +LICENSE +extensions/inspector@mozilla.org/chrome/chromelist.txt +components/accessibility.xpt +components/gksvgrenderer.xpt +components/jsconsole.xpt +components/necko_data.xpt +components/nsKillAll.js +components/passwordmgr.xpt +components/progressDlg.xpt +components/search.xpt +components/websrvcs.xpt +components/widget_mac.xpt +components/xml-rpc.xpt +components/xpcom_obsolete.xpt +init.d/README +redo-prebinding.sh +res/viewer.properties +#endif +#ifdef XP_UNIX +readme.txt +#endif +dictionaries/PL.dic +dictionaries/PL.aff diff --git a/browser/installer/unix/packages-static b/browser/installer/unix/packages-static index 10d0afa200b..5538cd8f463 100644 --- a/browser/installer/unix/packages-static +++ b/browser/installer/unix/packages-static @@ -54,6 +54,7 @@ bin/res/cmessage.txt bin/res/effective_tld_names.dat bin/xpicleanup bin/libsqlite3.so +bin/README.txt ; [Components] bin/components/alerts.xpt @@ -161,6 +162,7 @@ bin/components/satchel.xpt bin/components/saxparser.xpt bin/components/search.xpt bin/components/shistory.xpt +bin/components/spellchecker.xpt bin/components/storage.xpt bin/components/profile.xpt bin/components/toolkitprofile.xpt diff --git a/browser/installer/windows/packages-static b/browser/installer/windows/packages-static index 621cb88e937..a75d2630b13 100644 --- a/browser/installer/windows/packages-static +++ b/browser/installer/windows/packages-static @@ -182,6 +182,7 @@ bin\components\widget.xpt bin\components\windowds.xpt bin\components\windowwatcher.xpt bin\components\shellservice.xpt +bin\components\spellchecker.xpt bin\components\xpcom_base.xpt bin\components\xpcom_system.xpt bin\components\xpcom_components.xpt