Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor code review of Python scripts

This commit is contained in:
Raymond Hill 2018-02-28 12:27:41 -05:00
parent 94afd504ee
commit c84308da6f
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/firefox/publish-signed-beta.py vendored
View File

@ -36,6 +36,11 @@ from string import Template
projdir = os.path.split(os.path.abspath(__file__))[0] projdir = os.path.split(os.path.abspath(__file__))[0]
while not os.path.isdir(os.path.join(projdir, '.git')): while not os.path.isdir(os.path.join(projdir, '.git')):
projdir = os.path.normpath(os.path.join(projdir, '..')) projdir = os.path.normpath(os.path.join(projdir, '..'))
# Check that found project root is valid
version_filepath = os.path.join(projdir, 'dist', 'version')
if not os.path.isfile(version_filepath):
print('Version file not found.')
exit(1)
extension_id = 'uBlock0@raymondhill.net' extension_id = 'uBlock0@raymondhill.net'
tmpdir = tempfile.TemporaryDirectory() tmpdir = tempfile.TemporaryDirectory()

25
tools/make-firefox-meta.py
View File

@ -20,6 +20,17 @@ def mkdirs(path):
pj = os.path.join pj = os.path.join
# Find path to project root
proj_dir = os.path.split(os.path.abspath(__file__))[0]
while not os.path.isdir(os.path.join(proj_dir, '.git')):
proj_dir = os.path.normpath(os.path.join(proj_dir, '..'))
# Check that found project root is valid
version_filepath = os.path.join(proj_dir, 'dist', 'version')
if not os.path.isfile(version_filepath):
print('Version file not found.')
exit(1)
build_dir = os.path.abspath(sys.argv[1]) build_dir = os.path.abspath(sys.argv[1])
source_locale_dir = pj(build_dir, '_locales') source_locale_dir = pj(build_dir, '_locales')
target_locale_dir = pj(build_dir, 'locale') target_locale_dir = pj(build_dir, 'locale')
@ -60,19 +71,18 @@ with open(chrome_manifest, 'at', encoding='utf-8', newline='\n') as f:
rmtree(source_locale_dir) rmtree(source_locale_dir)
# update install.rdf # update install.rdf
proj_dir = pj(os.path.split(os.path.abspath(__file__))[0], '..')
version = ''
with open(os.path.join(proj_dir, 'dist', 'version')) as f:
version = f.read().strip()
chromium_manifest = pj(proj_dir, 'platform', 'chromium', 'manifest.json') chromium_manifest = pj(proj_dir, 'platform', 'chromium', 'manifest.json')
with open(chromium_manifest, encoding='utf-8') as m: with open(chromium_manifest, encoding='utf-8') as m:
manifest = json.load(m) manifest = json.load(m)
# Fetch extension version
# https://developer.mozilla.org/en-US/Add-ons/AMO/Policy/Maintenance#How_do_I_submit_a_Beta_add-on.3F # https://developer.mozilla.org/en-US/Add-ons/AMO/Policy/Maintenance#How_do_I_submit_a_Beta_add-on.3F
# "To create a beta channel [...] '(a|alpha|b|beta|pre|rc)\d*$' " # "To create a beta channel [...] '(a|alpha|b|beta|pre|rc)\d*$' "
version = ''
with open(version_filepath) as f:
version = f.read().strip()
match = re.search('^(\d+\.\d+\.\d+)(\.\d+)$', version) match = re.search('^(\d+\.\d+\.\d+)(\.\d+)$', version)
if match: if match:
buildtype = int(match.group(2)[1:]) buildtype = int(match.group(2)[1:])
@ -80,9 +90,8 @@ if match:
builttype = 'b' + str(buildtype) builttype = 'b' + str(buildtype)
else: else:
builttype = 'rc' + str(buildtype - 100) builttype = 'rc' + str(buildtype - 100)
manifest['version'] = match.group(1) + builttype version = match.group(1) + builttype
else: manifest['version'] = version
manifest['version'] = version
manifest['homepage'] = 'https://github.com/gorhill/uBlock' manifest['homepage'] = 'https://github.com/gorhill/uBlock'
manifest['description'] = descriptions['en'] manifest['description'] = descriptions['en']