Skip to content

Commit 4a91c6a

Browse files
dprankedpranke
committed
[chromium] move Tools.gyp, switch build-webkit --chromium to All.gyp
https://bugs.webkit.org/show_bug.cgi?id=76505 Reviewed by Tony Chang. .: Update with newly-generated files. * .gitignore: Source/WebKit/chromium: Update path to Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp. * All.gyp: * gyp_webkit: - change to using All.gyp - change build_webkit_exes_from_webkit_gyp to 0 Tools: Update chromium build script to use All.gyp instead of WebKit.gyp * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: Renamed from Source/WebKit/chromium/Tools.gyp. * Scripts/webkitdirs.pm: Canonical link: https://commits.webkit.org/93404@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@105330 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 4a5a723 commit 4a91c6a

8 files changed

Lines changed: 54 additions & 12 deletions

File tree

‎.gitignore‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,13 @@ Source/Platform/Platform.gyp/*.Makefile
5858
Source/Platform/Platform.gyp/*.mk
5959
Source/Platform/Platform.gyp/*.sln
6060
Source/Platform/Platform.gyp/*.vcproj*
61-
Tools/Tools.xcodeproj
62-
Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.xcodeproj
61+
Source/Platform/Platform.gyp/*.xcodeproj*
62+
Tools/DumpRenderTree/DumpRenderTree.gyp/*.Makefile
63+
Tools/DumpRenderTree/DumpRenderTree.gyp/*.mk
64+
Tools/DumpRenderTree/DumpRenderTree.gyp/*.ninja
65+
Tools/DumpRenderTree/DumpRenderTree.gyp/*.sln
66+
Tools/DumpRenderTree/DumpRenderTree.gyp/*.vcproj*
67+
Tools/DumpRenderTree/DumpRenderTree.gyp/*.xcodeproj*
6368

6469
# Ignore status files that manage Chromium dependencies.
6570
Source/WebKit/chromium/.gclient

‎ChangeLog‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2012-01-18 Dirk Pranke <dpranke@chromium.org>
2+
3+
[chromium] move Tools.gyp, switch build-webkit --chromium to All.gyp
4+
https://bugs.webkit.org/show_bug.cgi?id=76505
5+
6+
Reviewed by Tony Chang.
7+
8+
Update with newly-generated files.
9+
10+
* .gitignore:
11+
112
2012-01-18 Eric Carlson <eric.carlson@apple.com>
213

314
Provide access to user's list of preferred languages

‎Source/WebKit/chromium/All.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
'type': 'none',
4242
'dependencies': [
4343
'WebKitUnitTests.gyp:webkit_unit_tests',
44-
'Tools.gyp:DumpRenderTree',
44+
'../../../Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree',
4545
],
4646
}
4747
],

‎Source/WebKit/chromium/ChangeLog‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2012-01-18 Dirk Pranke <dpranke@chromium.org>
2+
3+
[chromium] move Tools.gyp, switch build-webkit --chromium to All.gyp
4+
https://bugs.webkit.org/show_bug.cgi?id=76505
5+
6+
Reviewed by Tony Chang.
7+
8+
Update path to Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp.
9+
10+
* All.gyp:
11+
* gyp_webkit:
12+
- change to using All.gyp
13+
- change build_webkit_exes_from_webkit_gyp to 0
14+
115
2012-01-18 David Grogan <dgrogan@chromium.org>
216

317
IndexedDB: Check for permission before using IndexedDB from a worker.

‎Source/WebKit/chromium/gyp_webkit‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ if __name__ == '__main__':
119119
'-Dinside_chromium_build=0',
120120
'-Dv8_use_snapshot=false',
121121
'-Dmsvs_use_common_release=0',
122-
'-Dbuild_webkit_exes_from_webkit_gyp=1',
122+
'-Dbuild_webkit_exes_from_webkit_gyp=0',
123123

124124
# WebKit doesn't use the chromium style checker.
125125
'-Dmake_clang_dir=Source/WebKit/chromium/third_party/llvm-build/Release+Asserts',
@@ -129,7 +129,7 @@ if __name__ == '__main__':
129129
'--depth=./',
130130

131131
# gyp file to execute.
132-
'WebKit.gyp'])
132+
'All.gyp'])
133133

134134
print 'Updating webkit projects from gyp files...'
135135
sys.stdout.flush()

‎Tools/ChangeLog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2012-01-18 Dirk Pranke <dpranke@chromium.org>
2+
3+
[chromium] move Tools.gyp, switch build-webkit --chromium to All.gyp
4+
https://bugs.webkit.org/show_bug.cgi?id=76505
5+
6+
Reviewed by Tony Chang.
7+
8+
Update chromium build script to use All.gyp instead of WebKit.gyp
9+
10+
* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: Renamed from Source/WebKit/chromium/Tools.gyp.
11+
* Scripts/webkitdirs.pm:
12+
113
2012-01-18 Sam Weinig <sam@webkit.org>
214

315
Don’t hardcode the path to ‘make‘.

Source/WebKit/chromium/Tools.gyp renamed to Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030

3131
{
3232
'variables': {
33-
'tools_dir': '../../../Tools',
34-
'source_dir': '../..',
33+
'tools_dir': '../..',
34+
'source_dir': '../../../Source',
3535
},
3636
# FIXME: Remove this conditional check once chromium's
3737
# build/common.gypi is setting this flag to 0 by default. See
3838
# https://bugs.webkit.org/show_bug.cgi?id=68463.
3939
'conditions': [
4040
['build_webkit_exes_from_webkit_gyp==0', {
4141
'includes': [
42-
'../../../Tools/DumpRenderTree/DumpRenderTree.gypi',
43-
'features.gypi',
42+
'../DumpRenderTree.gypi',
43+
'../../../Source/WebKit/chromium/features.gypi',
4444
],
4545
'variables': {
4646
'conditions': [
@@ -52,7 +52,7 @@
5252
'chromium_src_dir': '<(source_dir)/WebKit/chromium',
5353
},{
5454
# WebKit is checked out in src/chromium/third_party/WebKit
55-
'chromium_src_dir': '../../../..',
55+
'chromium_src_dir': '<(tools_dir)/../..',
5656
}],
5757
],
5858
'ahem_path': '<(tools_dir)/DumpRenderTree/qt/fonts/AHEM____.TTF',

‎Tools/Scripts/webkitdirs.pm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,10 +2258,10 @@ sub buildChromium($@)
22582258
my $result = 1;
22592259
if (isDarwin() && !isChromiumAndroid() && !isChromiumMacMake()) {
22602260
# Mac build - builds the root xcode project.
2261-
$result = buildXCodeProject("Source/WebKit/chromium/WebKit", $clean, "-configuration", configuration(), @options);
2261+
$result = buildXCodeProject("Source/WebKit/chromium/All", $clean, "-configuration", configuration(), @options);
22622262
} elsif (isCygwin() || isWindows()) {
22632263
# Windows build - builds the root visual studio solution.
2264-
$result = buildChromiumVisualStudioProject("Source/WebKit/chromium/WebKit.sln", $clean);
2264+
$result = buildChromiumVisualStudioProject("Source/WebKit/chromium/All.sln", $clean);
22652265
} elsif (isLinux() || isChromiumAndroid() || isChromiumMacMake()) {
22662266
# Linux build - build using make.
22672267
$result = buildChromiumMakefile("all", $clean, @options);

0 commit comments

Comments
 (0)