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

chore: fix out_dir usage in upload-symbols.py

Browse source
This commit is contained in:
Samuel Attard 2018-09-28 11:24:25 +10:00
parent 55765424f9
commit 37f405859f
4 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
script/lib/util.py
View file

@ -303,6 +303,8 @@ def get_out_dir():
out_dir = override out_dir = override
return os.path.join(GN_SRC_DIR, 'out', out_dir) return os.path.join(GN_SRC_DIR, 'out', out_dir)
# NOTE: This path is not created by gn, it is used as a scratch zone by our
# upload scripts
def get_dist_dir(): def get_dist_dir():
return os.path.join(get_out_dir(), 'gen', 'electron_dist') return os.path.join(get_out_dir(), 'gen', 'electron_dist')

2
script/upload-node-headers.py
View file

@ -9,8 +9,6 @@ import sys
from lib.config import PLATFORM, get_target_arch, s3_config from lib.config import PLATFORM, get_target_arch, s3_config
from lib.util import safe_mkdir, scoped_cwd, s3put, get_out_dir, get_dist_dir from lib.util import safe_mkdir, scoped_cwd, s3put, get_out_dir, get_dist_dir
# TODO: Update this entire file to point at the correct file names in the out
# directory
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
DIST_DIR = get_dist_dir() DIST_DIR = get_dist_dir()
OUT_DIR = get_out_dir() OUT_DIR = get_out_dir()

16
script/upload-symbols.py
View file

@ -5,26 +5,24 @@ import glob
import sys import sys
from lib.config import PLATFORM, s3_config, enable_verbose_mode from lib.config import PLATFORM, s3_config, enable_verbose_mode
from lib.util import get_electron_branding, execute, rm_rf, safe_mkdir, s3put from lib.util import get_electron_branding, execute, rm_rf, safe_mkdir, s3put, \
get_out_dir
# TODO: Update this entire file to point at the correct file names in the out
# directory
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
DIST_DIR = os.path.join(SOURCE_ROOT, 'dist') RELEASE_DIR = get_out_dir()
RELEASE_DIR = os.path.join(SOURCE_ROOT, 'out', 'R') GEN_DIR = os.path.join(RELEASE_DIR, 'gen')
PROJECT_NAME = get_electron_branding()['project_name'] PROJECT_NAME = get_electron_branding()['project_name']
PRODUCT_NAME = get_electron_branding()['product_name'] PRODUCT_NAME = get_electron_branding()['product_name']
if PLATFORM == 'win32': if PLATFORM == 'win32':
SYMBOLS_DIR = os.path.join(DIST_DIR, 'symbols') SYMBOLS_DIR = os.path.join(GEN_DIR, 'symbols')
else: else:
SYMBOLS_DIR = os.path.join(DIST_DIR, '{0}.breakpad.syms'.format(PROJECT_NAME)) SYMBOLS_DIR = os.path.join(GEN_DIR, '{0}.breakpad.syms'.format(PROJECT_NAME))
PDB_LIST = [ PDB_LIST = [
os.path.join(RELEASE_DIR, '{0}.exe.pdb'.format(PROJECT_NAME)), os.path.join(RELEASE_DIR, '{0}.exe.pdb'.format(PROJECT_NAME))
os.path.join(RELEASE_DIR, 'node.dll.pdb')
] ]

2
script/upload.py
View file

@ -34,8 +34,6 @@ DSYM_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'dsym')
PDB_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'pdb') PDB_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'pdb')
# TODO: Update this entire file to point at the correct file names in the out
# directory
def main(): def main():
args = parse_args() args = parse_args()
if args.upload_to_s3: if args.upload_to_s3: