Bug 736770. (Bv1) packaging: Add 'MOZ_UPDATER' condition for 3 files, Sort '[@AB_CD@]' files, Sync' removed-files.in. r=khuey.

This commit is contained in:
Serge Gautherie 2012-03-18 17:55:57 +01:00
parent 2f256bcc57
commit 3660a5e1f7
2 changed files with 18 additions and 6 deletions

View File

@ -25,19 +25,21 @@
[@AB_CD@]
@BINPATH@/chrome/@AB_CD@@JAREXT@
@BINPATH@/chrome/@AB_CD@.manifest
@BINPATH@/@PREF_DIR@/firefox-l10n.js
@BINPATH@/searchplugins/*
@BINPATH@/defaults/profile/bookmarks.html
@BINPATH@/defaults/profile/chrome/*
@BINPATH@/defaults/profile/localstore.rdf
@BINPATH@/defaults/profile/mimeTypes.rdf
@BINPATH@/defaults/profile/chrome/*
@BINPATH@/update.locale
@BINPATH@/updater.ini
@BINPATH@/dictionaries/*
@BINPATH@/hyphenation/*
@BINPATH@/@PREF_DIR@/firefox-l10n.js
@BINPATH@/searchplugins/*
#ifdef XP_WIN32
@BINPATH@/uninstall/helper.exe
#endif
#ifdef MOZ_UPDATER
@BINPATH@/update.locale
@BINPATH@/updater.ini
#endif
[xpcom]
@BINPATH@/dependentlibs.list
@ -556,11 +558,13 @@ bin/libfreebl_32int64_3.so
; [Updater]
;
#ifdef MOZ_UPDATER
#ifdef XP_MACOSX
@BINPATH@/updater.app/
#else
@BINPATH@/updater@BIN_SUFFIX@
#endif
#endif
; [MaintenanceService]
;

View File

@ -15,7 +15,6 @@
@DLL_PREFIX@mozjs@DLL_SUFFIX@
#endif
LICENSE
update.locale
browserconfig.properties
chrome/US.jar
chrome/app-chrome.manifest
@ -695,6 +694,15 @@ uninstall/UninstallDeerPark.exe
uninstall/UninstallFirefox.exe
uninstall/uninst.exe
uninstall/uninstall.exe
update.locale
#ifndef MOZ_UPDATER
#ifdef XP_MACOSX
updater.app/
#else
updater@BIN_SUFFIX@
#endif
updater.ini
#endif
xpicleanup@BIN_SUFFIX@
#ifdef MOZ_OMNIJAR
omni.jar