diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in index e866a921b1f..e6527d15301 100644 --- a/browser/installer/removed-files.in +++ b/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 diff --git a/browser/installer/unix/Makefile.in b/browser/installer/unix/Makefile.in index b98d259e0ec..fc90ccebad6 100644 --- a/browser/installer/unix/Makefile.in +++ b/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) diff --git a/browser/installer/unix/config.it b/browser/installer/unix/config.it index 55bfa01853c..e334e294716 100644 --- a/browser/installer/unix/config.it +++ b/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@ diff --git a/browser/installer/unix/installer.cfg b/browser/installer/unix/installer.cfg index 0d439d6c003..6721a4dd2bf 100644 --- a/browser/installer/unix/installer.cfg +++ b/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 diff --git a/browser/installer/unix/packages-static b/browser/installer/unix/packages-static index 99cbe5c1a6c..7e2d5e6b027 100644 --- a/browser/installer/unix/packages-static +++ b/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 diff --git a/browser/installer/unix/reporter.jst b/browser/installer/unix/reporter.jst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in index 20d3638d29a..8d40bce3fb7 100644 --- a/browser/installer/windows/Makefile.in +++ b/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 \ diff --git a/browser/installer/windows/config.it b/browser/installer/windows/config.it index 7f15208d60f..8beab4cea89 100644 --- a/browser/installer/windows/config.it +++ b/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} diff --git a/browser/installer/windows/installer.cfg b/browser/installer/windows/installer.cfg index 0eca858068f..48aaa5c1b91 100644 --- a/browser/installer/windows/installer.cfg +++ b/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 diff --git a/browser/installer/windows/packages-static b/browser/installer/windows/packages-static index 3b0719251ca..0a6843ffed9 100644 --- a/browser/installer/windows/packages-static +++ b/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 diff --git a/browser/installer/windows/reporter.jst b/browser/installer/windows/reporter.jst deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/reporter/Makefile.in b/extensions/reporter/Makefile.in index a50852ff846..4c3eca7a4d6 100644 --- a/extensions/reporter/Makefile.in +++ b/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 diff --git a/extensions/reporter/locales/Makefile.in b/extensions/reporter/locales/Makefile.in index d3b11a6d3ed..45825fe4113 100644 --- a/extensions/reporter/locales/Makefile.in +++ b/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 diff --git a/extensions/reporter/locales/jar.mn b/extensions/reporter/locales/jar.mn index 2711e470608..50d3712b219 100644 --- a/extensions/reporter/locales/jar.mn +++ b/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)