mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 312510 - Win32 installer download size > 5MB - move reporter to be a builtin instead of an extension, r=bryner

This commit is contained in:
bsmedberg%covad.net 2005-10-18 15:44:08 +00:00
Родитель 01bcd23b70
Коммит 9b3161afdc
14 изменённых файлов: 24 добавлений и 72 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
browser/installer/removed-files.in
Просмотреть файл

@ -46,3 +46,7 @@ components/talkback/master.ini
components/talkback/talkback
components/talkback/talkback.so
components/talkback/XTalkback.ad
extensions/reporter@mozilla.org/install.rdf
extensions/reporter@mozilla.org/chrome.manifest
extensions/reporter@mozilla.org/chrome/reporter.jar
extensions/reporter@mozilla.org/defaults/preferences/reporter.js

2
browser/installer/unix/Makefile.in
Просмотреть файл

@ -61,9 +61,7 @@ PP_LOCALIZED_FILES = \
INSTALLER_FILES = \
abe.jst \
adt.jst \
reporter.jst \
browser.jst \
reporter.jst \
talkback.jst \
xpcom.jst \
$(NULL)

17
browser/installer/unix/config.it
Просмотреть файл

@ -223,10 +223,9 @@ C0=Component XPCOM
C1=Component Browser
;C2=Component Uninstaller
C2=Component Langpack
C3=Component RPT
; Make sure Component QFA is LAST so 3rd party developers who might not want
; this component can easily remove it.
C4=Component QFA
C3=Component QFA
[Setup Type1]
Description Short=@TYPE_CUSTOM@
@ -240,10 +239,9 @@ C1=Component Browser
C2=Component ADT
;C3=Component Uninstaller
C3=Component Langpack
C4=Component RPT
; Make sure Component QFA is LAST so 3rd party developers who might not want
; this component can easily remove it.
C5=Component QFA
C4=Component QFA
[Dialog Select Components]
Show Dialog=TRUE
@ -620,17 +618,6 @@ Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
Force Upgrade File0=[SETUP PATH]\chrome\@AB_CD@.jar
FileCount=$FileCount$
[Component RPT]
Description Short=@RPT_SHORT@
Description Long=@RPT_LONG@
Archive=reporter.xpi
$InstallSize$:reporter
$InstallSizeSystem$
$InstallSizeArchive$:reporter.xpi
Attributes=SELECTED|VISIBLE|FORCE_UPGRADE
Force Upgrade File0=[SETUP PATH]/chrome/reporter.jar
FileCount=$FileCount$
[Component QFA]
Description Short=@QFA_SHORT@
Description Long=@QFA_LONG@

2
browser/installer/unix/installer.cfg
Просмотреть файл

@ -10,5 +10,5 @@ FileMainEXE = firefox
FileUninstall = UninstallFirefox
FileUninstallZIP = UninstallFirefox.zip
FileInstallerNETRoot = @PKG_BASENAME@.net-installer
ComponentList = xpcom,browser,talkback,@AB_CD@,adt,reporter
ComponentList = xpcom,browser,talkback,@AB_CD@,adt
LicenseFile = browser/EULA

9
browser/installer/unix/packages-static
Просмотреть файл

