#2433 Changed the XML namespaces to please jpm sign (#2434)

*  #2433 changed the legacy install.rdf to match MDN
https://developer.mozilla.org/en-US/Add-ons/Install_Manifests

*  #2433 changed webext install.rdf to match MDN docs
 https://developer.mozilla.org/en-US/Add-ons/Install_Manifests

*  #2433 changed property added by mistake

*  #2433 changed localization XML namespaces to match install.rdf

*  #2433 small fixes
This commit is contained in:
Andrei Petcu 2017-03-10 14:01:57 +02:00 committed by Raymond Hill
parent fafe4c8abc
commit e8375f91cd
4 changed files with 93 additions and 92 deletions

View file

@ -1,64 +1,64 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<r:RDF xmlns:r="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.mozilla.org/2004/em-rdf#"> <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<r:Description about="urn:mozilla:install-manifest"> <Description about="urn:mozilla:install-manifest">
<id>uBlock0@raymondhill.net</id> <em:id>uBlock0@raymondhill.net</em:id>
<version>{version}</version> <em:version>{version}</em:version>
<name>{name}</name> <em:name>{name}</em:name>
<description>{description}</description> <em:description>{description}</em:description>
<homepageURL>{homepage}</homepageURL> <em:homepageURL>{homepage}</em:homepageURL>
<creator>{author}</creator> <em:creator>{author}</em:creator>
<developer>Deathamns</developer> <em:developer>Deathamns</em:developer>
<developer>Alex Vallat</developer> <em:developer>Alex Vallat</em:developer>
<developer>Manuel Reimer</developer> <em:developer>Manuel Reimer</em:developer>
<type>2</type> <em:type>2</em:type>
<bootstrap>true</bootstrap> <em:bootstrap>true</em:bootstrap>
<multiprocessCompatible>true</multiprocessCompatible> <em:multiprocessCompatible>true</em:multiprocessCompatible>
<optionsType>2</optionsType> <em:optionsType>2</em:optionsType>
{localized} {localized}
<!-- Firefox --> <!-- Firefox -->
<targetApplication> <em:targetApplication>
<r:Description> <Description>
<id>{{ec8030f7-c20a-464f-9b0e-13a3a9e97384}}</id> <em:id>{{ec8030f7-c20a-464f-9b0e-13a3a9e97384}}</em:id>
<minVersion>24.0</minVersion> <em:minVersion>24.0</em:minVersion>
<maxVersion>*</maxVersion> <em:maxVersion>*</em:maxVersion>
</r:Description> </Description>
</targetApplication> </em:targetApplication>
<!-- Fennec --> <!-- Fennec -->
<targetApplication> <em:targetApplication>
<r:Description> <Description>
<id>{{aa3c5121-dab2-40e2-81ca-7ea25febc110}}</id> <em:id>{{aa3c5121-dab2-40e2-81ca-7ea25febc110}}</em:id>
<minVersion>24.0</minVersion> <em:minVersion>24.0</em:minVersion>
<maxVersion>*</maxVersion> <em:maxVersion>*</em:maxVersion>
</r:Description> </Description>
</targetApplication> </em:targetApplication>
<!-- SeaMonkey --> <!-- SeaMonkey -->
<targetApplication> <em:targetApplication>
<r:Description> <Description>
<id>{{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}}</id> <em:id>{{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}}</em:id>
<minVersion>2.21</minVersion> <em:minVersion>2.21</em:minVersion>
<maxVersion>*</maxVersion> <em:maxVersion>*</em:maxVersion>
</r:Description> </Description>
</targetApplication> </em:targetApplication>
<!-- Pale Moon --> <!-- Pale Moon -->
<targetApplication> <em:targetApplication>
<r:Description> <Description>
<id>{{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}}</id> <em:id>{{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}}</em:id>
<minVersion>25.0</minVersion> <em:minVersion>25.0</em:minVersion>
<maxVersion>27.*</maxVersion> <em:maxVersion>27.*</em:maxVersion>
</r:Description> </Description>
</targetApplication> </em:targetApplication>
<!-- Thunderbird --> <!-- Thunderbird -->
<targetApplication> <em:targetApplication>
<r:Description> <Description>
<id>{{3550f703-e582-4d05-9a08-453d09bdfdc6}}</id> <em:id>{{3550f703-e582-4d05-9a08-453d09bdfdc6}}</em:id>
<minVersion>31.0</minVersion> <em:minVersion>31.0</em:minVersion>
<maxVersion>45.*</maxVersion> <em:maxVersion>45.*</em:maxVersion>
</r:Description> </Description>
</targetApplication> </em:targetApplication>
</r:Description> </Description>
</r:RDF> </RDF>

View file

