Update the scripts for the snapshot of 37

- The svn repo string would be something like:
  ...branches/2062/path_suffix
  and I want only the branch number in this case.
  Updated git_submodule.py to support that case and use regexp
  instead to keep thing a bit simpler.
- .isolate are gyp files, moved the exception at the top
- Changed some inclusions/exclusions
- tools/ is now all excluded by default with exception instead
  of all included. We don't need most of it.

Change-Id: I6d0666d9af7fc6a0f3c4fe866adf2744f13f7c35
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

1 files changed, 14 insertions, 4 deletions

diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index aec1bf6fa..396fc626a 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -62,14 +62,19 @@ qtwebengine_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..',
 snapshot_src_dir = os.path.abspath(os.path.join(qtwebengine_root, 'src/3rdparty'))
 upstream_src_dir = os.path.abspath(snapshot_src_dir + '_upstream')
 
+submodule_blacklist = [
+    'third_party/WebKit/LayoutTests/w3c/csswg-test'
+    , 'third_party/WebKit/LayoutTests/w3c/web-platform-tests'
+    , 'chrome/tools/test/reference_build/chrome_mac'
+    , 'chrome/tools/test/reference_build/chrome_linux'
+    , 'chrome/tools/test/reference_build/chrome_win'
+    ]
+
 sys.path.append(os.path.join(qtwebengine_root, 'tools', 'scripts'))
 
 def currentVersion():
     return chromium_version
 
-def currentBranch():
-    return chromium_branch
-
 def readReleaseChannels():
     response = urllib2.urlopen(json_url)
     raw_json = response.read().strip()
@@ -139,7 +144,7 @@ def readSubmodules():
         git_dict[sub.path] = sub
 
     for sub in svn_submodules:
-        if 'reference_build' not in sub.path and (sub.revision or sub.shasum) and sub.path in git_dict:
+        if (sub.revision or sub.shasum) and sub.path in git_dict:
             submodule_dict[sub.path] = sub
 
     for git in git_submodules:
@@ -151,6 +156,11 @@ def readSubmodules():
                 # We use the git shasum as fallback.
                 module.shasum = git.shasum
 
+    # Remove unwanted upstream submodules
+    for path in submodule_blacklist:
+        if path in submodule_dict:
+            del submodule_dict[path]
+
     return sanityCheckModules(submodule_dict.values())
 
 def findSnapshotBaselineSha1():