From 8b7d875e40e6be025cfcb736eae3546586a0e2a6 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 3 Apr 2015 11:59:14 +0800 Subject: [PATCH] Use "R" and "D" as short names for config --- script/build.py | 2 +- script/create-dist.py | 4 ++-- script/lib/util.py | 2 +- script/test.py | 6 +++--- script/upload-node-headers.py | 2 +- script/upload-windows-pdb.py | 4 ++-- script/upload.py | 8 ++++---- vendor/brightray | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/script/build.py b/script/build.py index 52d4cc5fd80c..9935c1b2d5de 100755 --- a/script/build.py +++ b/script/build.py @@ -19,7 +19,7 @@ def main(): args = parse_args() for config in args.configuration: - build_path = os.path.join('out', 'Real' + config) + build_path = os.path.join('out', config[0]) ret = subprocess.call([ninja, '-C', build_path, args.target]) if ret != 0: sys.exit(ret) diff --git a/script/create-dist.py b/script/create-dist.py index 49b186edb670..36cc61e59393 100755 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -17,7 +17,7 @@ ATOM_SHELL_VERSION = get_atom_shell_version() 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') +OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R') SYMBOL_NAME = { 'darwin': 'libchromiumcontent.dylib.dSYM', @@ -162,7 +162,7 @@ def create_version(): def download_libchromiumcontent_symbols(url): brightray_dir = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor') target_dir = os.path.join(brightray_dir, 'download', 'libchromiumcontent') - symbols_path = os.path.join(target_dir, 'Release', SYMBOL_NAME) + symbols_path = os.path.join(target_dir, 'R', SYMBOL_NAME) if os.path.exists(symbols_path): return diff --git a/script/lib/util.py b/script/lib/util.py index 1c4f26b76ad5..174c65a83d95 100644 --- a/script/lib/util.py +++ b/script/lib/util.py @@ -160,7 +160,7 @@ def get_atom_shell_version(): def get_chromedriver_version(): SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..')) - chromedriver = os.path.join(SOURCE_ROOT, 'out', 'Release', 'chromedriver') + chromedriver = os.path.join(SOURCE_ROOT, 'out', 'R', 'chromedriver') output = subprocess.check_output([chromedriver, '-v']).strip() return 'v' + output[13:] diff --git a/script/test.py b/script/test.py index c21e52ab548c..21a1083cb1e9 100755 --- a/script/test.py +++ b/script/test.py @@ -12,12 +12,12 @@ def main(): os.chdir(SOURCE_ROOT) if sys.platform == 'darwin': - atom_shell = os.path.join(SOURCE_ROOT, 'out', 'Debug', 'Atom.app', + atom_shell = os.path.join(SOURCE_ROOT, 'out', 'D', 'Atom.app', 'Contents', 'MacOS', 'Atom') elif sys.platform == 'win32': - atom_shell = os.path.join(SOURCE_ROOT, 'out', 'Debug', 'atom.exe') + atom_shell = os.path.join(SOURCE_ROOT, 'out', 'D', 'atom.exe') else: - atom_shell = os.path.join(SOURCE_ROOT, 'out', 'Debug', 'atom') + atom_shell = os.path.join(SOURCE_ROOT, 'out', 'D', 'atom') subprocess.check_call([atom_shell, 'spec'] + sys.argv[1:]) diff --git a/script/upload-node-headers.py b/script/upload-node-headers.py index 6734929c10e7..c8998a80054c 100755 --- a/script/upload-node-headers.py +++ b/script/upload-node-headers.py @@ -14,7 +14,7 @@ from lib.util import execute, safe_mkdir, scoped_cwd, s3_config, s3put SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) DIST_DIR = os.path.join(SOURCE_ROOT, 'dist') NODE_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'node') -OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'Release') +OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R') HEADERS_SUFFIX = [ '.h', diff --git a/script/upload-windows-pdb.py b/script/upload-windows-pdb.py index e03e2bcfac7c..99dc41013428 100755 --- a/script/upload-windows-pdb.py +++ b/script/upload-windows-pdb.py @@ -10,8 +10,8 @@ SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) SYMBOLS_DIR = 'dist\\symbols' DOWNLOAD_DIR = 'vendor\\brightray\\vendor\\download\\libchromiumcontent' PDB_LIST = [ - 'out\\Release\\atom.exe.pdb', - DOWNLOAD_DIR + '\\Release\\chromiumcontent.dll.pdb', + 'out\\R\\atom.exe.pdb', + DOWNLOAD_DIR + '\\R\\chromiumcontent.dll.pdb', ] diff --git a/script/upload.py b/script/upload.py index e066d89423d2..677247a2e6e7 100755 --- a/script/upload.py +++ b/script/upload.py @@ -18,7 +18,7 @@ ATOM_SHELL_VERSION = get_atom_shell_version() CHROMEDRIVER_VERSION = get_chromedriver_version() SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) -OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'Release') +OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R') DIST_DIR = os.path.join(SOURCE_ROOT, 'dist') DIST_NAME = 'atom-shell-{0}-{1}-{2}.zip'.format(ATOM_SHELL_VERSION, TARGET_PLATFORM, @@ -84,12 +84,12 @@ def parse_args(): def get_atom_shell_build_version(): if TARGET_PLATFORM == 'darwin': - atom_shell = os.path.join(SOURCE_ROOT, 'out', 'Release', 'Atom.app', + atom_shell = os.path.join(SOURCE_ROOT, 'out', 'R', 'Atom.app', 'Contents', 'MacOS', 'Atom') elif TARGET_PLATFORM == 'win32': - atom_shell = os.path.join(SOURCE_ROOT, 'out', 'Release', 'atom.exe') + atom_shell = os.path.join(SOURCE_ROOT, 'out', 'R', 'atom.exe') else: - atom_shell = os.path.join(SOURCE_ROOT, 'out', 'Release', 'atom') + atom_shell = os.path.join(SOURCE_ROOT, 'out', 'R', 'atom') return subprocess.check_output([atom_shell, '--version']).strip() diff --git a/vendor/brightray b/vendor/brightray index ca993560286e..f89e3f633ec0 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit ca993560286e14aa936d3cff415e2b317ba8faf0 +Subproject commit f89e3f633ec0c9ead422d0a39f7f42e693544d08