mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use "R" and "D" as short names for config

Browse source
This commit is contained in:
Cheng Zhao 2015-04-03 11:59:14 +08:00
parent 8a91000083
commit 8b7d875e40
8 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
script/build.py
View file

@ -19,7 +19,7 @@ def main():
args = parse_args() args = parse_args()
for config in args.configuration: 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]) ret = subprocess.call([ninja, '-C', build_path, args.target])
if ret != 0: if ret != 0:
sys.exit(ret) sys.exit(ret)

4
script/create-dist.py
View file

@ -17,7 +17,7 @@ ATOM_SHELL_VERSION = get_atom_shell_version()
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
DIST_DIR = os.path.join(SOURCE_ROOT, 'dist') 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 = { SYMBOL_NAME = {
'darwin': 'libchromiumcontent.dylib.dSYM', 'darwin': 'libchromiumcontent.dylib.dSYM',
@ -162,7 +162,7 @@ def create_version():
def download_libchromiumcontent_symbols(url): def download_libchromiumcontent_symbols(url):
brightray_dir = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor') brightray_dir = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor')
target_dir = os.path.join(brightray_dir, 'download', 'libchromiumcontent') 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): if os.path.exists(symbols_path):
return return

2
script/lib/util.py
View file

@ -160,7 +160,7 @@ def get_atom_shell_version():
def get_chromedriver_version(): def get_chromedriver_version():
SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..')) 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() output = subprocess.check_output([chromedriver, '-v']).strip()
return 'v' + output[13:] return 'v' + output[13:]

6
script/test.py
View file

@ -12,12 +12,12 @@ def main():
os.chdir(SOURCE_ROOT) os.chdir(SOURCE_ROOT)
if sys.platform == 'darwin': 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') 'Contents', 'MacOS', 'Atom')
elif sys.platform == 'win32': 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: 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:]) subprocess.check_call([atom_shell, 'spec'] + sys.argv[1:])

2
script/upload-node-headers.py
View file

@ -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__))) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
DIST_DIR = os.path.join(SOURCE_ROOT, 'dist') DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
NODE_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'node') 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 = [ HEADERS_SUFFIX = [
'.h', '.h',

4
script/upload-windows-pdb.py
View file

@ -10,8 +10,8 @@ SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
SYMBOLS_DIR = 'dist\\symbols' SYMBOLS_DIR = 'dist\\symbols'
DOWNLOAD_DIR = 'vendor\\brightray\\vendor\\download\\libchromiumcontent' DOWNLOAD_DIR = 'vendor\\brightray\\vendor\\download\\libchromiumcontent'
PDB_LIST = [ PDB_LIST = [
'out\\Release\\atom.exe.pdb', 'out\\R\\atom.exe.pdb',
DOWNLOAD_DIR + '\\Release\\chromiumcontent.dll.pdb', DOWNLOAD_DIR + '\\R\\chromiumcontent.dll.pdb',
] ]

8
script/upload.py
View file

@ -18,7 +18,7 @@ ATOM_SHELL_VERSION = get_atom_shell_version()
CHROMEDRIVER_VERSION = get_chromedriver_version() CHROMEDRIVER_VERSION = get_chromedriver_version()
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) 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_DIR = os.path.join(SOURCE_ROOT, 'dist')
DIST_NAME = 'atom-shell-{0}-{1}-{2}.zip'.format(ATOM_SHELL_VERSION, DIST_NAME = 'atom-shell-{0}-{1}-{2}.zip'.format(ATOM_SHELL_VERSION,
TARGET_PLATFORM, TARGET_PLATFORM,
@ -84,12 +84,12 @@ def parse_args():
def get_atom_shell_build_version(): def get_atom_shell_build_version():
if TARGET_PLATFORM == 'darwin': 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') 'Contents', 'MacOS', 'Atom')
elif TARGET_PLATFORM == 'win32': 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: 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() return subprocess.check_output([atom_shell, '--version']).strip()

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit ca993560286e14aa936d3cff415e2b317ba8faf0 Subproject commit f89e3f633ec0c9ead422d0a39f7f42e693544d08