From 0049e43d6532a74d347bf3046f0ab4a5f5d57145 Mon Sep 17 00:00:00 2001
From: Geoff Lang <geofflang@chromium.org>
Date: Mon, 7 Oct 2013 17:07:33 -0400
Subject: [PATCH] Fixed the DEPS folder and added a .gclient file so gclient
 sync will now work.

---
 .gclient                                      |  7 +++++
 .gitignore                                    | 10 +++----
 DEPS                                          | 12 ++++-----
 build/gyp_angle                               |  1 +
 tests/compiler_tests/ExpressionLimit_test.cpp |  2 +-
 tests/tests.gyp                               | 26 +++++++++----------
 6 files changed, 32 insertions(+), 26 deletions(-)
 create mode 100644 .gclient

diff --git a/.gclient b/.gclient
new file mode 100644
index 000000000..7484aed9a
--- /dev/null
+++ b/.gclient
@@ -0,0 +1,7 @@
+solutions = [ {
+    u'managed': False,
+    u'name': u'.',
+    u'url': u'https://code.google.com/p/angleproject/',
+    u'custom_deps': { },
+    u'deps_file': u'DEPS'
+} ]
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 5e64860db..c00db935d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ Release
 *.sdf
 *.ncb
 *.suo
-*.vcproj.*
 *.vcxproj.user
 patches-*
 *.target.mk
@@ -12,8 +11,7 @@ debug.txt
 *.opensdf
 *.orig
 *.rej
-
-# Files generated by gyp
-src/build_angle.sln
-src/*.vcxproj
-src/*.vcxproj.filters
+.gclient_entries
+third_party
+tests/third_party
+build/trunk
diff --git a/DEPS b/DEPS
index 1e5112c88..026535adb 100644
--- a/DEPS
+++ b/DEPS
@@ -1,18 +1,18 @@
 deps = {
-  "trunk/third_party/gyp":
+  "third_party/gyp":
       "http://gyp.googlecode.com/svn/trunk@1564",
 
-  "trunk/third_party/googletest":
-      "http://googletest.googlecode.com/svn/trunk@573", #release 1.6.0
+  "tests/third_party/googletest":
+      "http://googletest.googlecode.com/svn/trunk@629",
 
-  "trunk/third_party/googlemock":
-      "http://googlemock.googlecode.com/svn/trunk@387", #release 1.6.0
+  "tests/third_party/googlemock":
+      "http://googlemock.googlecode.com/svn/trunk@410",
 }
 
 hooks = [
   {
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "pattern": ".",
-    "action": ["python", "trunk/build/gyp_angle"],
+    "action": ["python", "build/gyp_angle"],
   },
 ]
diff --git a/build/gyp_angle b/build/gyp_angle
index 2aa38a523..085dc84e7 100644
--- a/build/gyp_angle
+++ b/build/gyp_angle
@@ -14,6 +14,7 @@ script_dir = os.path.dirname(__file__)
 angle_dir = os.path.normpath(os.path.join(script_dir, os.pardir))
 
 sys.path.append(os.path.join(angle_dir, 'third_party', 'gyp', 'pylib'))
+print os.path.join(angle_dir, 'third_party', 'gyp', 'pylib')
 import gyp
 
 if __name__ == '__main__':
diff --git a/tests/compiler_tests/ExpressionLimit_test.cpp b/tests/compiler_tests/ExpressionLimit_test.cpp
index 3af099dec..1b2138f29 100644
--- a/tests/compiler_tests/ExpressionLimit_test.cpp
+++ b/tests/compiler_tests/ExpressionLimit_test.cpp
@@ -153,7 +153,7 @@ protected:
                                 const char* source,
                                 int compileOptions,
                                 const char* expected_error) {
-        bool success = ShCompile(compiler, &source, 1, compileOptions);
+        bool success = ShCompile(compiler, &source, 1, compileOptions) != 0;
         if (success) {
             success = !expected_error;
         } else {
diff --git a/tests/tests.gyp b/tests/tests.gyp
index 06443dcdb..24c35ab15 100644
--- a/tests/tests.gyp
+++ b/tests/tests.gyp
@@ -10,12 +10,12 @@
             'type': 'static_library',
             'include_dirs':
             [
-                '../third_party/googletest',
-                '../third_party/googletest/include',
+                'third_party/googletest',
+                'third_party/googletest/include',
             ],
             'sources':
             [
-                '../third_party/googletest/src/gtest-all.cc',
+                'third_party/googletest/src/gtest-all.cc',
             ],
         },
 
@@ -24,13 +24,13 @@
             'type': 'static_library',
             'include_dirs':
             [
-                '../third_party/googlemock',
-                '../third_party/googlemock/include',
-                '../third_party/googletest/include',
+                'third_party/googlemock',
+                'third_party/googlemock/include',
+                'third_party/googletest/include',
             ],
             'sources':
             [
-                '../third_party/googlemock/src/gmock-all.cc',
+                'third_party/googlemock/src/gmock-all.cc',
             ],
         },
 
@@ -46,12 +46,12 @@
             'include_dirs':
             [
                 '../src/compiler/preprocessor',
-                '../third_party/googletest/include',
-                '../third_party/googlemock/include',
+                'third_party/googletest/include',
+                'third_party/googlemock/include',
             ],
             'sources':
             [
-                '../third_party/googlemock/src/gmock_main.cc',
+                'third_party/googlemock/src/gmock_main.cc',
                 '<!@(python enumerate_files.py preprocessor_tests -types *.cpp *.h)'
             ],
         },
@@ -69,12 +69,12 @@
             [
                 '../include',
                 '../src',
-                '../third_party/googletest/include',
-                '../third_party/googlemock/include',
+                'third_party/googletest/include',
+                'third_party/googlemock/include',
             ],
             'sources':
             [
-                '../third_party/googlemock/src/gmock_main.cc',
+                'third_party/googlemock/src/gmock_main.cc',
                 '<!@(python enumerate_files.py compiler_tests -types *.cpp *.h)'
             ],
         },