| OLD | NEW |
| 1 # This Source Code Form is subject to the terms of the Mozilla Public | 1 # This Source Code Form is subject to the terms of the Mozilla Public |
| 2 # License, v. 2.0. If a copy of the MPL was not distributed with this | 2 # License, v. 2.0. If a copy of the MPL was not distributed with this |
| 3 # file, You can obtain one at http://mozilla.org/MPL/2.0/. | 3 # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
| 4 | 4 |
| 5 import os | 5 import os |
| 6 import re | 6 import re |
| 7 import codecs | 7 import codecs |
| 8 import subprocess | 8 import subprocess |
| 9 import tarfile | 9 import tarfile |
| 10 import json | 10 import json |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 continue | 37 continue |
| 38 filedata = repoarchive.extractfile(fileinfo) | 38 filedata = repoarchive.extractfile(fileinfo) |
| 39 fileinfo.name = re.sub(r'^[^/]+/', prefix, fileinfo.name
) | 39 fileinfo.name = re.sub(r'^[^/]+/', prefix, fileinfo.name
) |
| 40 archive.addfile(fileinfo, filedata) | 40 archive.addfile(fileinfo, filedata) |
| 41 finally: | 41 finally: |
| 42 process.stdout.close() | 42 process.stdout.close() |
| 43 process.wait() | 43 process.wait() |
| 44 | 44 |
| 45 | 45 |
| 46 def run(baseDir, type, version, keyFiles, downloadsRepo): | 46 def run(baseDir, type, version, keyFiles, downloadsRepo): |
| 47 if type == "gecko": | 47 if type == 'gecko': |
| 48 import buildtools.packagerGecko as packager | 48 import buildtools.packagerGecko as packager |
| 49 elif type == "chrome": | 49 elif type == 'chrome': |
| 50 import buildtools.packagerChrome as packager | 50 import buildtools.packagerChrome as packager |
| 51 | 51 |
| 52 # Replace version number in metadata file "manually", ConfigParser will mess | 52 # Replace version number in metadata file "manually", ConfigParser will mess |
| 53 # up the order of lines. | 53 # up the order of lines. |
| 54 metadata = packager.readMetadata(baseDir, type) | 54 metadata = packager.readMetadata(baseDir, type) |
| 55 with open(metadata.option_source("general", "version"), 'r+b') as file: | 55 with open(metadata.option_source('general', 'version'), 'r+b') as file: |
| 56 rawMetadata = file.read() | 56 rawMetadata = file.read() |
| 57 rawMetadata = re.sub( | 57 rawMetadata = re.sub( |
| 58 r'^(\s*version\s*=\s*).*', r'\g<1>%s' % version, | 58 r'^(\s*version\s*=\s*).*', r'\g<1>%s' % version, |
| 59 rawMetadata, flags=re.I | re.M | 59 rawMetadata, flags=re.I | re.M |
| 60 ) | 60 ) |
| 61 | 61 |
| 62 file.seek(0) | 62 file.seek(0) |
| 63 file.write(rawMetadata) | 63 file.write(rawMetadata) |
| 64 file.truncate() | 64 file.truncate() |
| 65 | 65 |
| 66 # Read extension name from locale data | 66 # Read extension name from locale data |
| 67 import buildtools.packagerGecko as packagerGecko | 67 import buildtools.packagerGecko as packagerGecko |
| 68 if type == "gecko": | 68 if type == 'gecko': |
| 69 locales_base = baseDir | 69 locales_base = baseDir |
| 70 else: | 70 else: |
| 71 # This is somewhat of a hack but reading out locale import config here w
ould be too much | 71 # This is somewhat of a hack but reading out locale import config here w
ould be too much |
| 72 locales_base = os.path.join(baseDir, "adblockplus") | 72 locales_base = os.path.join(baseDir, 'adblockplus') |
| 73 | 73 |
| 74 locales = packagerGecko.readLocaleMetadata(locales_base, [packagerGecko.defa
ultLocale]) | 74 locales = packagerGecko.readLocaleMetadata(locales_base, [packagerGecko.defa
ultLocale]) |
| 75 extensionName = locales[packagerGecko.defaultLocale]['name'] | 75 extensionName = locales[packagerGecko.defaultLocale]['name'] |
| 76 | 76 |
| 77 # Now commit the change and tag it | 77 # Now commit the change and tag it |
| 78 subprocess.check_call(['hg', 'commit', '-R', baseDir, '-m', 'Releasing %s %s
' % (extensionName, version)]) | 78 subprocess.check_call(['hg', 'commit', '-R', baseDir, '-m', 'Releasing %s %s
' % (extensionName, version)]) |
| 79 subprocess.check_call(['hg', 'tag', '-R', baseDir, '-f', version]) | 79 subprocess.check_call(['hg', 'tag', '-R', baseDir, '-f', version]) |
| 80 | 80 |
| 81 # Create a release build | 81 # Create a release build |
| 82 downloads = [] | 82 downloads = [] |
| 83 if type == "gecko": | 83 if type == 'gecko': |
| 84 keyFile = keyFiles[0] if keyFiles else None | 84 keyFile = keyFiles[0] if keyFiles else None |
| 85 metadata = packager.readMetadata(baseDir, type) | 85 metadata = packager.readMetadata(baseDir, type) |
| 86 buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(meta
data, version, 'xpi')) | 86 buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(meta
data, version, 'xpi')) |
| 87 packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild
=True, keyFile=keyFile) | 87 packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild
=True, keyFile=keyFile) |
| 88 downloads.append(buildPath) | 88 downloads.append(buildPath) |
| 89 elif type == "chrome": | 89 elif type == 'chrome': |
| 90 # We actually have to create three different builds: signed and unsigned | 90 # We actually have to create three different builds: signed and unsigned |
| 91 # Chrome builds (the latter for Chrome Web Store), and a signed Safari b
uild. | 91 # Chrome builds (the latter for Chrome Web Store), and a signed Safari b
uild. |
| 92 metadata = packager.readMetadata(baseDir, type) | 92 metadata = packager.readMetadata(baseDir, type) |
| 93 buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(meta
data, version, 'crx')) | 93 buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(meta
data, version, 'crx')) |
| 94 packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild
=True, keyFile=keyFiles[0]) | 94 packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild
=True, keyFile=keyFiles[0]) |
| 95 downloads.append(buildPath) | 95 downloads.append(buildPath) |
| 96 | 96 |
| 97 buildPathUnsigned = os.path.join(baseDir, packager.getDefaultFileName(me
tadata, version, 'zip')) | 97 buildPathUnsigned = os.path.join(baseDir, packager.getDefaultFileName(me
tadata, version, 'zip')) |
| 98 packager.createBuild(baseDir, type=type, outFile=buildPathUnsigned, rele
aseBuild=True, keyFile=None) | 98 packager.createBuild(baseDir, type=type, outFile=buildPathUnsigned, rele
aseBuild=True, keyFile=None) |
| 99 | 99 |
| 100 import buildtools.packagerSafari as packagerSafari | 100 import buildtools.packagerSafari as packagerSafari |
| 101 metadataSafari = packagerSafari.readMetadata(baseDir, "safari") | 101 metadataSafari = packagerSafari.readMetadata(baseDir, 'safari') |
| 102 buildPathSafari = os.path.join(downloadsRepo, packagerSafari.getDefaultF
ileName(metadataSafari, version, 'safariextz')) | 102 buildPathSafari = os.path.join(downloadsRepo, packagerSafari.getDefaultF
ileName(metadataSafari, version, 'safariextz')) |
| 103 packagerSafari.createBuild(baseDir, type="safari", outFile=buildPathSafa
ri, releaseBuild=True, keyFile=keyFiles[1]) | 103 packagerSafari.createBuild(baseDir, type='safari', outFile=buildPathSafa
ri, releaseBuild=True, keyFile=keyFiles[1]) |
| 104 downloads.append(buildPathSafari) | 104 downloads.append(buildPathSafari) |
| 105 | 105 |
| 106 # Create source archive | 106 # Create source archive |
| 107 archivePath = os.path.splitext(buildPath)[0] + '-source.tgz' | 107 archivePath = os.path.splitext(buildPath)[0] + '-source.tgz' |
| 108 create_sourcearchive(baseDir, archivePath) | 108 create_sourcearchive(baseDir, archivePath) |
| 109 downloads.append(archivePath) | 109 downloads.append(archivePath) |
| 110 | 110 |
| 111 # Now add the downloads and commit | 111 # Now add the downloads and commit |
| 112 subprocess.check_call(['hg', 'add', '-R', downloadsRepo] + downloads) | 112 subprocess.check_call(['hg', 'add', '-R', downloadsRepo] + downloads) |
| 113 subprocess.check_call(['hg', 'commit', '-R', downloadsRepo, '-m', 'Releasing
%s %s' % (extensionName, version)]) | 113 subprocess.check_call(['hg', 'commit', '-R', downloadsRepo, '-m', 'Releasing
%s %s' % (extensionName, version)]) |
| 114 | 114 |
| 115 # Push all changes | 115 # Push all changes |
| 116 subprocess.check_call(['hg', 'push', '-R', baseDir]) | 116 subprocess.check_call(['hg', 'push', '-R', baseDir]) |
| 117 subprocess.check_call(['hg', 'push', '-R', downloadsRepo]) | 117 subprocess.check_call(['hg', 'push', '-R', downloadsRepo]) |
| OLD | NEW |