From 90492df1cbbe1ad8535c4b4befada4ee1b354a25 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 8 Feb 2017 14:24:56 +0900 Subject: [PATCH 1/2] Fix exception when executing create-dist directly --- script/create-dist.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/script/create-dist.py b/script/create-dist.py index f777d7a6ee50..4aa67eacd676 100755 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -132,9 +132,13 @@ def copy_license(): shutil.copy2(os.path.join(SOURCE_ROOT, 'LICENSE'), DIST_DIR) 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')) 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(): for binary in TARGET_BINARIES[PLATFORM]: From a3c5eafb16bf905c690b0fe347e1ec7fe4fa53f7 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 8 Feb 2017 14:28:34 +0900 Subject: [PATCH 2/2] Update libchromiumcontent to include debug symbols --- script/lib/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/lib/config.py b/script/lib/config.py index e6d149353c62..96c6591a545b 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -9,7 +9,7 @@ import sys BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ 'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent' LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \ - 'e0da1e9caa7c8f3da3519963a9ea32abba43c7c8' + 'ea20b8dfe0a7fad61bb4917404950ddcd2224588' PLATFORM = { 'cygwin': 'win32',