Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 299286 - Move reporter locale files from en-US.jar to reporter.jar, r=gandalf a=shaver

Browse Source
This commit is contained in:
bsmedberg%covad.net 2005-07-22 20:11:37 +00:00
parent 7191542d83
commit 4c342d3f62
10 changed files with 99 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/locales/Makefile.in
View File

@ -120,9 +120,6 @@ install:: $(addsuffix .src,$(SEARCH_PLUGIN_PREFIX)) $(foreach base,$(SEARCH_PLUG
libs-%:
@$(MAKE) -C ../../toolkit/locales libs-$*
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
ifneq (,$(filter reporter,$(MOZ_EXTENSIONS)))
@$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$*
endif
ifdef MOZ_USE_OFFICIAL_BRANDING
@$(MAKE) -C ../../other-licenses/branding/firefox/locales AB_CD=$* XPI_NAME=locale-$*
endif

1
client.mk
View File

@ -148,7 +148,6 @@ LOCALES_browser := \
$(LOCALES_toolkit) \
browser \
other-licenses/branding/firefox \
extensions/reporter \
$(NULL)
BOOTSTRAP_browser := mozilla/browser/config/mozconfig

2
config/config.mk
View File

@ -46,6 +46,8 @@
# Define an include-at-most-once flag
INCLUDED_CONFIG_MK = 1
EXIT_ON_ERROR = set -e; # Shell loops continue past errors without this.
ifndef topsrcdir
topsrcdir = $(DEPTH)
endif

2
config/rules.mk
View File

@ -320,8 +320,6 @@ ifdef MOZ_UPDATE_XTERM
UPDATE_TITLE = sed -e "s!Y!$@ in $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$$d!" $(MOZILLA_DIR)/config/xterm.str;
endif
EXIT_ON_ERROR := set -e; # Shell loops continue past errors without this.
ifdef DIRS
LOOP_OVER_DIRS = \
@$(EXIT_ON_ERROR) \

7
extensions/inspector/resources/Makefile.in
View File

@ -54,7 +54,8 @@ SUBMAKEFILES += locale/Makefile
include $(topsrcdir)/config/rules.mk
libs::
libs realchrome:: locale/Makefile
@$(EXIT_ON_ERROR) \
for locale in $(ALL_LOCALES); do \
$(MAKE) -C locale AB_CD=$$locale; \
done \
$(MAKE) -C locale AB_CD=$$locale; \
done

6
extensions/inspector/resources/locale/Makefile.in
View File

@ -55,3 +55,9 @@ DEFINES += -DAB_CD=$(AB_CD)
# Let jar.mn do its happy-dance
include $(topsrcdir)/config/rules.mk
ifneq (en-US,$(AB_CD))
libs realchrome::
@echo "Comparing $(AB_CD) to en-US"
@$(PERL) $(topsrcdir)/toolkit/locales/compare-locales.pl $(srcdir)/en-US $(srcdir)/$(AB_CD)
endif

3
extensions/inspector/resources/locale/contents.rdf
View File

@ -1,6 +1,7 @@
<?xml version="1.0"?>
#filter substitution
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">

69
extensions/reporter/Makefile.in
View File

@ -44,17 +44,53 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = \
locales \
$(NULL)
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
ALL_LOCALES = \
en-US \
ar \
bg \
ca \
cs \
el \
en-GB \
es-AR \
es-ES \
eu \
fi \
fr \
ga-IE \
gu-IN \
he \
hu \
hy-AM \
it \
ja \
ja-JP-mac \
ko \
mk \
mn \
nb-NO \
nl \
nn-NO \
pa-IN \
pl \
pt-BR \
ro \
ru \
sl \
sv-SE \
tr \
zh-CN \
zh-TW \
$(NULL)
DIST_FILES = install.rdf
# We should really pull FIREFOX_VERSION and THUNDERBIRD_VERSION from
@ -69,4 +105,29 @@ XULAPP_DEFINES = \
PREF_JS_EXPORTS = $(srcdir)/resources/content/prefs/reporter.js
include $(topsrcdir)/config/config.mk
SUBMAKEFILES += locales/Makefile
# We need the locale-loop to happen before rules.mk, but we still want the
# default all:: target. Hack it here.
SUPPRESS_DEFAULT_RULES = 1
all::
$(MAKE) export
$(MAKE) libs
# Do depend as well
alldep::
$(MAKE) export
$(MAKE) depend
$(MAKE) libs
libs realchrome:: locales/Makefile
@$(EXIT_ON_ERROR) \
for locale in $(ALL_LOCALES); do \
$(MAKE) -C locales AB_CD=$$locale; \
done
include $(topsrcdir)/config/rules.mk

12
extensions/reporter/locales/Makefile.in
View File

@ -42,6 +42,18 @@ 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
ifneq (en-US,$(AB_CD))
libs realchrome::
@echo "Comparing $(AB_CD) to en-US"
@$(PERL) $(topsrcdir)/toolkit/locales/compare-locales.pl $(srcdir)/en-US $(srcdir)/$(AB_CD)
endif

19
extensions/reporter/locales/jar.mn
View File

@ -1,15 +1,12 @@
#filter substitution
@AB_CD@.jar:
#ifndef MOZ_XUL_APP
reporter.jar:
* locale/@AB_CD@/reporter/contents.rdf (generic/chrome/contents.rdf)
#else
% locale reporter @AB_CD@ %locale/@AB_CD@/reporter/
#endif
locale/@AB_CD@/reporter/reportWizard.dtd (%chrome/reportWizard.dtd)
locale/@AB_CD@/reporter/about.dtd (%chrome/about.dtd)
locale/@AB_CD@/reporter/reporterOverlay.dtd (%chrome/reporterOverlay.dtd)
locale/@AB_CD@/reporter/reportResults.dtd (%chrome/reportResults.dtd)
locale/@AB_CD@/reporter/reporter.dtd (%chrome/reporter.dtd)
locale/@AB_CD@/reporter/reportWizard.properties (%chrome/reportWizard.properties)
locale/@AB_CD@/reporter/reporterOverlay.properties (%chrome/reporterOverlay.properties)
locale/@AB_CD@/reporter/reportWizard.dtd (@AB_CD@/chrome/reportWizard.dtd)
locale/@AB_CD@/reporter/about.dtd (@AB_CD@/chrome/about.dtd)
locale/@AB_CD@/reporter/reporterOverlay.dtd (@AB_CD@/chrome/reporterOverlay.dtd)
locale/@AB_CD@/reporter/reportResults.dtd (@AB_CD@/chrome/reportResults.dtd)
locale/@AB_CD@/reporter/reporter.dtd (@AB_CD@/chrome/reporter.dtd)
locale/@AB_CD@/reporter/reportWizard.properties (@AB_CD@/chrome/reportWizard.properties)
locale/@AB_CD@/reporter/reporterOverlay.properties (@AB_CD@/chrome/reporterOverlay.properties)