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

Switch to use crashpad repo under atom org.

Browse source
This commit is contained in:
Haojian Wu 2015-06-02 11:46:20 +08:00
parent 317406f26d
commit 2396b51cb6
2 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -13,3 +13,6 @@
[submodule "vendor/native_mate"] [submodule "vendor/native_mate"]
path = vendor/native_mate path = vendor/native_mate
url = https://github.com/zcbenz/native-mate.git url = https://github.com/zcbenz/native-mate.git
[submodule "vendor/crashpad"]
path = vendor/crashpad
url = https://github.com/atom/crashpad.git

15
script/bootstrap.py
View file

@ -12,7 +12,6 @@ from lib.util import execute_stdout, get_atom_shell_version, scoped_cwd
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor') VENDOR_DIR = os.path.join(SOURCE_ROOT, 'vendor')
PYTHON_26_URL = 'https://chromium.googlesource.com/chromium/deps/python_26' PYTHON_26_URL = 'https://chromium.googlesource.com/chromium/deps/python_26'
CRACKPAD_URL = 'https://github.com/hokein/crashpad.git'
NPM = 'npm.cmd' if sys.platform in ['win32', 'cygwin'] else 'npm' NPM = 'npm.cmd' if sys.platform in ['win32', 'cygwin'] else 'npm'
@ -28,8 +27,6 @@ def main():
update_win32_python() update_win32_python()
update_submodules() update_submodules()
update_node_modules('.') update_node_modules('.')
if sys.platform == 'darwin':
update_crashpad()
bootstrap_brightray(args.dev, args.url, args.target_arch) bootstrap_brightray(args.dev, args.url, args.target_arch)
create_chrome_version_h() create_chrome_version_h()
@ -95,18 +92,6 @@ def update_node_modules(dirname, env=None):
execute_stdout([NPM, 'install'], env) execute_stdout([NPM, 'install'], env)
def update_crashpad():
gclient = os.path.join(VENDOR_DIR, 'depot_tools', 'gclient.py')
args = [
'config',
'--unmanaged',
CRACKPAD_URL,
]
with scoped_cwd(VENDOR_DIR):
execute_stdout([sys.executable, gclient] + args)
execute_stdout([sys.executable, gclient] + ['sync'])
def update_electron_modules(dirname, target_arch): def update_electron_modules(dirname, target_arch):
env = os.environ.copy() env = os.environ.copy()
env['npm_config_arch'] = target_arch env['npm_config_arch'] = target_arch