Issue 5751 - Removing legacy gecko support

releaseAutomation.py

 # 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/.
 
 from __future__ import print_function
 
 import os
 import re
 import codecs
 import subprocess
 import tarfile
 import json
 
 from packager import readMetadata, getDefaultFileName
-from localeTools import readFile

[Sebastian Noack, 2017/10/03 02:22:39]

Why did you add this import?

[tlucas, 2017/10/04 11:48:38]

This was not intentional, removed it.

 
 
 def get_dependencies(prefix, repos):
     from ensure_dependencies import read_deps, safe_join
     repo = repos[prefix]
     deps = read_deps(repo)
     if deps:
         for subpath in deps:
             if subpath.startswith('_'):
                 continue
@@ skipping 108 matching lines @@
         rawMetadata = re.sub(
             r'^(\s*version\s*=\s*).*', r'\g<1>%s' % version,
             rawMetadata, flags=re.I | re.M
         )
 
         file.seek(0)
         file.write(rawMetadata)
         file.truncate()
 
     # Read extension name from locale data
-    locales_base = os.path.join(baseDir, 'adblockplus')
-
-    with open(os.path.join(locales_base, 'chrome', 'locale',
-                           packager.defaultLocale.replace('_', '-'),
-                           'meta.json'),
-              'r') as fp:
+    default_locale_path = os.path.join('_locales', packager.defaultLocale,
+                                       'messages.json')
+    with open(default_locale_path, 'r') as fp:
         extensionName = json.load(fp)['name']
 
     # Now commit the change and tag it
     subprocess.check_call(['hg', 'commit', '-R', baseDir, '-m', 'Releasing %s %s' % (extensionName, version)])
     tag_name = version
     if type in {'safari', 'edge'}:
         tag_name = '{}-{}'.format(tag_name, type)
     subprocess.check_call(['hg', 'tag', '-R', baseDir, '-f', tag_name])
 
     # Create a release build
@@ skipping 21 matching lines @@
     create_sourcearchive(baseDir, archivePath)
     downloads.append(archivePath)
 
     # Now add the downloads and commit
     subprocess.check_call(['hg', 'add', '-R', downloadsRepo] + downloads)
     subprocess.check_call(['hg', 'commit', '-R', downloadsRepo, '-m', 'Releasing %s %s' % (extensionName, version)])
 
     # Push all changes
     subprocess.check_call(['hg', 'push', '-R', baseDir])
     subprocess.check_call(['hg', 'push', '-R', downloadsRepo])