Move logic of gyp_webrtc into gyp_webrtc.py

webrtc/build/gyp_webrtc.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2014 The WebRTC 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 in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-# This file is (possibly, depending on python version) imported by
-# gyp_webrtc when GYP_PARALLEL=1 and it creates sub-processes
-# through the multiprocessing library.
+# This script is used to run GYP for WebRTC. It contains selected parts of the

[kjellander_webrtc, 2016/04/18 07:37:04]

The diff is not every readable since both files existed before.

Here's the interesting parts to ease review:
https://www.diffchecker.com/upbuveoc

+# main function from the src/build/gyp_chromium.py file while other parts are
+# reused to minimize code duplication.
 
-# Importing in Python 2.6 (fixed in 2.7) on Windows doesn't search for
-# imports that don't end in .py (and aren't directories with an
-# __init__.py). This wrapper makes "import gyp_webrtc" work with
-# those old versions and makes it possible to execute gyp_webrtc.py
-# directly on Windows where the extension is useful.
+import gc
+import glob
+import os
+import sys
 
-import os
+script_dir = os.path.dirname(os.path.realpath(__file__))
+checkout_root = os.path.abspath(os.path.join(script_dir, os.pardir, os.pardir))
 
-path = os.path.abspath(os.path.split(__file__)[0])
-execfile(os.path.join(path, 'gyp_webrtc'))
+sys.path.insert(0, os.path.join(checkout_root, 'build'))
+import gyp_chromium
+import gyp_helper
+import vs_toolchain
+
+sys.path.insert(0, os.path.join(checkout_root, 'tools', 'gyp', 'pylib'))
+import gyp
+
+def GetSupplementalFiles():

[phoglund, 2016/04/18 08:24:25]

Nit: two blank lines

[kjellander_webrtc, 2016/04/18 08:46:45]

Done.

+  """Returns a list of the supplemental files that are included in all GYP

[phoglund, 2016/04/18 08:24:24]

Nit: """Complete one-line sentence.

More info that didn't fit in the one-line sentence."""

[kjellander_webrtc, 2016/04/18 08:46:45]

Done.

+  sources."""
+  # Can't use the one in gyp_chromium since the directory location of the root
+  # is different.
+  return glob.glob(os.path.join(checkout_root, '*', 'supplement.gypi'))
+
+
+def main():
+  # Disabling garbage collection saves about 5% processing time. Since this is a
+  # short-lived process it's not a problem.
+  gc.disable()
+
+  args = sys.argv[1:]
+
+  if int(os.environ.get('GYP_CHROMIUM_NO_ACTION', 0)):
+    print 'Skipping gyp_webrtc due to GYP_CHROMIUM_NO_ACTION env var.'
+    sys.exit(0)
+
+  if 'SKIP_WEBRTC_GYP_ENV' not in os.environ:
+    # Update the environment based on webrtc.gyp_env

[phoglund, 2016/04/18 08:24:25]

Nit: end with .

[kjellander_webrtc, 2016/04/18 08:46:45]

Done.

+    gyp_env_path = os.path.join(os.path.dirname(checkout_root),
+                                'webrtc.gyp_env')
+    gyp_helper.apply_gyp_environment_from_file(gyp_env_path)
+
+  # This could give false positives since it doesn't actually do real option
+  # parsing.  Oh well.
+  gyp_file_specified = False
+  for arg in args:
+    if arg.endswith('.gyp'):
+      gyp_file_specified = True
+      break
+
+  # If we didn't get a file, assume 'all.gyp' in the root of the checkout.
+  if not gyp_file_specified:
+    # Because of a bug in gyp, simply adding the abspath to all.gyp doesn't
+    # work, but chdir'ing and adding the relative path does. Spooky :/
+    os.chdir(checkout_root)
+    args.append('all.gyp')
+
+  # There shouldn't be a circular dependency relationship between .gyp files,
+  args.append('--no-circular-check')
+
+  # Default to ninja unless GYP_GENERATORS is set.
+  if not os.environ.get('GYP_GENERATORS'):
+    os.environ['GYP_GENERATORS'] = 'ninja'
+
+  # Enable check for missing sources in GYP files on Windows.
+  if sys.platform.startswith('win'):
+    gyp_generator_flags = os.getenv('GYP_GENERATOR_FLAGS', '')
+    if not 'msvs_error_on_missing_sources' in gyp_generator_flags:
+      os.environ['GYP_GENERATOR_FLAGS'] = (
+          gyp_generator_flags + ' msvs_error_on_missing_sources=1')
+
+  # Enforce gyp syntax checking. This adds about 20% execution time.
+  args.append('--check')
+
+  supplemental_includes = GetSupplementalFiles()
+  gyp_vars = gyp_chromium.GetGypVars(supplemental_includes)
+
+  # Automatically turn on crosscompile support for platforms that need it.
+  if all(('ninja' in os.environ.get('GYP_GENERATORS', ''),
+          gyp_vars.get('OS') in ['android', 'ios'],
+          'GYP_CROSSCOMPILE' not in os.environ)):
+    os.environ['GYP_CROSSCOMPILE'] = '1'
+
+  args.extend(['-I' + i for i in
+               gyp_chromium.additional_include_files(supplemental_includes,
+                                                     args)])
+
+  # Set the gyp depth variable to the root of the checkout.
+  args.append('--depth=' + os.path.relpath(checkout_root))
+
+  print 'Updating projects from gyp files...'
+  sys.stdout.flush()
+
+  # Off we go...
+  gyp_rc = gyp.main(args)
+
+  vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
+  if vs2013_runtime_dll_dirs:
+    x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
+    vs_toolchain.CopyVsRuntimeDlls(
+        os.path.join(checkout_root, gyp_chromium.GetOutputDirectory()),
+        (x86_runtime, x64_runtime))
+
+  sys.exit(gyp_rc)
+
+
+if __name__ == '__main__':
+  sys.exit(main())
+