From eb6fa46041b8ab7ff1b6d94c5a09f5fc30aeb2d8 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 17 Apr 2015 12:13:20 +0800 Subject: [PATCH] Use product_name for generating zip archives --- script/upload.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/script/upload.py b/script/upload.py index 9cf0f04f3..3f7774488 100755 --- a/script/upload.py +++ b/script/upload.py @@ -8,24 +8,29 @@ import sys import tempfile from lib.config import PLATFORM, get_target_arch -from lib.util import execute, get_atom_shell_version, parse_version, \ +from lib.util import atom_gyp, execute, get_atom_shell_version, parse_version, \ get_chromedriver_version, scoped_cwd from lib.github import GitHub -ATOM_SHELL_REPO = 'atom/atom-shell' +ATOM_SHELL_REPO = 'atom/electron' ATOM_SHELL_VERSION = get_atom_shell_version() CHROMEDRIVER_VERSION = get_chromedriver_version() +PROJECT_NAME = atom_gyp()['project_name%'] +PRODUCT_NAME = atom_gyp()['product_name%'] + SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R') DIST_DIR = os.path.join(SOURCE_ROOT, 'dist') -DIST_NAME = 'atom-shell-{0}-{1}-{2}.zip'.format(ATOM_SHELL_VERSION, - PLATFORM, - get_target_arch()) -SYMBOLS_NAME = 'atom-shell-{0}-{1}-{2}-symbols.zip'.format(ATOM_SHELL_VERSION, - PLATFORM, - get_target_arch()) +DIST_NAME = '{0}-{1}-{2}-{3}.zip'.format(PROJECT_NAME, + ATOM_SHELL_VERSION, + PLATFORM, + get_target_arch()) +SYMBOLS_NAME = '{0}-{1}-{2}-{3}-symbols.zip'.format(PROJECT_NAME, + ATOM_SHELL_VERSION, + PLATFORM, + get_target_arch()) CHROMEDRIVER_NAME = 'chromedriver-{0}-{1}-{2}.zip'.format(CHROMEDRIVER_VERSION, PLATFORM, get_target_arch())