Fix errors in the gyp projects when we build with ninja.

Ninja does not like having targets named 'all', and the post-build step had some ninja-incompatible variables. BUG=angle:529 Change-Id: Ia2bf701c997ec072b18bcbd62f7d05a2e40a1578 Reviewed-on: https://chromium-review.googlesource.com/178072Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Commit-Queue: Shannon Woods <shannonwoods@chromium.org> Tested-by: Shannon Woods <shannonwoods@chromium.org>

Fix errors in the gyp projects when we build with ninja.
a895c6f0 · Jamie Madill · bc90a480 · a895c6f0 · a895c6f0 · a895c6f0
Commit a895c6f0 authored Nov 26, 2013 by Jamie Madill
6 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,14 @@ Release_x64
 *.sdf
 *.ncb
 *.suo
-*.vcxproj
+src/*.vcxproj
-*.vcxproj.filters
+src/*.vcxproj.filters
+samples/*.vcxproj
+samples/*.vcxproj.filters
+tests/*.vcxproj
+tests/*.vcxproj.filters
+build/*.vcxproj
+build/*.vcxproj.filters
 *.vcxproj.user
 patches-*
 *.target.mk

--- a/build/all.gyp
+++ b/build/all.gyp
@@ -5,7 +5,7 @@
 {
  'targets': [
    {
-      'target_name': 'all',
+      'target_name': 'All',
      'type': 'none',
      'dependencies': [
        '../src/angle.gyp:*',

--- a/projects/build/all.vcxproj
+++ b/projects/build/all.vcxproj
@@ -11,9 +11,9 @@
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AF905A46-5AC8-AEE6-AA99-39440E4E660E}</ProjectGuid>
+    <ProjectGuid>{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>all</RootNamespace>
+    <RootNamespace>All</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
  <PropertyGroup Label="Configuration">

--- a/projects/build/all.vcxproj.filters
+++ b/projects/build/all.vcxproj.filters
--- a/projects/build/all.sln
+++ b/projects/build/all.sln
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcxproj", "{AF905A46-5AC8-AEE6-AA99-39440E4E660E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}
 		{C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679}
@@ -185,10 +185,6 @@ Global
 		{A6E86EB3-561F-9FAB-670F-EF23556344BE}.Debug|Win32.Build.0 = Debug|Win32
 		{A6E86EB3-561F-9FAB-670F-EF23556344BE}.Release|Win32.ActiveCfg = Release|Win32
 		{A6E86EB3-561F-9FAB-670F-EF23556344BE}.Release|Win32.Build.0 = Release|Win32
-		{AF905A46-5AC8-AEE6-AA99-39440E4E660E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AF905A46-5AC8-AEE6-AA99-39440E4E660E}.Debug|Win32.Build.0 = Debug|Win32
-		{AF905A46-5AC8-AEE6-AA99-39440E4E660E}.Release|Win32.ActiveCfg = Release|Win32
-		{AF905A46-5AC8-AEE6-AA99-39440E4E660E}.Release|Win32.Build.0 = Release|Win32
 		{B4D06330-EED1-6F99-BCA4-2F913908C38A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B4D06330-EED1-6F99-BCA4-2F913908C38A}.Debug|Win32.Build.0 = Debug|Win32
 		{B4D06330-EED1-6F99-BCA4-2F913908C38A}.Release|Win32.ActiveCfg = Release|Win32
@@ -205,6 +201,10 @@ Global
 		{CBE3D362-43EA-60FC-D5AC-490039CA449A}.Debug|Win32.Build.0 = Debug|Win32
 		{CBE3D362-43EA-60FC-D5AC-490039CA449A}.Release|Win32.ActiveCfg = Release|Win32
 		{CBE3D362-43EA-60FC-D5AC-490039CA449A}.Release|Win32.Build.0 = Release|Win32
+		{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}.Debug|Win32.Build.0 = Debug|Win32
+		{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}.Release|Win32.ActiveCfg = Release|Win32
+		{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}.Release|Win32.Build.0 = Release|Win32
 		{FBAEE4F6-562A-588F-01F9-72DCABB3B061}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FBAEE4F6-562A-588F-01F9-72DCABB3B061}.Debug|Win32.Build.0 = Debug|Win32
 		{FBAEE4F6-562A-588F-01F9-72DCABB3B061}.Release|Win32.ActiveCfg = Release|Win32

--- a/src/angle.gypi
+++ b/src/angle.gypi
@@ -34,9 +34,9 @@
                            {
                                'action_name': 'ANGLE Post-Build Script',
                                'message': 'Running <(angle_post_build_script)...',
-                                'inputs': [ '<(angle_post_build_script)', '<!@(python <(angle_post_build_script) inputs)' ],
+                                'inputs': [ '<(angle_post_build_script)', '<!@(["python", "<(angle_post_build_script)", "inputs", "<(CONFIGURATION_NAME)", "$(PlatformName)", "<(PRODUCT_DIR)"])' ],
-                                'outputs': [ '<!@(python <(angle_post_build_script) outputs)' ],
+                                'outputs': [ '<!@(python <(angle_post_build_script) outputs "<(CONFIGURATION_NAME)" "$(PlatformName)" "<(PRODUCT_DIR)")' ],
-                                'action': ['python', '<(angle_post_build_script)', 'run', '<(CONFIGURATION_NAME)', '$(Platform)', '<(PRODUCT_DIR)'],
+                                'action': ['python', '<(angle_post_build_script)', 'run', '<(CONFIGURATION_NAME)', '$(PlatformName)', '<(PRODUCT_DIR)'],
                            }
                        ] #actions
                    }