diff options
author | yaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 23:52:14 +0000 |
---|---|---|
committer | yaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 23:52:14 +0000 |
commit | 21642abd8a9957b2b86380419dfbfdeae479dcc7 (patch) | |
tree | 59720a3453814c8d334b78ca3b44d7ae28e31e03 /o3d | |
parent | cd05e24cfc1f743ef37a050a35be367590ccd587 (diff) | |
download | chromium_src-21642abd8a9957b2b86380419dfbfdeae479dcc7.zip chromium_src-21642abd8a9957b2b86380419dfbfdeae479dcc7.tar.gz chromium_src-21642abd8a9957b2b86380419dfbfdeae479dcc7.tar.bz2 |
Force inclusion of build/common.gypi for all chromium gyp files.
Why: Simpler build code. If everybody includes it, it should be included automatically.
Why now: The webkit chromium builds need it be specified, since can't default to build/common.gypi.
What was done:
1. build/common.gypi's contents were moved to a new file build/gyp_chromium.gypi
2. tools/gyp/gyp_chromium was moved to build/gyp_chromium and made to automatically include build/gyp_chromium.gypi.
3. lots of gyp files were fixed to not refer to build/common.gypi any more.
4. o3d which also builds independently of chrome, was fixed to have a gyp_o3d that includes gyp_chromium.gypi too.
5. build/common.gypi was left empty, because there are some external projects that still refer to it.
Things that are left to do after this patch is in:
1. The following external files (in other repositories) need to stop include common.gypi
./third_party/hunspell/hunspell.gyp
./third_party/icu/icu.gyp
./v8/tools/gyp/v8.gyp
2. Once nobody refers to common.gypi anymore, delete common.gypi
-or-
Delete gyp_chromium.gypi and move its content back to common.gypi
Tested on mac, win and linux. On win, got a few unit tests errors on chrome bookmarks, which should not be related. I'm running again with clobber to verify.
Review URL: http://codereview.chromium.org/206006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r-- | o3d/DEPS_gyp | 2 | ||||
-rw-r--r-- | o3d/build/all.gyp | 1 | ||||
-rw-r--r-- | o3d/build/common.gypi | 3 | ||||
-rw-r--r-- | o3d/build/gyp_o3d | 24 |
4 files changed, 25 insertions, 5 deletions
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp index dcf7530..737f78c 100644 --- a/o3d/DEPS_gyp +++ b/o3d/DEPS_gyp @@ -145,7 +145,7 @@ hooks = [ { # A change to a .gyp, .gypi, or to GYP itself shound run the generator. "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|MANIFEST$", - "action": ["python", "tools/gyp/gyp", "o3d/build/all.gyp", "--depth", ".", + "action": ["python", "build/gyp_o3d", "build/all.gyp", "--depth", ".", "-D", "support_macosx_10_4=1"], }, ] diff --git a/o3d/build/all.gyp b/o3d/build/all.gyp index 1996704..0a9f33a 100644 --- a/o3d/build/all.gyp +++ b/o3d/build/all.gyp @@ -4,7 +4,6 @@ { 'includes': [ - '../../build/common.gypi', 'common.gypi', ], 'targets': [ diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index 5dc0538..aa9ffe5 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -3,9 +3,6 @@ # found in the LICENSE file. { - 'includes': [ - '../../build/common.gypi', - ], 'variables': { 'antlrdir': 'third_party/antlr3', 'breakpaddir': 'breakpad/src', diff --git a/o3d/build/gyp_o3d b/o3d/build/gyp_o3d new file mode 100644 index 0000000..2603b29e --- /dev/null +++ b/o3d/build/gyp_o3d @@ -0,0 +1,24 @@ +#!/usr/bin/python + +# This script is wrapper for O3D when compiling independently of chromium. +# Like in chromium, the gyp_chromium.gypi include is forced in. + +import glob +import os +import shlex +import sys + +try: + import gyp +except ImportError, e: + sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../tools/gyp/pylib')) + import gyp + +if __name__ == '__main__': + args = sys.argv[1:] + + # Always include gyp_chromium.gypi + args += ['-I', os.path.join(os.path.dirname(sys.argv[0]),'../../build/gyp_chromium.gypi')] + + # Off we go... + sys.exit(gyp.main(args)) |