mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #6986 from electron/arm-release-asset-name

Browse source 
Add v7l to ARM release assets
This commit is contained in:
Cheng Zhao 2016-08-31 20:35:59 +09:00 committed by GitHub
commit 5c051c9941
3 changed files with 26 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
script/create-dist.py
View file

@ -10,7 +10,7 @@ import stat
from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, PLATFORM, \ from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, PLATFORM, \
get_target_arch, get_chromedriver_version, \ get_target_arch, get_chromedriver_version, \
get_platform_key get_zip_name
from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \ from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \
execute, electron_gyp execute, electron_gyp
@ -165,9 +165,7 @@ def create_symbols():
def create_dist_zip(): def create_dist_zip():
dist_name = '{0}-{1}-{2}-{3}.zip'.format(PROJECT_NAME, ELECTRON_VERSION, dist_name = get_zip_name(PROJECT_NAME, ELECTRON_VERSION)
get_platform_key(),
get_target_arch())
zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name) zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
with scoped_cwd(DIST_DIR): with scoped_cwd(DIST_DIR):
@ -178,8 +176,7 @@ def create_dist_zip():
def create_chrome_binary_zip(binary, version): def create_chrome_binary_zip(binary, version):
dist_name = '{0}-{1}-{2}-{3}.zip'.format(binary, version, get_platform_key(), dist_name = get_zip_name(binary, version)
get_target_arch())
zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name) zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
with scoped_cwd(DIST_DIR): with scoped_cwd(DIST_DIR):
@ -192,8 +189,7 @@ def create_chrome_binary_zip(binary, version):
def create_ffmpeg_zip(): def create_ffmpeg_zip():
dist_name = 'ffmpeg-{0}-{1}-{2}.zip'.format( dist_name = get_zip_name('ffmpeg', ELECTRON_VERSION)
ELECTRON_VERSION, get_platform_key(), get_target_arch())
zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name) zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
if PLATFORM == 'darwin': if PLATFORM == 'darwin':
@ -214,10 +210,7 @@ def create_ffmpeg_zip():
def create_symbols_zip(): def create_symbols_zip():
dist_name = '{0}-{1}-{2}-{3}-symbols.zip'.format(PROJECT_NAME, dist_name = get_zip_name(PROJECT_NAME, ELECTRON_VERSION)
ELECTRON_VERSION,
get_platform_key(),
get_target_arch())
zip_file = os.path.join(DIST_DIR, dist_name) zip_file = os.path.join(DIST_DIR, dist_name)
licenses = ['LICENSE', 'LICENSES.chromium.html', 'version'] licenses = ['LICENSE', 'LICENSES.chromium.html', 'version']
@ -226,18 +219,12 @@ def create_symbols_zip():
make_zip(zip_file, licenses, dirs) make_zip(zip_file, licenses, dirs)
if PLATFORM == 'darwin': if PLATFORM == 'darwin':
dsym_name = '{0}-{1}-{2}-{3}-dsym.zip'.format(PROJECT_NAME, dsym_name = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'dsym')
ELECTRON_VERSION,
get_platform_key(),
get_target_arch())
with scoped_cwd(DIST_DIR): with scoped_cwd(DIST_DIR):
dsyms = glob.glob('*.dSYM') dsyms = glob.glob('*.dSYM')
make_zip(os.path.join(DIST_DIR, dsym_name), licenses, dsyms) make_zip(os.path.join(DIST_DIR, dsym_name), licenses, dsyms)
elif PLATFORM == 'win32': elif PLATFORM == 'win32':
pdb_name = '{0}-{1}-{2}-{3}-pdb.zip'.format(PROJECT_NAME, pdb_name = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'pdb')
ELECTRON_VERSION,
get_platform_key(),
get_target_arch())
with scoped_cwd(DIST_DIR): with scoped_cwd(DIST_DIR):
pdbs = glob.glob('*.pdb') pdbs = glob.glob('*.pdb')
make_zip(os.path.join(DIST_DIR, pdb_name), pdbs + licenses, []) make_zip(os.path.join(DIST_DIR, pdb_name), pdbs + licenses, [])

