Fix remaining discrepencies between master and es3proto project files.

build/all.gyp

@@ -3,31 +3,23 @@
 # found in the LICENSE file.
 
 {
-  'targets': [
-    {
-      'target_name': 'All',
-      'type': 'none',
-      'dependencies': [
-        '../src/angle.gyp:*',
-      ],
-      'conditions': [
-        ['angle_build_samples==1', {
-          'dependencies': [
-            '../samples/samples.gyp:*',
-          ],
-        }],
-        ['angle_build_tests==1', {
-          'dependencies': [
-            '../tests/tests.gyp:*',
-          ],
-        }],
-      ],
-    },
-  ],
+    'targets':
+    [
+        {
+            'target_name': 'All',
+            'type': 'none',
+            'dependencies': [ '../src/angle.gyp:*', ],
+            'conditions':
+            [
+                ['angle_build_samples==1',
+                {
+                    'dependencies': [ '../samples/samples.gyp:*', ],
+                }],
+                ['angle_build_tests==1',
+                {
+                    'dependencies': [ '../tests/tests.gyp:*', ],
+                }],
+            ],
+        },
+    ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:

build/gyp_angle

@@ -14,22 +14,21 @@ script_dir = os.path.dirname(__file__)
 angle_dir = os.path.normpath(os.path.join(script_dir, os.pardir))
 
 sys.path.append(os.path.join(angle_dir, 'third_party', 'gyp', 'pylib'))
-print os.path.join(angle_dir, 'third_party', 'gyp', 'pylib')
 import gyp
 
 if __name__ == '__main__':
-  args = sys.argv[1:]
-
-  print 'Updating projects from gyp files...'
-  sys.stdout.flush()
-
-  # Set the depth to get the top-level Makefile generated into the
-  # correct directory. This only has an effect on Linux.
-  args.append('--depth');
-  args.append('.');
-  # Add common.gypi to the include path.
-  args.append('-I' + os.path.join(script_dir, 'common.gypi'))
-  args.append('--no-parallel')
-  # Add all.gyp as the main gyp file to be generated.
-  args.append(os.path.join(script_dir, 'all.gyp'))
-  sys.exit(gyp.main(args))
+    args = sys.argv[1:]
+
+    print 'Updating projects from gyp files...'
+    sys.stdout.flush()
+
+    # Set the depth to get the top-level Makefile generated into the
+    # correct directory. This only has an effect on Linux.
+    args.append('--depth');
+    args.append('.');
+    # Add common.gypi to the include path.
+    args.append('-I' + os.path.join(script_dir, 'common.gypi'))
+    args.append('--no-parallel')
+    # Add all.gyp as the main gyp file to be generated.
+    args.append(os.path.join(script_dir, 'all.gyp'))
+    sys.exit(gyp.main(args))

generate_projects

@@ -23,25 +23,25 @@ build_samples = True
 build_tests = False
 
 if __name__ == '__main__':
-	gyp_cmd = os.path.join(gyp_dir, 'gyp')
-	gyp_cmd += ' --ignore-environment'
-	gyp_cmd += ' --depth=.'
-	gyp_cmd += ' --include=' + os.path.join(script_dir, 'common.gypi')
-	gyp_cmd += ' --generator-output=' + generation_dir
-	gyp_cmd += ' --format=' + gyp_generators
-	gyp_cmd += ' -G msvs_version=' + msvs_version
-	gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0')
-	gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0')
-	gyp_cmd += ' -D angle_relative_src_path=..\\..\\src\\'
-	gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp')
-
-	print 'Generating projects to' + generation_dir + ' from gyp files...'
-	print gyp_cmd
-	sys.stdout.flush()
-	os.system(gyp_cmd)
-
-	git_add_cmd = 'git add ' + generation_dir + ' -u'
-	print '\nRunning git add on updated Visual Studio projects...'
-	print git_add_cmd
-	sys.stdout.flush()
-	os.system(git_add_cmd)
+    gyp_cmd = os.path.join(gyp_dir, 'gyp')
+    gyp_cmd += ' --ignore-environment'
+    gyp_cmd += ' --depth=.'
+    gyp_cmd += ' --include=' + os.path.join(script_dir, 'common.gypi')
+    gyp_cmd += ' --generator-output=' + generation_dir
+    gyp_cmd += ' --format=' + gyp_generators
+    gyp_cmd += ' -G msvs_version=' + msvs_version
+    gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0')
+    gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0')
+    gyp_cmd += ' -D angle_relative_src_path=..\\..\\src\\'
+    gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp')
+
+    print 'Generating projects to ' + generation_dir + ' from gyp files...'
+    print gyp_cmd
+    sys.stdout.flush()
+    os.system(gyp_cmd)
+
+    git_add_cmd = 'git add ' + generation_dir + ' -u'
+    print '\nRunning git add on updated Visual Studio projects...'
+    print git_add_cmd
+    sys.stdout.flush()
+    os.system(git_add_cmd)

projects/src/translator.vcxproj.filters

@@ -95,7 +95,7 @@
       <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\ValidateLimitations.cpp">
       <Filter>compiler\translator</Filter>
@@ -335,7 +335,7 @@
       <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\MMap.h">
       <Filter>compiler\translator</Filter>

projects/src/translator_static.vcxproj.filters

@@ -95,7 +95,7 @@
       <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\ValidateLimitations.cpp">
       <Filter>compiler\translator</Filter>
@@ -335,7 +335,7 @@
       <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\MMap.h">
       <Filter>compiler\translator</Filter>

src/angle.gyp

@@ -8,9 +8,3 @@
         'angle.gypi',
     ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:

src/angle.gypi

@@ -88,12 +88,3 @@
         ]
     ] # conditions
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
-# Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.

src/build_angle.gyp

@@ -8,9 +8,3 @@
         'angle.gypi',
     ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:

tests/build_tests.gyp

+# Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+    'includes':
+    [
+        'build_tests.gypi',
+    ],
+}