bug 590102 - Remove reporter from SeaMonkey, r=Callek
authorRobert Kaiser <kairo@kairo.at>
Fri, 27 Aug 2010 17:29:22 +0200
changeset 6281 d61f5d9b23bfb0454757ccda48d8943fe5e176df
parent 6280 7b5189c2cf280003b6cf028f0f290ee4aa70c3c4
child 6282 7bea0838b11f6e92725bca2ca80ad4028fceb2fd
push id4845
push userkairo@kairo.at
push dateFri, 27 Aug 2010 15:29:59 +0000
treeherdercomm-central@7bea0838b11f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs590102
bug 590102 - Remove reporter from SeaMonkey, r=Callek
suite/confvars.sh
suite/installer/Makefile.in
suite/installer/package-manifest.in
suite/installer/removed-files.in
suite/locales/Makefile.in
suite/locales/filter.py
suite/locales/l10n.ini
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -44,17 +44,17 @@ if [ "$COMM_BUILD" ]; then
 fi
 MOZ_STATIC_MAIL_BUILD=1
 MOZ_COMPOSER=1
 MOZ_SUITE=1
 MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
 SEAMONKEY_VERSION=$MOZ_APP_VERSION
 MOZ_BRANDING_DIRECTORY=suite/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
-MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs reporter"
+MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs"
 MOZ_UPDATER=1
 MOZ_HELP_VIEWER=1
 MOZ_TOOLKIT_SEARCH=
 MOZ_MORK=1
 
 # Disable libxul which is (now) the default on mozilla-central. (Bug 394502)
 MOZ_ENABLE_LIBXUL=
 # Until we can build with libxul, we can't have ipc either. (Bug 531292)
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -47,17 +47,16 @@ include $(topsrcdir)/config/rules.mk
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
 
 MOZ_NONLOCALIZED_PKG_LIST = \
 	xpcom \
 	browser \
 	mail \
-	reporter \
 	$(NULL)
 
 MOZ_LOCALIZED_PKG_LIST = \
 	$(AB_CD) \
 	$(NULL)
 
 MOZ_OPTIONAL_PKG_LIST = \
 	chatzilla \
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -625,17 +625,16 @@
 @BINPATH@/chrome/icons/default/venkman-window.ico
 #endif
 
 ; [Default Preferences]
 ; All the browser/general pref files must be part of base to prevent migration bugs
 @BINPATH@/@PREF_DIR@/browser-prefs.js
 @BINPATH@/@PREF_DIR@/channel-prefs.js
 @BINPATH@/@PREF_DIR@/composer.js
-@BINPATH@/@PREF_DIR@/reporter.js
 @BINPATH@/greprefs.js
 @BINPATH@/defaults/autoconfig/platform.js
 @BINPATH@/defaults/autoconfig/prefcalls.js
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine. 
 @BINPATH@/res/contenteditable.css
 @BINPATH@/res/designmode.css
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -122,16 +122,17 @@ compreg.dat
 #ifndef MOZ_CRASHREPORTER
 #ifdef XP_MACOSX
 crashreporter.app/
 #else
 crashreporter@BIN_SUFFIX@
 crashreporter.ini
 #endif
 #endif
+defaults/pref/reporter.js
 defaults/wallet/DistinguishedSchema.tbl
 defaults/wallet/FieldSchema.tbl
 defaults/wallet/PositionalSchema.tbl
 defaults/wallet/SchemaConcat.tbl
 defaults/wallet/SchemaStrings.tbl
 defaults/wallet/StateSchema.tbl
 defaults/wallet/VcardSchema.tbl
 #ifdef XP_WIN
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -209,17 +209,16 @@ libs-%:
 	@$(MAKE) -C ../../mozilla/toolkit/locales libs-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	if test -d ../../mozilla/extensions/irc; then \
 	  $(MAKE) -C ../../mozilla/extensions/irc/locales libs-$*; \
 	fi
 	if test -d ../../mozilla/extensions/venkman; then \
 	  $(MAKE) -C ../../mozilla/extensions/venkman/locales libs-$*; \
 	fi
-	@$(MAKE) -C ../../mozilla/extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../mozilla/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
 MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--format UDBZ \
--- a/suite/locales/filter.py
+++ b/suite/locales/filter.py
@@ -1,14 +1,13 @@
 def test(mod, path, entity = None):
   import re
   # ignore anything but SeaMonkey
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
-                 "extensions/reporter", "editor/ui",
-                 "suite"):
+                 "editor/ui", "suite"):
     return False
   # ignore temporary files, hiden files and files from rejects
   if (re.match(r".*?\/[.#].+", path) or
       re.match(r".*~$", path) or
       re.match(r".+\.(orig|rej)", path)):
     return False
   if mod not in ("suite"):
     # we only have exceptions for suite
--- a/suite/locales/l10n.ini
+++ b/suite/locales/l10n.ini
@@ -5,25 +5,18 @@ all = suite/locales/all-locales
 [compare]
 dirs = suite
      editor/ui
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini
-reporter = mozilla/extensions/reporter/locales/l10n.ini
 
 [extras]
 dirs = mozilla/extensions/inspector
     mozilla/extensions/spellcheck
 
 [include_toolkit]
 type = hg
 mozilla = mozilla-central
 repo = http://hg.mozilla.org/
 l10n.ini = toolkit/locales/l10n.ini
-
-[include_reporter]
-type = hg
-mozilla = mozilla-central
-repo = http://hg.mozilla.org/
-l10n.ini = extensions/reporter/locales/l10n.ini