10
script/lib/config.py
View file

@ -73,3 +73,13 @@ def enable_verbose_mode():
def is_verbose_mode(): def is_verbose_mode():
return verbose_mode return verbose_mode
def get_zip_name(name, version, suffix=''):
arch = get_target_arch()
if arch is 'arm':
arch += 'v7l'
zip_name = '{0}-{1}-{2}-{3}'.format(name, version, get_platform_key(), arch)
if suffix:
zip_name += '-' + suffix
return zip_name + '.zip'

32
script/upload.py
View file

@ -10,7 +10,7 @@ import tempfile
from io import StringIO from io import StringIO
from lib.config import PLATFORM, get_target_arch, get_chromedriver_version, \ from lib.config import PLATFORM, get_target_arch, get_chromedriver_version, \
get_platform_key, get_env_var, s3_config get_env_var, s3_config, get_zip_name
from lib.util import electron_gyp, execute, get_electron_version, \ from lib.util import electron_gyp, execute, get_electron_version, \
parse_version, scoped_cwd, s3put parse_version, scoped_cwd, s3put
from lib.github import GitHub from lib.github import GitHub
@ -25,22 +25,11 @@ PRODUCT_NAME = electron_gyp()['product_name%']
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R') OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R')
DIST_DIR = os.path.join(SOURCE_ROOT, 'dist') DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
DIST_NAME = '{0}-{1}-{2}-{3}.zip'.format(PROJECT_NAME,
ELECTRON_VERSION, DIST_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION)
get_platform_key(), SYMBOLS_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'symbols')
get_target_arch()) DSYM_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'dsym')
SYMBOLS_NAME = '{0}-{1}-{2}-{3}-symbols.zip'.format(PROJECT_NAME, PDB_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'pdb')
ELECTRON_VERSION,
get_platform_key(),
get_target_arch())
DSYM_NAME = '{0}-{1}-{2}-{3}-dsym.zip'.format(PROJECT_NAME,
ELECTRON_VERSION,
get_platform_key(),
get_target_arch())
PDB_NAME = '{0}-{1}-{2}-{3}-pdb.zip'.format(PROJECT_NAME,
ELECTRON_VERSION,
get_platform_key(),
get_target_arch())
def main(): def main():
@ -94,17 +83,14 @@ def main():
upload_electron(github, release, os.path.join(DIST_DIR, PDB_NAME)) upload_electron(github, release, os.path.join(DIST_DIR, PDB_NAME))
# Upload free version of ffmpeg. # Upload free version of ffmpeg.
ffmpeg = 'ffmpeg-{0}-{1}-{2}.zip'.format( ffmpeg = get_zip_name('ffmpeg', ELECTRON_VERSION)
ELECTRON_VERSION, get_platform_key(), get_target_arch())
upload_electron(github, release, os.path.join(DIST_DIR, ffmpeg)) upload_electron(github, release, os.path.join(DIST_DIR, ffmpeg))
# Upload chromedriver and mksnapshot for minor version update. # Upload chromedriver and mksnapshot for minor version update.
if parse_version(args.version)[2] == '0': if parse_version(args.version)[2] == '0':
chromedriver = 'chromedriver-{0}-{1}-{2}.zip'.format( chromedriver = get_zip_name('chromedriver', get_chromedriver_version())
get_chromedriver_version(), get_platform_key(), get_target_arch())
upload_electron(github, release, os.path.join(DIST_DIR, chromedriver)) upload_electron(github, release, os.path.join(DIST_DIR, chromedriver))
mksnapshot = 'mksnapshot-{0}-{1}-{2}.zip'.format( mksnapshot = get_zip_name('mksnapshot', ELECTRON_VERSION)
ELECTRON_VERSION, get_platform_key(), get_target_arch())
upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot)) upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot))
if PLATFORM == 'win32' and not tag_exists: if PLATFORM == 'win32' and not tag_exists: