From 38d9a4c8287592ad916b81b37b34c63b88553d22 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 6 Jun 2014 21:36:18 +0000 Subject: [PATCH] Remove gyp_cef and use gyp_chromium instead (issue #1304). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1723 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- tools/gclient_hook.py | 2 +- tools/gyp_cef | 161 ------------------------------------------ tools/gyp_cef.py | 18 ----- 3 files changed, 1 insertion(+), 180 deletions(-) delete mode 100755 tools/gyp_cef delete mode 100644 tools/gyp_cef.py diff --git a/tools/gclient_hook.py b/tools/gclient_hook.py index c4be02cc4..9b802e14e 100644 --- a/tools/gclient_hook.py +++ b/tools/gclient_hook.py @@ -28,5 +28,5 @@ RunAction(cef_dir, patcher) print "\nGenerating CEF project files..." os.environ['CEF_DIRECTORY'] = os.path.basename(cef_dir); -gyper = [ 'python', 'tools/gyp_cef', 'cef.gyp', '-I', 'cef.gypi' ] +gyper = [ 'python', '../build/gyp_chromium', 'cef.gyp', '-I', 'cef.gypi' ] RunAction(cef_dir, gyper) diff --git a/tools/gyp_cef b/tools/gyp_cef deleted file mode 100755 index 71467cba1..000000000 --- a/tools/gyp_cef +++ /dev/null @@ -1,161 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2011 The Chromium Embedded Framework Authors. -# Portions copyright (c) 2011 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This script is wrapper for CEF/Chromium that adds some support for how GYP -# is invoked by Chromium beyond what can be done in the gclient hooks. - -import glob -import os -import shlex -import subprocess -import sys - -# The CEF root directory is the parent directory of _this_ script. -cef_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)) - -# The Chromium source directory is the parent directory of CEF. -chrome_src = os.path.abspath(os.path.join(cef_dir, os.pardir)) - -sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib')) -import gyp - -# Add paths so that pymod_do_main(...) can import files. -sys.path.insert(1, os.path.join(chrome_src, 'build')) -sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit')) -sys.path.insert(1, os.path.join(chrome_src, 'chrome', 'tools', 'build')) -sys.path.insert(1, os.path.join(chrome_src, 'native_client', 'build')) -sys.path.insert(1, os.path.join(chrome_src, 'native_client_sdk', 'src', - 'build_tools')) -sys.path.insert(1, os.path.join(chrome_src, 'remoting', 'tools', 'build')) -sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit', - 'Source', 'build', 'scripts')) - -# On Windows, Psyco shortens warm runs of build/gyp_chromium by about -# 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70 -# seconds. Conversely, memory usage of build/gyp_chromium with Psyco -# maxes out at about 158 MB vs. 132 MB without it. -# -# Psyco uses native libraries, so we need to load a different -# installation depending on which OS we are running under. It has not -# been tested whether using Psyco on our Mac and Linux builds is worth -# it (the GYP running time is a lot shorter, so the JIT startup cost -# may not be worth it). -if sys.platform == 'win32': - try: - sys.path.insert(0, os.path.join(chrome_src, 'third_party', 'psyco_win32')) - import psyco - except: - psyco = None -else: - psyco = None - -def apply_gyp_environment(file_path=None): - """ - Reads in a *.gyp_env file and applies the valid keys to os.environ. - """ - if not file_path or not os.path.exists(file_path): - return - file_contents = open(file_path).read() - try: - file_data = eval(file_contents, {'__builtins__': None}, None) - except SyntaxError, e: - e.filename = os.path.abspath(file_path) - raise - supported_vars = ( 'CHROMIUM_GYP_SYNTAX_CHECK', - 'GYP_DEFINES', - 'GYP_GENERATOR_FLAGS', - 'GYP_GENERATOR_OUTPUT', ) - for var in supported_vars: - val = file_data.get(var) - if val: - if var in os.environ: - print 'INFO: Environment value for "%s" overrides value in %s.' % ( - var, os.path.abspath(file_path) - ) - else: - os.environ[var] = val - -def additional_include_files(args=[]): - """ - Returns a list of additional (.gypi) files to include, without - duplicating ones that are already specified on the command line. - """ - # Determine the include files specified on the command line. - # This doesn't cover all the different option formats you can use, - # but it's mainly intended to avoid duplicating flags on the automatic - # makefile regeneration which only uses this format. - specified_includes = set() - for arg in args: - if arg.startswith('-I') and len(arg) > 2: - specified_includes.add(os.path.realpath(arg[2:])) - - result = [] - def AddInclude(path): - if os.path.realpath(path) not in specified_includes: - result.append(path) - - # Always include common.gypi. - AddInclude(os.path.join(chrome_src, 'build', 'common.gypi')) - - # Optionally add supplemental .gypi files if present. - supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi')) - for supplement in supplements: - AddInclude(supplement) - - return result - -if __name__ == '__main__': - args = sys.argv[1:] - - # Use the Psyco JIT if available. - if psyco: - psyco.profile() - print "Enabled Psyco JIT." - - # Fall back on hermetic python if we happen to get run under cygwin. - # TODO(bradnelson): take this out once this issue is fixed: - # http://code.google.com/p/gyp/issues/detail?id=177 - if sys.platform == 'cygwin': - python_dir = os.path.join(chrome_src, 'third_party', 'python_26') - env = os.environ.copy() - env['PATH'] = python_dir + os.pathsep + env.get('PATH', '') - p = subprocess.Popen( - [os.path.join(python_dir, 'python.exe')] + sys.argv, - env=env, shell=False) - p.communicate() - sys.exit(p.returncode) - - if 'SKIP_CHROMIUM_GYP_ENV' not in os.environ: - # Update the environment based on chromium.gyp_env - gyp_env_path = os.path.join(os.path.dirname(chrome_src), 'chromium.gyp_env') - apply_gyp_environment(gyp_env_path) - - args.extend(['-I' + i for i in additional_include_files(args)]) - - # There shouldn't be a circular dependency relationship between .gyp files, - # but in Chromium's .gyp files, on non-Mac platforms, circular relationships - # currently exist. The check for circular dependencies is currently - # bypassed on other platforms, but is left enabled on the Mac, where a - # violation of the rule causes Xcode to misbehave badly. - # TODO(mark): Find and kill remaining circular dependencies, and remove this - # option. http://crbug.com/35878. - # TODO(tc): Fix circular dependencies in ChromiumOS then add linux2 to the - # list. - if sys.platform not in ('darwin',): - args.append('--no-circular-check') - - # If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check - # to enfore syntax checking. - syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK') - if syntax_check and int(syntax_check): - args.append('--check') - - print 'Updating projects from gyp files...' - sys.stdout.flush() - - # Off we go... - sys.exit(gyp.main(args)) diff --git a/tools/gyp_cef.py b/tools/gyp_cef.py deleted file mode 100644 index c7cadc870..000000000 --- a/tools/gyp_cef.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2013 The Chromium Embedded Framework Authors. -# Portions copyright 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file is (possibly, depending on python version) imported by gyp_cef -# when it creates sub-processes through the multiprocessing library. - -# 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_cef" work with those old -# versions and makes it possible to execute gyp_cef.py directly on Windows -# where the extension is useful. - -import os - -path = os.path.abspath(os.path.split(__file__)[0]) -execfile(os.path.join(path, 'gyp_cef'))