summaryrefslogtreecommitdiffstats
path: root/tools/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'tools/scripts')
-rwxr-xr-xtools/scripts/init-repository.py2
-rwxr-xr-xtools/scripts/take_snapshot.py1
-rw-r--r--tools/scripts/version_resolver.py8
3 files changed, 7 insertions, 4 deletions
diff --git a/tools/scripts/init-repository.py b/tools/scripts/init-repository.py
index 3425649ff..7c33ff01d 100755
--- a/tools/scripts/init-repository.py
+++ b/tools/scripts/init-repository.py
@@ -98,7 +98,7 @@ def updateLastChange():
def initUpstreamSubmodules():
ninja_url = 'https://github.com/martine/ninja.git'
chromium_url = 'https://chromium.googlesource.com/chromium/src.git'
- ninja_shasum = '7103c32646df958b0287c65b1c660bf528a191d6'
+ ninja_shasum = 'refs/tags/' + resolver.currentNinjaVersion()
chromium_ref = 'refs/tags/' + resolver.currentVersion()
os.chdir(qtwebengine_root)
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 3db3bac6c..4a468d113 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -103,7 +103,6 @@ def isInChromiumBlacklist(file_path):
not 'media/desktop_media_list.h' in file_path and
not 'media/desktop_streams_registry.cc' in file_path and
not 'media/desktop_streams_registry.h' in file_path and
- not 'net/net_error_info' in file_path and
not 'common/localized_error' in file_path and
not file_path.endswith('cf_resources.rc') and
not file_path.endswith('version.py') and
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 2430555d9..d0ae1824e 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -51,8 +51,9 @@ import json
import urllib2
import git_submodule as GitSubmodule
-chromium_version = '37.0.2062.103'
-chromium_branch = '2062'
+chromium_version = '40.0.2214.28'
+chromium_branch = '2214'
+ninja_version = 'v1.5.3'
json_url = 'http://omahaproxy.appspot.com/all.json'
@@ -73,6 +74,9 @@ sys.path.append(os.path.join(qtwebengine_root, 'tools', 'scripts'))
def currentVersion():
return chromium_version
+def currentNinjaVersion():
+ return ninja_version
+
def readReleaseChannels():
response = urllib2.urlopen(json_url)
raw_json = response.read().strip()