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

Use win32 python to call gyp when running under cygwin.

Browse source
This commit is contained in:
Cheng Zhao 2013-07-01 15:49:52 +08:00
parent 09a4ea718d
commit f510f77b98
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
script/update-node.py
View file

@ -9,7 +9,7 @@ import os
from lib.util import * from lib.util import *
SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__)) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
NODE_VERSION = 'v0.10.9' NODE_VERSION = 'v0.10.9'
NODE_DIST_URL = 'https://gh-contractor-zcbenz.s3.amazonaws.com/node/dist' NODE_DIST_URL = 'https://gh-contractor-zcbenz.s3.amazonaws.com/node/dist'
IS_POSIX = (sys.platform != 'win32') and (sys.platform != 'cygwin') IS_POSIX = (sys.platform != 'win32') and (sys.platform != 'cygwin')

13
script/update.py
View file

@ -6,7 +6,7 @@ import sys
from lib.util import * from lib.util import *
SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__)) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
NODE_VERSION = 'v0.10.12' NODE_VERSION = 'v0.10.12'
@ -19,16 +19,19 @@ def main():
def update_frameworks_and_node(version): def update_frameworks_and_node(version):
if sys.platform == 'darwin': if sys.platform == 'darwin':
uf = os.path.join(SOURCE_ROOT, 'script', 'update-frameworks.py') uf = os.path.join('script', 'update-frameworks.py')
subprocess.check_call([sys.executable, uf]) subprocess.check_call([sys.executable, uf])
un = os.path.join(SOURCE_ROOT, 'script', 'update-node.py') un = os.path.join('script', 'update-node.py')
subprocess.check_call([sys.executable, un, '--version', version]) subprocess.check_call([sys.executable, un, '--version', version])
def update_gyp(): def update_gyp():
gyp = os.path.join(SOURCE_ROOT, 'vendor', 'gyp', 'gyp') gyp = os.path.join('vendor', 'gyp', 'gyp')
subprocess.check_call([sys.executable, gyp, python = sys.executable
if sys.platform == 'cygwin':
python = os.path.join('vendor', 'python_26', 'python.exe')
subprocess.check_call([python, gyp,
'-f', 'ninja', '--depth', '.', 'atom.gyp', '-f', 'ninja', '--depth', '.', 'atom.gyp',
'-Icommon.gypi', '-Ivendor/brightray/brightray.gypi', '-Icommon.gypi', '-Ivendor/brightray/brightray.gypi',
'-Dtarget_arch=ia32', '-Dlibrary=static_library']) '-Dtarget_arch=ia32', '-Dlibrary=static_library'])