Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Issue 206006: Force inclusion of build/common.gypi for all chromium gyp files. (Closed)

Created:
11 years, 3 months ago by yaar
Modified:
9 years, 7 months ago
Reviewers:
Mark Mentovai
CC:
dglazkov, Greg Spencer (Google), yaar
Visibility:
Public.

Description

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. Committed: http://src.chromium.org/viewvc/chrome/trunk/26302

Patch Set 1 #

Total comments: 2

Patch Set 2 : incorporated mark's feedback #

Total comments: 4

Patch Set 3 : 2nd round of feedback #

Total comments: 3
Unified diffs Side-by-side diffs Delta from patch set Stats (+80 lines, -180 lines) Patch
M DEPS View 1 2 3 chunks +5 lines, -5 lines 0 comments Download
M app/app.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M base/base.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M breakpad/breakpad.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M build/all.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M build/common.gypi View 1 2 1 chunk +3 lines, -0 lines 1 comment Download
A build/gyp_chromium View 1 2 1 chunk +37 lines, -0 lines 0 comments Download
M build/linux/system.gyp View 1 1 chunk +10 lines, -10 lines 0 comments Download
M build/temp_gyp/googleurl.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M build/temp_gyp/pdfsqueeze.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M build/util/build_util.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M build/win/system.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M chrome/app/locales/locales.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M chrome/chrome.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M chrome/installer/installer.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M chrome/installer/mini_installer.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M chrome/test/security_tests/security_tests.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M courgette/courgette.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M gears/gears.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M google_update/google_update.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M ipc/ipc.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M media/media.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M net/net.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M net/tools/tld_cleanup/tld_cleanup.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M o3d/DEPS_gyp View 1 chunk +1 line, -1 line 2 comments Download
M o3d/build/all.gyp View 1 chunk +0 lines, -1 line 0 comments Download
M o3d/build/common.gypi View 1 chunk +0 lines, -3 lines 0 comments Download
A o3d/build/gyp_o3d View 1 chunk +24 lines, -0 lines 0 comments Download
M printing/printing.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M rlz/rlz.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M sandbox/sandbox.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M sdch/sdch.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M skia/skia.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M testing/gmock.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M testing/gtest.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/bsdiff/bsdiff.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/bspatch/bspatch.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/bzip2/bzip2.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/cld/cld.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/codesighs/codesighs.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/ffmpeg/ffmpeg.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/harfbuzz/harfbuzz.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/libevent/libevent.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/libjpeg/libjpeg.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/libpng/libpng.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/libxml/libxml.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/libxslt/libxslt.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/lzma_sdk/lzma_sdk.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/modp_b64/modp_b64.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/npapi/npapi.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/protobuf2/protobuf.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/sqlite/sqlite.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/tcmalloc/tcmalloc.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M third_party/zlib/zlib.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M tools/imagediff/image_diff.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M tools/memory_watcher/memory_watcher.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M tools/xdisplaycheck/xdisplaycheck.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M views/views.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M webkit/default_plugin/default_plugin.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M webkit/tools/test_shell/test_shell.gyp View 1 1 chunk +0 lines, -3 lines 0 comments Download
M webkit/webkit.gyp View 1 chunk +0 lines, -1 line 0 comments Download

Messages

Total messages: 7 (0 generated)
yaar
11 years, 3 months ago (2009-09-15 01:48:19 UTC) #1
Mark Mentovai
You can revise icu.gyp and hunspell.gyp yourself. They're in the Chromium repository, just in a ...
11 years, 3 months ago (2009-09-15 13:52:26 UTC) #2
yaar
On 2009/09/15 13:52:26, Mark Mentovai wrote: > You can revise icu.gyp and hunspell.gyp yourself. They're ...
11 years, 3 months ago (2009-09-15 17:06:50 UTC) #3
yaar
Mark's feedback is incorporated. The DEPS file is updated with icu, hunspell and v8's new ...
11 years, 3 months ago (2009-09-15 21:03:04 UTC) #4
Mark Mentovai
Getting closer. http://codereview.chromium.org/206006/diff/5001/5002 File DEPS (right): http://codereview.chromium.org/206006/diff/5001/5002#newcode156 Line 156: "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]build[/\\\\]gyp_chromium[/\\\\]", No, we want to ...
11 years, 3 months ago (2009-09-15 21:20:50 UTC) #5
yaar
1. Since nobody is directly using common.gypi anymore, I just moved all the content back ...
11 years, 3 months ago (2009-09-15 21:45:14 UTC) #6
Mark Mentovai
11 years, 3 months ago (2009-09-15 21:49:56 UTC) #7
LGTM

http://codereview.chromium.org/206006/diff/70/76
File build/common.gypi (right):

http://codereview.chromium.org/206006/diff/70/76#newcode8
Line 8: {
Nit: leave a blank line between your comment block and the {.

http://codereview.chromium.org/206006/diff/70/95
File o3d/DEPS_gyp (right):

http://codereview.chromium.org/206006/diff/70/95#newcode147
Line 147: "pattern":
"\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|MANIFEST$",
Fix the pattern here too to reference src/build/gyp_o3d in the same way that we
did for gyp_chromium.

http://codereview.chromium.org/206006/diff/70/95#newcode148
Line 148: "action": ["python", "build/gyp_o3d", "build/all.gyp", "--depth",
"."],
Shouldn't this be o3d/build/gyp_o3d and o3d/build/all.gyp?

Powered by Google App Engine
This is Rietveld 408576698