diff --git a/script/bootstrap.py b/script/bootstrap.py index 5ce068bfab..516e0b4d0e 100755 --- a/script/bootstrap.py +++ b/script/bootstrap.py @@ -4,7 +4,7 @@ import argparse import os import sys -from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, NODE_VERSION +from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL from lib.util import execute, scoped_cwd, enable_verbose_execute @@ -65,7 +65,6 @@ def update_node_modules(dirname): def update_atom_modules(dirname): - os.environ['ATOM_NODE_VERSION'] = NODE_VERSION[1:] with scoped_cwd(dirname): apm = os.path.join(SOURCE_ROOT, 'node_modules', '.bin', 'apm') if sys.platform in ['win32', 'cygwin']: diff --git a/script/create-dist.py b/script/create-dist.py index 3c6be9af1e..5188fbfdf8 100755 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -8,8 +8,8 @@ import subprocess import sys import tarfile -from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, NODE_VERSION, \ - TARGET_PLATFORM, DIST_ARCH +from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, TARGET_PLATFORM, \ + DIST_ARCH from lib.util import scoped_cwd, rm_rf, get_atom_shell_version, make_zip, \ safe_mkdir, execute @@ -20,7 +20,7 @@ SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) DIST_DIR = os.path.join(SOURCE_ROOT, 'dist') OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'Release') NODE_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'node') -DIST_HEADERS_NAME = 'node-{0}'.format(NODE_VERSION) +DIST_HEADERS_NAME = 'node-{0}'.format(ATOM_SHELL_VERSION) DIST_HEADERS_DIR = os.path.join(DIST_DIR, DIST_HEADERS_NAME) SYMBOL_NAME = { diff --git a/script/lib/config.py b/script/lib/config.py index 63954b2fa8..db6c1a9706 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -3,7 +3,6 @@ import platform import sys -NODE_VERSION = 'v0.11.13' BASE_URL = 'https://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent' LIBCHROMIUMCONTENT_COMMIT = '2cf80c1743e370c12eb7bf078eb425f3cc355383' diff --git a/script/upload.py b/script/upload.py index 5f9f355e4e..c7480b939a 100755 --- a/script/upload.py +++ b/script/upload.py @@ -8,7 +8,7 @@ import subprocess import sys import tempfile -from lib.config import DIST_ARCH, NODE_VERSION, TARGET_PLATFORM +from lib.config import DIST_ARCH, TARGET_PLATFORM from lib.util import get_atom_shell_version, scoped_cwd, safe_mkdir, execute, \ s3_config, s3put from lib.github import GitHub @@ -51,7 +51,7 @@ def main(): # Upload node's headers to S3. bucket, access_key, secret_key = s3_config() - upload_node(bucket, access_key, secret_key, NODE_VERSION) + upload_node(bucket, access_key, secret_key, ATOM_SHELL_VERSION) if args.publish_release: # Press the publish button. @@ -60,7 +60,7 @@ def main(): # Upload the SHASUMS.txt. execute([sys.executable, os.path.join(SOURCE_ROOT, 'script', 'upload-checksums.py'), - '-v', NODE_VERSION]) + '-v', ATOM_SHELL_VERSION]) def parse_args():