Merge pull request #8640 from electron/fix-debug-symbols

Update libchromiumcontent: Fix debug symbols not generated
This commit is contained in:
Cheng Zhao 2017-02-10 19:11:31 +09:00 committed by GitHub
commit e8f689ecd3
2 changed files with 6 additions and 2 deletions

View file

@ -132,9 +132,13 @@ def copy_license():
shutil.copy2(os.path.join(SOURCE_ROOT, 'LICENSE'), DIST_DIR) shutil.copy2(os.path.join(SOURCE_ROOT, 'LICENSE'), DIST_DIR)
def create_api_json_schema(): def create_api_json_schema():
node_bin_dir = os.path.join(SOURCE_ROOT, 'node_modules', '.bin')
env = os.environ.copy()
env['PATH'] = os.path.pathsep.join([node_bin_dir, env['PATH']])
outfile = os.path.relpath(os.path.join(DIST_DIR, 'electron-api.json')) outfile = os.path.relpath(os.path.join(DIST_DIR, 'electron-api.json'))
execute(['electron-docs-linter', 'docs', '--outfile={0}'.format(outfile), execute(['electron-docs-linter', 'docs', '--outfile={0}'.format(outfile),
'--version={}'.format(ELECTRON_VERSION.replace('v', ''))]) '--version={}'.format(ELECTRON_VERSION.replace('v', ''))],
env=env)
def strip_binaries(): def strip_binaries():
for binary in TARGET_BINARIES[PLATFORM]: for binary in TARGET_BINARIES[PLATFORM]:

View file

@ -9,7 +9,7 @@ import sys
BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent' 'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \ LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \
'e0da1e9caa7c8f3da3519963a9ea32abba43c7c8' 'ea20b8dfe0a7fad61bb4917404950ddcd2224588'
PLATFORM = { PLATFORM = {
'cygwin': 'win32', 'cygwin': 'win32',