From bafd6a5c493086e09013877037fe7c3d78581794 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 28 Jun 2013 16:38:05 +0800
Subject: [PATCH] Ship gyp.

---
 .gitmodules      | 3 +++
 script/update.py | 4 +++-
 vendor/gyp       | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 160000 vendor/gyp

diff --git a/.gitmodules b/.gitmodules
index 74736fd87d2f..783f2cb0b46f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "vendor/node"]
 	path = vendor/node
   url = https://github.com/atom/cefode-node.git
+[submodule "vendor/gyp"]
+	path = vendor/gyp
+	url = https://github.com/svn2github/gyp.git
diff --git a/script/update.py b/script/update.py
index 47d39f8ef727..146f0c63a608 100755
--- a/script/update.py
+++ b/script/update.py
@@ -27,7 +27,9 @@ def update_frameworks_and_node(version):
 
 
 def update_gyp():
-  subprocess.check_call(['gyp', '-f', 'ninja', '--depth', '.', 'atom.gyp',
+  gyp = os.path.join(SOURCE_ROOT, 'vendor', 'gyp', 'gyp')
+  subprocess.check_call([sys.executable, gyp,
+                         '-f', 'ninja', '--depth', '.', 'atom.gyp',
                          '-Icommon.gypi', '-Ivendor/brightray/brightray.gypi',
                          '-Dtarget_arch=ia32', '-Dlibrary=static_library'])
 
diff --git a/vendor/gyp b/vendor/gyp
new file mode 160000
index 000000000000..4e2c8086835d
--- /dev/null
+++ b/vendor/gyp
@@ -0,0 +1 @@
+Subproject commit 4e2c8086835d6e768b2e1dde82bff8f87165d257