@ -1,28 +1,29 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<r:RDF xmlns:r="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.mozilla.org/2004/em-rdf#"> <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<r:Description about="urn:mozilla:install-manifest"> <Description about="urn:mozilla:install-manifest">
<id>uBlock0@raymondhill.net</id> <em:id>uBlock0@raymondhill.net</em:id>
<version>{version}</version> <em:version>{version}</em:version>
<name>{name}</name> <em:name>{name}</em:name>
<description>{description}</description> <em:description>{description}</em:description>
<homepageURL>https://github.com/gorhill/uBlock</homepageURL> <em:homepageURL>https://github.com/gorhill/uBlock</em:homepageURL>
<creator>{author}</creator> <em:creator>{author}</em:creator>
<developer>Deathamns</developer> <em:developer>Deathamns</em:developer>
<developer>Alex Vallat</developer> <em:developer>Alex Vallat</em:developer>
<developer>Manuel Reimer</developer> <em:developer>Manuel Reimer</em:developer>
<type>2</type> <em:type>2</em:type>
<bootstrap>true</bootstrap> <em:bootstrap>true</em:bootstrap>
<multiprocessCompatible>true</multiprocessCompatible> <em:multiprocessCompatible>true</em:multiprocessCompatible>
<hasEmbeddedWebExtension>true</hasEmbeddedWebExtension> <em:hasEmbeddedWebExtension>true</em:hasEmbeddedWebExtension>
{localized} {localized}
<!-- Firefox --> <!-- Firefox -->
<targetApplication> <em:targetApplication>
<r:Description> <Description>
<id>{{ec8030f7-c20a-464f-9b0e-13a3a9e97384}}</id> <em:id>{{ec8030f7-c20a-464f-9b0e-13a3a9e97384}}</em:id>
<minVersion>52.0a1</minVersion> <em:minVersion>52.0a1</em:minVersion>
<maxVersion>*</maxVersion> <em:maxVersion>*</em:maxVersion>
</r:Description> </Description>
</targetApplication> </em:targetApplication>
</r:Description>
</r:RDF> </Description>
</RDF>

View file

@ -89,14 +89,14 @@ for alpha2 in descriptions:
if alpha2 == 'en': if alpha2 == 'en':
continue continue
manifest['localized'].append( manifest['localized'].append(
'\n' + t*2 + '<localized><r:Description>\n' + '\n' + t*2 + '<em:localized><Description>\n' +
t3 + '<locale>' + alpha2 + '</locale>\n' + t3 + '<em:locale>' + alpha2 + '</em:locale>\n' +
t3 + '<name>' + manifest['name'] + '</name>\n' + t3 + '<em:name>' + manifest['name'] + '</em:name>\n' +
t3 + '<description>' + descriptions[alpha2] + '</description>\n' + t3 + '<em:description>' + descriptions[alpha2] + '</em:description>\n' +
t3 + '<creator>' + manifest['author'] + '</creator>\n' + t3 + '<em:creator>' + manifest['author'] + '</em:creator>\n' +
# t3 + '<translator>' + ??? + '</translator>\n' + # t3 + '<translator>' + ??? + '</translator>\n' +
t3 + '<homepageURL>' + manifest['homepage'] + '</homepageURL>\n' + t3 + '<em:homepageURL>' + manifest['homepage'] + '</em:homepageURL>\n' +
t*2 + '</r:Description></localized>' t*2 + '</Description></em:localized>'
) )
manifest['localized'] = '\n'.join(manifest['localized']) manifest['localized'] = '\n'.join(manifest['localized'])

View file

@ -63,14 +63,14 @@ for alpha2 in descriptions:
if alpha2 == 'en': if alpha2 == 'en':
continue continue
webext_manifest['localized'].append( webext_manifest['localized'].append(
'\n' + t*2 + '<localized><r:Description>\n' + '\n' + t*2 + '<em:localized><Description>\n' +
t3 + '<locale>' + alpha2 + '</locale>\n' + t3 + '<em:locale>' + alpha2 + '</em:locale>\n' +
t3 + '<name>' + webext_manifest['name'] + '</name>\n' + t3 + '<em:name>' + webext_manifest['name'] + '</em:name>\n' +
t3 + '<description>' + descriptions[alpha2] + '</description>\n' + t3 + '<em:description>' + descriptions[alpha2] + '</em:description>\n' +
t3 + '<creator>' + webext_manifest['author'] + '</creator>\n' + t3 + '<em:creator>' + webext_manifest['author'] + '</em:creator>\n' +
# t3 + '<translator>' + ??? + '</translator>\n' + # t3 + '<translator>' + ??? + '</translator>\n' +
t3 + '<homepageURL>' + webext_manifest['homepage'] + '</homepageURL>\n' + t3 + '<em:homepageURL>' + webext_manifest['homepage'] + '</em:homepageURL>\n' +
t*2 + '</r:Description></localized>' t*2 + '</Description></em:localized>'
) )
webext_manifest['localized'] = '\n'.join(webext_manifest['localized']) webext_manifest['localized'] = '\n'.join(webext_manifest['localized'])