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 /DEPS | |
| 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 'DEPS')
| -rw-r--r-- | DEPS | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -24,10 +24,10 @@ deps = { "/trunk/deps/third_party/WebKit@20601", "src/third_party/icu": - "/trunk/deps/third_party/icu42@25717", + "/trunk/deps/third_party/icu42@26240", "src/third_party/hunspell": - "/trunk/deps/third_party/hunspell128@25906", + "/trunk/deps/third_party/hunspell128@26238", "src/third_party/protobuf2/src": "http://protobuf.googlecode.com/svn/trunk@219", @@ -36,7 +36,7 @@ deps = { "http://gyp.googlecode.com/svn/trunk@651", "src/v8": - "http://v8.googlecode.com/svn/trunk@2891", + "http://v8.googlecode.com/svn/trunk@2896", "src/native_client": "http://nativeclient.googlecode.com/svn/trunk/src/native_client@385", @@ -156,8 +156,8 @@ skip_child_includes = [ hooks = [ { # A change to a .gyp, .gypi, or to GYP itself shound run the generator. - "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]", - "action": ["python", "src/tools/gyp/gyp_chromium"], + "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\\\]build[/\\\\]gyp_chromium$", + "action": ["python", "src/build/gyp_chromium"], }, { # Workaround IncrediBuild problem. http://crbug.com/17706. |