@ -212,6 +212,9 @@ bin/chrome/comm.manifest
bin/chrome/toolkit.jar
bin/chrome/toolkit.manifest
bin/chrome/icons/default/default.xpm
bin/chrome/reporter.manifest
bin/chrome/reporter.jar
bin/defaults/pref/reporter.js
; shell icons
bin/icons/*.xpm
@ -318,9 +321,3 @@ bin/extensions/talkback@mozilla.org/install.rdf
bin/extensions/talkback@mozilla.org/components/libqfaservices.so
bin/extensions/talkback@mozilla.org/components/qfaservices.xpt
bin/extensions/talkback@mozilla.org/components/talkback/*
[reporter]
bin/extensions/reporter@mozilla.org/install.rdf
bin/extensions/reporter@mozilla.org/chrome.manifest
bin/extensions/reporter@mozilla.org/chrome/reporter.jar
bin/extensions/reporter@mozilla.org/defaults/preferences/reporter.js

0
browser/installer/unix/reporter.jst
Просмотреть файл

1
browser/installer/windows/Makefile.in
Просмотреть файл

@ -63,7 +63,6 @@ INSTALLER_FILES = \
editor.jst \
inspector.jst \
psm.jst \
reporter.jst \
talkback.jst \
venkman.jst \
xpcom.jst \

16
browser/installer/windows/config.it
Просмотреть файл

@ -217,10 +217,9 @@ C0=Component XPCOM
C1=Component Browser
C2=Component Uninstaller
C3=Component Langpack
C4=Component RPT
; Make sure Component QFA is LAST so 3rd party developers who might not want
; this component can easily remove it.
C5=Component QFA
C4=Component QFA
[Setup Type1]
Description Short={TYPE_CUSTOM}
@ -234,10 +233,9 @@ C1=Component Browser
C2=Component ADT
C3=Component Uninstaller
C4=Component Langpack
C5=Component RPT
; Make sure Component QFA is LAST so 3rd party developers who might not want
; this component can easily remove it.
C6=Component QFA
C5=Component QFA
[Dialog Select Components]
Show Dialog=TRUE
@ -570,16 +568,6 @@ Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
Force Upgrade File0=[SETUP PATH]\chrome\{AB_CD}.jar
FileCount=$FileCount$
[Component RPT]
Description Short={RPT_SHORT}
Description Long={RPT_LONG}
Archive=reporter.xpi
$InstallSize$:reporter
$InstallSizeArchive$:reporter.xpi
Attributes=SELECTED|VISIBLE|FORCE_UPGRADE
Force Upgrade File0=[SETUP PATH]\chrome\reporter.jar
FileCount=$FileCount$
[Component QFA]
Description Short={QFA_SHORT}
Description Long={QFA_LONG}

2
browser/installer/windows/installer.cfg
Просмотреть файл

@ -11,7 +11,7 @@ FileMainEXE = firefox.exe
FileUninstall = UninstallDeerPark.exe
FileUninstallZIP = UninstallDeerPark.zip
FileInstallerNETRoot = @PKG_BASENAME@.net-installer
ComponentList = xpcom,browser,talkback,@AB_CD@,adt,reporter
ComponentList = xpcom,browser,talkback,@AB_CD@,adt
LicenseFile = browser/EULA
7ZipSFXModule = other-licenses/7zstub/firefox/7zSD.sfx
GREVersion = 1.9a1

9
browser/installer/windows/packages-static
Просмотреть файл

@ -206,6 +206,9 @@ bin\chrome\comm.jar
bin\chrome\comm.manifest
bin\chrome\toolkit.jar
bin\chrome\toolkit.manifest
bin\chrome\reporter.manifest
bin\chrome\reporter.jar
bin\defaults\pref\reporter.js
; [Default Preferences]
; All the pref files must be part of base to prevent migration bugs
@ -312,9 +315,3 @@ bin\extensions\talkback@mozilla.org\components\talkback-l10n.ini
bin\extensions\talkback@mozilla.org\components\talkback.cnt
bin\extensions\talkback@mozilla.org\components\talkback.exe
bin\extensions\talkback@mozilla.org\components\talkback.hlp
[reporter]
bin\extensions\reporter@mozilla.org\install.rdf
bin\extensions\reporter@mozilla.org\chrome.manifest
bin\extensions\reporter@mozilla.org\chrome\reporter.jar
bin\extensions\reporter@mozilla.org\defaults\preferences\reporter.js

0
browser/installer/windows/reporter.jst
Просмотреть файл

24
extensions/reporter/Makefile.in
Просмотреть файл

@ -44,14 +44,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifdef MOZ_XUL_APP
XPI_NAME = reporter
USE_EXTENSION_MANIFEST = 1
NO_JAR_AUTO_REG = 1
INSTALL_EXTENSION_ID = reporter@mozilla.org
XPI_PKGNAME = reporter-$(MOZ_APP_VERSION)
endif
ifdef BUILD_ALL_LOCALES
ALL_LOCALES = \
en-US \
ar \
@ -93,18 +86,9 @@ ALL_LOCALES = \
zh-CN \
zh-TW \
$(NULL)
DIST_FILES = install.rdf
# We should really pull FIREFOX_VERSION and THUNDERBIRD_VERSION from
# # browser/config/version.txt mail/config/version.txt but we can't be assured
# # that we've even pulled those files. So we hardcode them.
XULAPP_DEFINES = \
-DFIREFOX_VERSION=$(FIREFOX_VERSION) \
-DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
-DEXTENSION_VERSION=$(MOZILLA_VERSION) \
$(NULL)
else
ALL_LOCALES = $(AB_CD)
endif
PREF_JS_EXPORTS = $(srcdir)/resources/content/prefs/reporter.js

6
extensions/reporter/locales/Makefile.in
Просмотреть файл

@ -42,12 +42,6 @@ relativesrcdir = extensions/reporter/locales
include $(DEPTH)/config/autoconf.mk
ifdef MOZ_XUL_APP
XPI_NAME = reporter
USE_EXTENSION_MANIFEST = 1
NO_JAR_AUTO_REG = 1
endif
DEFINES += -DAB_CD=$(AB_CD)
include $(topsrcdir)/config/rules.mk

4
extensions/reporter/locales/jar.mn
Просмотреть файл

@ -1,6 +1,10 @@
#filter substitution
#ifdef MOZ_XUL_APP
@AB_CD@.jar:
#else
reporter.jar:
#endif
* locale/@AB_CD@/reporter/contents.rdf (generic/chrome/contents.rdf)
% locale reporter @AB_CD@ %locale/@AB_CD@/reporter/
locale/@AB_CD@/reporter/reportWizard.dtd (@AB_CD@/chrome/reportWizard.dtd)