зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1235151 - Factor all the install.rdfs used for langpacks. r=mshal
The only difference between all of them is the application id they target. Interestingly, the Fennec one is still targetting the XUL appid, instead of the Android one, which doesn't seem right. --HG-- rename : b2g/locales/generic/install.rdf => toolkit/locales/generic/install.rdf
This commit is contained in:
Родитель
60fde7dd14
Коммит
581d13d0d1
|
@ -1,30 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<!--
|
|
||||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
|
|
||||||
#filter substitution
|
|
||||||
-->
|
|
||||||
|
|
||||||
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
|
|
||||||
<Description about="urn:mozilla:install-manifest"
|
|
||||||
em:id="@MOZ_LANGPACK_EID@"
|
|
||||||
em:name="@MOZ_LANG_TITLE@ Language Pack"
|
|
||||||
em:version="@MOZ_APP_VERSION@"
|
|
||||||
em:type="8"
|
|
||||||
em:creator="@MOZ_LANGPACK_CREATOR@">
|
|
||||||
#ifdef MOZ_LANGPACK_CONTRIBUTORS
|
|
||||||
@MOZ_LANGPACK_CONTRIBUTORS@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
<em:targetApplication>
|
|
||||||
<Description>
|
|
||||||
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
|
|
||||||
<em:minVersion>@MOZ_APP_VERSION@</em:minVersion>
|
|
||||||
<em:maxVersion>@MOZ_APP_MAXVERSION@</em:maxVersion>
|
|
||||||
</Description>
|
|
||||||
</em:targetApplication>
|
|
||||||
</Description>
|
|
||||||
</RDF>
|
|
|
@ -1,30 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<!--
|
|
||||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
|
|
||||||
#filter substitution
|
|
||||||
-->
|
|
||||||
|
|
||||||
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
|
|
||||||
<Description about="urn:mozilla:install-manifest"
|
|
||||||
em:id="@MOZ_LANGPACK_EID@"
|
|
||||||
em:name="@MOZ_LANG_TITLE@ Language Pack"
|
|
||||||
em:version="@MOZ_APP_VERSION@"
|
|
||||||
em:type="8"
|
|
||||||
em:creator="@MOZ_LANGPACK_CREATOR@">
|
|
||||||
#ifdef MOZ_LANGPACK_CONTRIBUTORS
|
|
||||||
@MOZ_LANGPACK_CONTRIBUTORS@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
<em:targetApplication>
|
|
||||||
<Description>
|
|
||||||
<em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
|
|
||||||
<em:minVersion>@MOZ_APP_VERSION@</em:minVersion>
|
|
||||||
<em:maxVersion>@MOZ_APP_MAXVERSION@</em:maxVersion>
|
|
||||||
</Description>
|
|
||||||
</em:targetApplication>
|
|
||||||
</Description>
|
|
||||||
</RDF>
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
<em:targetApplication>
|
<em:targetApplication>
|
||||||
<Description>
|
<Description>
|
||||||
<em:id>{3c2e2abc-06d4-11e1-ac3b-374f68613e61}</em:id>
|
<em:id>@MOZ_APP_ID@</em:id>
|
||||||
<em:minVersion>@MOZ_APP_VERSION@</em:minVersion>
|
<em:minVersion>@MOZ_APP_VERSION@</em:minVersion>
|
||||||
<em:maxVersion>@MOZ_APP_MAXVERSION@</em:maxVersion>
|
<em:maxVersion>@MOZ_APP_MAXVERSION@</em:maxVersion>
|
||||||
</Description>
|
</Description>
|
|
@ -52,6 +52,7 @@ ZIP_OUT ?= $(_ABS_DIST)/$(PACKAGE)
|
||||||
ACDEFINES += \
|
ACDEFINES += \
|
||||||
-DAB_CD=$(AB_CD) \
|
-DAB_CD=$(AB_CD) \
|
||||||
-DMOZ_LANGPACK_EID=$(MOZ_LANGPACK_EID) \
|
-DMOZ_LANGPACK_EID=$(MOZ_LANGPACK_EID) \
|
||||||
|
-DMOZ_APP_ID=$(MOZ_APP_ID) \
|
||||||
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
|
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
|
||||||
-DMOZ_APP_MAXVERSION=$(MOZ_APP_MAXVERSION) \
|
-DMOZ_APP_MAXVERSION=$(MOZ_APP_MAXVERSION) \
|
||||||
-DLOCALE_SRCDIR=$(abspath $(LOCALE_SRCDIR)) \
|
-DLOCALE_SRCDIR=$(abspath $(LOCALE_SRCDIR)) \
|
||||||
|
@ -174,7 +175,7 @@ langpack-%: libs-%
|
||||||
@echo 'Making langpack $(LANGPACK_FILE)'
|
@echo 'Making langpack $(LANGPACK_FILE)'
|
||||||
$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)
|
$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)
|
||||||
$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \
|
$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \
|
||||||
-I$(TK_DEFINES) -I$(APP_DEFINES) $(srcdir)/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf)
|
-I$(TK_DEFINES) -I$(APP_DEFINES) $(MOZILLA_DIR)/toolkit/locales/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf)
|
||||||
$(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) $(LANGPACK_FILE) install.rdf $(PKG_ZIP_DIRS) chrome.manifest)
|
$(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) $(LANGPACK_FILE) install.rdf $(PKG_ZIP_DIRS) chrome.manifest)
|
||||||
|
|
||||||
# This variable is to allow the wget-en-US target to know which ftp server to download from
|
# This variable is to allow the wget-en-US target to know which ftp server to download from
|
||||||
|
|
Загрузка…
Ссылка в новой задаче