From 9684f61e12e8c0651359ec040addfe6b72885f5d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 25 May 2016 09:10:46 -0700 Subject: [PATCH] atom_gyp -> electron_gyp --- script/build.py | 4 ++-- script/bump-version.py | 4 ++-- script/create-dist.py | 6 +++--- script/dump-symbols.py | 4 ++-- script/lib/util.py | 4 ++-- script/start.py | 6 +++--- script/test.py | 6 +++--- script/upload-index-json.py | 6 +++--- script/upload-windows-pdb.py | 6 +++--- script/upload.py | 8 ++++---- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/script/build.py b/script/build.py index a134c014254f..1a7378bf9758 100755 --- a/script/build.py +++ b/script/build.py @@ -6,7 +6,7 @@ import subprocess import sys from lib.config import get_target_arch -from lib.util import atom_gyp, import_vs_env +from lib.util import electron_gyp, import_vs_env CONFIGURATIONS = ['Release', 'Debug'] @@ -40,7 +40,7 @@ def parse_args(): required=False) parser.add_argument('-t', '--target', help='Build specified target', - default=atom_gyp()['project_name%'], + default=electron_gyp()['project_name%'], required=False) return parser.parse_args() diff --git a/script/bump-version.py b/script/bump-version.py index db7c9d4e3a36..4db30b71fca9 100755 --- a/script/bump-version.py +++ b/script/bump-version.py @@ -27,7 +27,7 @@ def main(): version = '.'.join(versions[:3]) with scoped_cwd(SOURCE_ROOT): - update_atom_gyp(version) + update_electron_gyp(version) update_win_rc(version, versions) update_version_h(versions) update_info_plist(version) @@ -42,7 +42,7 @@ def increase_version(versions, index): return versions -def update_atom_gyp(version): +def update_electron_gyp(version): pattern = re.compile(" *'version%' *: *'[0-9.]+'") with open('electron.gyp', 'r') as f: lines = f.readlines() diff --git a/script/create-dist.py b/script/create-dist.py index c639ab8e1637..3f95cf2281d6 100755 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -12,7 +12,7 @@ from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, PLATFORM, \ get_target_arch, get_chromedriver_version, \ get_platform_key from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \ - execute, atom_gyp + execute, electron_gyp ELECTRON_VERSION = get_electron_version() @@ -23,8 +23,8 @@ OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R') CHROMIUM_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', 'download', 'libchromiumcontent', 'static_library') -PROJECT_NAME = atom_gyp()['project_name%'] -PRODUCT_NAME = atom_gyp()['product_name%'] +PROJECT_NAME = electron_gyp()['project_name%'] +PRODUCT_NAME = electron_gyp()['product_name%'] TARGET_BINARIES = { 'darwin': [ diff --git a/script/dump-symbols.py b/script/dump-symbols.py index 5c98d38a31f8..76949e95aa92 100755 --- a/script/dump-symbols.py +++ b/script/dump-symbols.py @@ -4,7 +4,7 @@ import os import sys from lib.config import PLATFORM -from lib.util import atom_gyp, execute, rm_rf +from lib.util import electron_gyp, execute, rm_rf SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) @@ -56,7 +56,7 @@ def register_required_dll(): def get_names_from_gyp(): - variables = atom_gyp() + variables = electron_gyp() return (variables['project_name%'], variables['product_name%']) diff --git a/script/lib/util.py b/script/lib/util.py index fe09a4d9646c..4db4e5fa6748 100644 --- a/script/lib/util.py +++ b/script/lib/util.py @@ -179,7 +179,7 @@ def execute_stdout(argv, env=os.environ): execute(argv, env) -def atom_gyp(): +def electron_gyp(): SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..')) gyp = os.path.join(SOURCE_ROOT, 'electron.gyp') with open(gyp) as f: @@ -188,7 +188,7 @@ def atom_gyp(): def get_electron_version(): - return 'v' + atom_gyp()['version%'] + return 'v' + electron_gyp()['version%'] def parse_version(version): diff --git a/script/start.py b/script/start.py index 76a079cb26ea..839ddf997348 100644 --- a/script/start.py +++ b/script/start.py @@ -4,13 +4,13 @@ import os import subprocess import sys -from lib.util import atom_gyp +from lib.util import electron_gyp SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) -PROJECT_NAME = atom_gyp()['project_name%'] -PRODUCT_NAME = atom_gyp()['product_name%'] +PROJECT_NAME = electron_gyp()['project_name%'] +PRODUCT_NAME = electron_gyp()['product_name%'] def main(): diff --git a/script/test.py b/script/test.py index c86aad460a5d..02377f481c5b 100755 --- a/script/test.py +++ b/script/test.py @@ -4,13 +4,13 @@ import os import subprocess import sys -from lib.util import atom_gyp, rm_rf +from lib.util import electron_gyp, rm_rf SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) -PROJECT_NAME = atom_gyp()['project_name%'] -PRODUCT_NAME = atom_gyp()['product_name%'] +PROJECT_NAME = electron_gyp()['project_name%'] +PRODUCT_NAME = electron_gyp()['product_name%'] def main(): diff --git a/script/upload-index-json.py b/script/upload-index-json.py index d926b105a6d7..f5e5b3c7a6ad 100755 --- a/script/upload-index-json.py +++ b/script/upload-index-json.py @@ -4,14 +4,14 @@ import os import sys from lib.config import PLATFORM, s3_config -from lib.util import atom_gyp, execute, s3put, scoped_cwd +from lib.util import electron_gyp, execute, s3put, scoped_cwd SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'D') -PROJECT_NAME = atom_gyp()['project_name%'] -PRODUCT_NAME = atom_gyp()['product_name%'] +PROJECT_NAME = electron_gyp()['project_name%'] +PRODUCT_NAME = electron_gyp()['product_name%'] def main(): diff --git a/script/upload-windows-pdb.py b/script/upload-windows-pdb.py index 12186aad2edc..6e8030337f3c 100755 --- a/script/upload-windows-pdb.py +++ b/script/upload-windows-pdb.py @@ -5,15 +5,15 @@ import glob import sys from lib.config import s3_config -from lib.util import atom_gyp, execute, rm_rf, safe_mkdir, s3put +from lib.util import electron_gyp, execute, rm_rf, safe_mkdir, s3put SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) SYMBOLS_DIR = 'dist\\symbols' DOWNLOAD_DIR = 'vendor\\brightray\\vendor\\download\\libchromiumcontent' -PROJECT_NAME = atom_gyp()['project_name%'] -PRODUCT_NAME = atom_gyp()['product_name%'] +PROJECT_NAME = electron_gyp()['project_name%'] +PRODUCT_NAME = electron_gyp()['product_name%'] PDB_LIST = [ 'out\\R\\{0}.exe.pdb'.format(PROJECT_NAME), diff --git a/script/upload.py b/script/upload.py index 7dc6749942da..a7ac8f4472ac 100755 --- a/script/upload.py +++ b/script/upload.py @@ -9,7 +9,7 @@ import tempfile from lib.config import PLATFORM, get_target_arch, get_chromedriver_version, \ get_platform_key, get_env_var -from lib.util import atom_gyp, execute, get_electron_version, parse_version, \ +from lib.util import electron_gyp, execute, get_electron_version, parse_version, \ scoped_cwd from lib.github import GitHub @@ -17,8 +17,8 @@ from lib.github import GitHub ELECTRON_REPO = 'electron/electron' ELECTRON_VERSION = get_electron_version() -PROJECT_NAME = atom_gyp()['project_name%'] -PRODUCT_NAME = atom_gyp()['product_name%'] +PROJECT_NAME = electron_gyp()['project_name%'] +PRODUCT_NAME = electron_gyp()['product_name%'] SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R') @@ -80,7 +80,7 @@ def main(): # Do not upload other files when passed "-p". return - # Upload atom-shell with GitHub Releases API. + # Upload Electron with GitHub Releases API. upload_electron(github, release, os.path.join(DIST_DIR, DIST_NAME)) upload_electron(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME)) if PLATFORM == 'darwin':