From: Antonio Gomes <a1.gomes@samsung.com>
Date: Mon, 15 Dec 2014 21:14:22 +0000 (-0800)
Subject: [Crosswalk] Move away from custom_hooks needs in .gclient.
X-Git-Tag: submit/tizen/20201118.160233~1130
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49e93000ad9fe99ce16867bc594d124a3d75fa7b;p=platform%2Fframework%2Fweb%2Fchromium-efl.git

[Crosswalk] Move away from custom_hooks needs in .gclient.

Patch adds a DEPS file in tizen_src where 'xwalk' is specified
as a hard dependency. It allows us to greatly simplify
our suggested .gclient.

Our 'custom_hooks' also got to be declared as 'hooks' in DEPS.

Change-Id: I21d55ed5b7730bed1100abcd9efee2d272d9720c
Signed-off-by: Piotr Tworek <p.tworek@samsung.com>
---

diff --git a/tizen_src/DEPS b/tizen_src/DEPS
new file mode 100644
index 0000000..e008975
--- /dev/null
+++ b/tizen_src/DEPS
@@ -0,0 +1,25 @@
+include_rules = [
+]
+
+vars = {
+}
+
+deps = {
+  "src/xwalk": "https://github.com/crosswalk-project/crosswalk-efl.git@efl/crosswalk-10/39.0.2171.19",
+}
+
+hooks = [
+  {
+    # Generate .gclient-xwalk for Crosswalk's dependencies, including
+    # custom chromium and WebKit repositories.
+    "name": "generate-gclient-xwalk",
+    "pattern": ".",
+    "action": ["python", "src/tizen_src/scripts/xwalk/generate_gclient-xwalk.py"],
+  },
+  {
+    # Fetch Crosswalk dependencies.
+    "name": "fetch-deps",
+    "pattern": ".",
+    "action": ["python", "src/xwalk/tools/fetch_deps.py", "-v"],
+  },
+]
diff --git a/tizen_src/README.md b/tizen_src/README.md
index f460600..8cc0ce6 100755
--- a/tizen_src/README.md
+++ b/tizen_src/README.md
@@ -9,13 +9,14 @@ supposed to be completely source and binary compatible with EFL-WebKit2.
 ## Details
 
 1. gclient pulls chromium-efl into "src/tizen_src".
-2. The it runs 2 custom hooks in order to get the rest of the source:
+2. The it runs 2 hooks in order to get the rest of the source:
 
 ```
 * generate-gclient-xwalk: .gclient-xwalk is created by running
     src/tizen_src/scripts/xwalkgenerate_gclient-xwalk.py (this is a fork
     of the same script in xwalk repository).
-* fetch-deps: actually fetches all depedencies in .gclient-xwalk.
+* fetch-deps: part of the xwalk solution in .gclient, gets called from within
+    xwalk pull procedure. It actually fetches all depedencies based on .gclient-xwalk.
 ```
 
 ## Procedure
@@ -26,36 +27,8 @@ supposed to be completely source and binary compatible with EFL-WebKit2.
 solutions = [
   { "name"        : "src/tizen_src",
     "url"         : "https://github.com/crosswalk-project/chromium-efl.git@efl/crosswalk-10/39.0.2171.19",
-    "managed"     : True,
-    "custom_hooks": [
-      {
-        # Generate .gclient-xwalk for Crosswalk's dependencies, including
-        # custom chromium and WebKit repositories.
-        "name": "generate-gclient-xwalk",
-        "pattern": ".",
-        "action": ["python", "src/tizen_src/scripts/xwalk/generate_gclient-xwalk.py"],
-      },
-    ],
-    "safesync_url": "",
-  },
-  { "name": "src/xwalk",
-    "url": "https://github.com/crosswalk-project/crosswalk-efl.git@efl/crosswalk-10/39.0.2171.19",
-    "custom_hooks": [
-      {
-        # Override xwalk's creation of .gclient-xwalk since chromium-efl
-        # use its own generator.
-        "name": "generate-gclient-xwalk",
-      },
-      # The hook named fetch-deps is called as part of xwalk's
-      # pull solution, and does not need to be explicitly invoked here.
-      {
-        # At some point, we will integrate to gyp_xwalk. Not now...
-        "name": "gyp-xwalk",
-      }
-    ],
   },
 ]
-cache_dir = None
 ```
 
 2. gclient sync