Version 1.11.3
Cherry-pick 3487bf8b36eb0cddbb85001c6934287f5acb2186 to stable
Cherry-pick b67b36ab2ab0f63402a5925b7d475e461167edf7 to stable
Cherry-pick a89532d98decdf06c318e502781dad7d658168dc to stable
diff --git a/DEPS b/DEPS
index d66cdbd..3e30665 100644
--- a/DEPS
+++ b/DEPS
@@ -31,7 +31,7 @@
"github_mirror":
"https://chromium.googlesource.com/external/github.com/dart-lang/%s.git",
- "gyp_rev": "@1752",
+ "gyp_rev": "@6ee91ad8659871916f9aa840d42e1513befdf638",
"co19_rev": "@f95f109fea67127a220958794ef5200a63cb454c",
"chromium_url": "http://src.chromium.org/svn",
"chromium_git": "https://chromium.googlesource.com",
@@ -116,7 +116,7 @@
deps = {
# Stuff needed for GYP to run.
Var("dart_root") + "/third_party/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk" + Var("gyp_rev"),
+ Var('chromium_git') + '/external/gyp.git' + Var("gyp_rev"),
Var("dart_root") + "/tests/co19/src":
"https://github.com/dart-lang/co19.git" + Var("co19_rev"),
diff --git a/tools/VERSION b/tools/VERSION
index 8a1172e..de4079f 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
CHANNEL stable
MAJOR 1
MINOR 11
-PATCH 2
+PATCH 3
PRERELEASE 0
PRERELEASE_PATCH 0
diff --git a/tools/gyp_dart.py b/tools/gyp_dart.py
index cce1b34..708d403 100644
--- a/tools/gyp_dart.py
+++ b/tools/gyp_dart.py
@@ -33,11 +33,6 @@
'--depth=.', '-Itools/gyp/all.gypi',
component_gyp_files[component]]
- if sys.platform == 'win32':
- # Generate Visual Studio 2010 compatible files by default.
- if not os.environ.get('GYP_MSVS_VERSION'):
- args.extend(['-G', 'msvs_version=2010'])
-
sys.exit(execute(args))
if __name__ == '__main__':
diff --git a/tools/utils.py b/tools/utils.py
index ec6312e..262a4ad 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -97,7 +97,7 @@
# Try to guess Visual Studio location when buiding on Windows.
def GuessVisualStudioPath():
- defaultPath = r"C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7" \
+ defaultPath = r"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7" \
r"\IDE"
defaultExecutable = "devenv.com"
@@ -142,8 +142,8 @@
# Can't find value under the key - continue to the next key.
continue
isExpress = executable != 'devenv.com'
- if not isExpress and subkeyName == '10.0':
- # Stop search since if we found non-Express VS2010 version
+ if not isExpress and subkeyName == '12.0':
+ # Stop search since if we found non-Express VS2013 version
# installed, which is preferred version.
return installDir, executable
else:
