Commit 7731d6a7 by Geoff Lang

Update the GYP dependency to a revision with Visual Studio 2010 Express solution…

Update the GYP dependency to a revision with Visual Studio 2010 Express solution generation working correctly. TRAC #24044 Signed-off-by: Jamie Madill Signed-off-by: Shannon Woods
parent 16a1c072
deps = {
"third_party/gyp":
"http://gyp.googlecode.com/svn/trunk@1564",
"http://gyp.googlecode.com/svn/trunk@1767",
"tests/third_party/googletest":
"http://googletest.googlecode.com/svn/trunk@629",
......
......@@ -21,7 +21,6 @@ gyp_generators = "msvs"
msvs_version = "2010e"
build_samples = True
build_tests = False
express_patch_script = os.path.join(generation_dir, 'convert_solutions_to_express.patch')
if __name__ == '__main__':
gyp_cmd = os.path.join(gyp_dir, 'gyp')
......@@ -40,12 +39,6 @@ if __name__ == '__main__':
sys.stdout.flush()
os.system(gyp_cmd)
git_patch_cmd = 'git apply ' + express_patch_script
print '\nPatching Visual Studio projects to Visual Studio Express...'
print git_patch_cmd
sys.stdout.flush()
os.system(git_patch_cmd)
git_add_cmd = 'git add ' + generation_dir + ' -u'
print '\nRunning git add on updated Visual Studio projects...'
print git_add_cmd
......
From 4527c32cebbae4df9b4b9f1692fa99a3321943b7 Mon Sep 17 00:00:00 2001
From: Geoff Lang <geofflang@chromium.org>
Date: Mon, 21 Oct 2013 13:31:23 -0400
Subject: [PATCH] Convert visual studio solutions to express.
---
projects/build/all.sln | 4 +---
projects/samples/samples.sln | 4 +---
projects/src/angle.sln | 4 +---
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/projects/build/all.sln b/projects/build/all.sln
index 0a609cb..5275049 100644
--- a/projects/build/all.sln
+++ b/projects/build/all.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcxproj", "{AF905A46-5AC8-AEE6-AA99-39440E4E660E}"
ProjectSection(ProjectDependencies) = postProject
{C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}
@@ -213,6 +213,4 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- EndGlobalSection
EndGlobal
diff --git a/projects/samples/samples.sln b/projects/samples/samples.sln
index 0fc65a5..d97ccca 100644
--- a/projects/samples/samples.sln
+++ b/projects/samples/samples.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "es_util", "es_util.vcxproj", "{80E5C3D9-93C2-943E-176F-C9A903E27BC9}"
ProjectSection(ProjectDependencies) = postProject
{FBAEE4F6-562A-588F-01F9-72DCABB3B061} = {FBAEE4F6-562A-588F-01F9-72DCABB3B061}
@@ -181,6 +181,4 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- EndGlobalSection
EndGlobal
diff --git a/projects/src/angle.sln b/projects/src/angle.sln
index dfe9be6..da59f8b 100644
--- a/projects/src/angle.sln
+++ b/projects/src/angle.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj", "{FBAEE4F6-562A-588F-01F9-72DCABB3B061}"
ProjectSection(ProjectDependencies) = postProject
{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}
@@ -47,6 +47,4 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- EndGlobalSection
EndGlobal
--
1.8.0.msysgit.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment