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

Merge pull request #28 from brightray/vendor-gyp

Browse source 
Include gyp as a submodule
This commit is contained in:
Adam Roben 2013-08-23 04:52:20 -07:00
commit 79a1731921
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
brightray/.gitmodules vendored
View file

@ -1,3 +1,6 @@
[submodule "vendor/libchromiumcontent"] [submodule "vendor/libchromiumcontent"]
path = vendor/libchromiumcontent path = vendor/libchromiumcontent
url = https://github.com/brightray/libchromiumcontent url = https://github.com/brightray/libchromiumcontent
[submodule "vendor/gyp"]
path = vendor/gyp
url = https://github.com/svn2github/gyp

1
brightray/README.md
View file

@ -14,7 +14,6 @@ sample application written using Brightray.
### Prerequisites ### Prerequisites
* Python 2.7 * Python 2.7
* gyp
* Linux: * Linux:
* Clang 3.0 * Clang 3.0
* Mac: * Mac:

6
brightray/script/build
View file

@ -6,9 +6,7 @@ import sys
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
GYP = { GYP = os.path.join(SOURCE_ROOT, 'vendor', 'gyp', 'gyp_main.py')
'win32': 'gyp.bat',
}.get(sys.platform, 'gyp')
def main(): def main():
@ -17,7 +15,7 @@ def main():
def run_gyp(): def run_gyp():
return subprocess.call([GYP, '--depth', '.', 'brightray.gyp']) return subprocess.call([sys.executable, GYP, '--depth', '.', 'brightray.gyp'])
def build(): def build():

1
brightray/vendor/gyp vendored Submodule

@ -0,0 +1 @@
Subproject commit 6633baab29b60f27e3dca607ffbef689ccdd82b8