[Crosswalk] Move away from sync_repos.sh.

Patch implements a fully gclient based featch solution,
moving away from sync_repos.sh completely.

The following actions are done (README.md updated):
- The custom_hook associated to sync_repos.sh in .gclient is removed
- Chromium and WebKit are pulled directly from EFL forks via .gclient-xwalk.
- Crosswalk is pulled as a separate "solition" in .gclient.
- The needed custom hooks are overriden.

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

diff --git a/tizen_src/README.md b/tizen_src/README.md
index c90f95b..f460600 100755 (executable)
--- a/tizen_src/README.md
+++ b/tizen_src/README.md
@@ -9,11 +9,9 @@ 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 3 custom hooks in order to get the rest of the source:
+2. The it runs 2 custom hooks in order to get the rest of the source:
 
 ```
-* fetch-src-blink: src/tizen_src/sync_repos.sh is called and
-    pulls in src and src/third_party/WebKit from a pre-defined locations.
 * 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).
@@ -27,33 +25,34 @@ supposed to be completely source and binary compatible with EFL-WebKit2.
 ```
 solutions = [
   { "name"        : "src/tizen_src",
-    "url"         : "git@github.com:crosswalk-project/chromium-efl.git@efl/crosswalk-10/39.0.2171.19",
+    "url"         : "https://github.com/crosswalk-project/chromium-efl.git@efl/crosswalk-10/39.0.2171.19",
     "managed"     : True,
     "custom_hooks": [
       {
-        # fetch custom src and blink repositories.
-        "name": "fetch-src-blink",
-        "pattern": ".",
-        "action": ["src/tizen_src/sync_repos.sh"],
-      },
-      {
-        # Generate .gclient-xwalk for Crosswalk's dependencies.
+        # 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": [
       {
-        # Fetch Crosswalk dependencies.
-        "name": "fetch-deps",
-        "pattern": ".",
-        "action": ["python", "src/xwalk/tools/fetch_deps.py", "-v"],
+        # 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",
       }
     ],
-    "safesync_url": "",
   },
 ]
 cache_dir = None

diff --git a/tizen_src/scripts/xwalk/DEPS.xwalk b/tizen_src/scripts/xwalk/DEPS.xwalk
index 6e8ebce..b63172c 100644 (file)
--- a/tizen_src/scripts/xwalk/DEPS.xwalk
+++ b/tizen_src/scripts/xwalk/DEPS.xwalk
@@ -34,6 +34,8 @@ blink_upstream_rev = '184144'  # FIXME(wang16): Specify a later revision than
                                # This will not be needed in M40 or M39 past
                                # Blink r184144.
 
+efl_integration_branch = 'efl/crosswalk-10/39.0.2171.19'
+
 crosswalk_git = 'https://github.com/crosswalk-project'
 ozone_wayland_git = 'https://github.com/01org'
 
@@ -44,11 +46,13 @@ ozone_wayland_git = 'https://github.com/01org'
 
 solutions = [
   { 'name': 'src',
-    'url' : 'git://github.com/crosswalk-project/chromium-crosswalk-efl.git',
+    'url': crosswalk_git + '/chromium-crosswalk-efl.git@' + efl_integration_branch,
     'deps_file': '.DEPS.git',
     'custom_deps': {
-      'src': None,
-      'src/third_party/WebKit': None,
+      'src':
+        crosswalk_git + '/chromium-crosswalk-efl.git@' + efl_integration_branch,
+      'src/third_party/WebKit':
+        crosswalk_git + '/blink-crosswalk-efl.git@' + efl_integration_branch,
       'src/v8':
         crosswalk_git + '/v8-crosswalk.git@' + v8_crosswalk_rev,