mirror of
https://github.com/electron/electron.git
synced 2026-01-28 16:58:21 -05:00
Merge pull request #28 from brightray/vendor-gyp
Include gyp as a submodule
This commit is contained in:
3
brightray/.gitmodules
vendored
3
brightray/.gitmodules
vendored
@@ -1,3 +1,6 @@
|
||||
[submodule "vendor/libchromiumcontent"]
|
||||
path = vendor/libchromiumcontent
|
||||
url = https://github.com/brightray/libchromiumcontent
|
||||
[submodule "vendor/gyp"]
|
||||
path = vendor/gyp
|
||||
url = https://github.com/svn2github/gyp
|
||||
|
||||
@@ -14,7 +14,6 @@ sample application written using Brightray.
|
||||
### Prerequisites
|
||||
|
||||
* Python 2.7
|
||||
* gyp
|
||||
* Linux:
|
||||
* Clang 3.0
|
||||
* Mac:
|
||||
|
||||
@@ -6,9 +6,7 @@ import sys
|
||||
|
||||
|
||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
GYP = {
|
||||
'win32': 'gyp.bat',
|
||||
}.get(sys.platform, 'gyp')
|
||||
GYP = os.path.join(SOURCE_ROOT, 'vendor', 'gyp', 'gyp_main.py')
|
||||
|
||||
|
||||
def main():
|
||||
@@ -17,7 +15,7 @@ def main():
|
||||
|
||||
|
||||
def run_gyp():
|
||||
return subprocess.call([GYP, '--depth', '.', 'brightray.gyp'])
|
||||
return subprocess.call([sys.executable, GYP, '--depth', '.', 'brightray.gyp'])
|
||||
|
||||
|
||||
def build():
|
||||
|
||||
1
brightray/vendor/gyp
vendored
Submodule
1
brightray/vendor/gyp
vendored
Submodule
Submodule brightray/vendor/gyp added at 6633baab29
Reference in New Issue
Block a user