Skip to content

Commit dddbc17

Browse files
author
Anders Carlsson
committed
2006-08-27 Nikolas Zimmermann <zimmermann@kde.org>
 Reviewed by Eric, landed by Anders. Add DumpRenderTree support for Qt/Linux. * DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt: Added. * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp: Added. (WebCore::DumpRenderTree::DumpRenderTree): (WebCore::DumpRenderTree::~DumpRenderTree): (WebCore::DumpRenderTree::open): (WebCore::DumpRenderTree::readStdin): (WebCore::DumpRenderTree::checkLoaded): * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.h: Added. * DumpRenderTree/DumpRenderTree.qtproj/main.cpp: Added. (main): * Scripts/build-dumprendertree: * Scripts/run-webkit-tests: * Scripts/webkitdirs.pm: Canonical link: https://commits.webkit.org/13456@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16060 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent a22f6b2 commit dddbc17

5 files changed

Lines changed: 56 additions & 7 deletions

File tree

‎WebKitTools/ChangeLog‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
2006-08-27 Nikolas Zimmermann <zimmermann@kde.org>
2+
3+
Reviewed by Eric, landed by Anders.
4+
5+
Add DumpRenderTree support for Qt/Linux.
6+
7+
* DumpRenderTree/DumpRenderTree.qtproj/CMakeLists.txt: Added.
8+
* DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp: Added.
9+
(WebCore::DumpRenderTree::DumpRenderTree):
10+
(WebCore::DumpRenderTree::~DumpRenderTree):
11+
(WebCore::DumpRenderTree::open):
12+
(WebCore::DumpRenderTree::readStdin):
13+
(WebCore::DumpRenderTree::checkLoaded):
14+
* DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.h: Added.
15+
* DumpRenderTree/DumpRenderTree.qtproj/main.cpp: Added.
16+
(main):
17+
* Scripts/build-dumprendertree:
18+
* Scripts/run-webkit-tests:
19+
* Scripts/webkitdirs.pm:
20+
121
2006-08-24 Nikolas Zimmermann <zimmermann@kde.org>
222

323
Reviewed by Eric. Landed by rwlbuis.

‎WebKitTools/Scripts/build-dumprendertree‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ if (isOSX()) {
4848
$result = system "xcodebuild", "-project", "DumpRenderTree.xcodeproj", @options;
4949
} elsif (isCygwin()) {
5050
$result = buildVisualStudioProject("DumpRenderTree");
51+
} elsif (isQt()) {
52+
$result = 1;
53+
print "Please build DumpRenderTree yourself! Automatic compilation not supported yet!\n";
5154
} else {
5255
die "Building not defined for this platform!\n";
5356
}

‎WebKitTools/Scripts/install-win-extras‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if (! -e "icu-3.4-win32-msvc7.1.zip") {
5555
if (! -e "iconv-1.9.1.win32.zip") {
5656
print "Downloading iconv-1.9.1.win32.zip...\n\n";
5757
`rm -rf iconv*`;
58-
`curl -O ftp://fr.rpmfind.net/pub/libxml/win32/iconv-1.9.1.win32.zip`;
58+
`curl -O http://fr.rpmfind.net/pub/libxml/win32/iconv-1.9.1.win32.zip`;
5959
print "\nInstalling iconv-1.9.1.win32.zip...\n";
6060
`unzip iconv-1.9.1.win32.zip`;
6161
`rm -rf ../iconv`;
@@ -66,7 +66,7 @@ if (! -e "iconv-1.9.1.win32.zip") {
6666
if (! -e "libxml2-2.6.23.win32.zip") {
6767
print "Downloading libxml2-2.6.23.win32.zip...\n\n";
6868
`rm -rf libxml*`;
69-
`curl -O ftp://fr.rpmfind.net/pub/libxml/win32/libxml2-2.6.23.win32.zip`;
69+
`curl -O http://fr.rpmfind.net/pub/libxml/win32/libxml2-2.6.23.win32.zip`;
7070
print "\nInstalling libxml2-2.6.23.win32.zip...\n";
7171
`unzip libxml2-2.6.23.win32.zip`;
7272
`rm -rf ../libxml`;
@@ -77,7 +77,7 @@ if (! -e "libxml2-2.6.23.win32.zip") {
7777
if (! -e "libxslt-1.1.15.win32.zip") {
7878
print "Downloading libxmslt-1.1.15.win32.zip...\n";
7979
`rm -rf libxslt*`;
80-
`curl -O ftp://fr.rpmfind.net/pub/libxml/win32/libxslt-1.1.15.win32.zip`;
80+
`curl -O http://fr.rpmfind.net/pub/libxml/win32/libxslt-1.1.15.win32.zip`;
8181
print "Installing libxmslt-1.1.15.win32.zip...\n";
8282
`unzip libxslt-1.1.15.win32.zip`;
8383
`rm -rf ../libxslt`;
@@ -88,7 +88,7 @@ if (! -e "libxslt-1.1.15.win32.zip") {
8888
if (! -e "zlib-1.2.3.win32.zip") {
8989
print "Downloading zlib-1.2.3.win32.zip...\n\n";
9090
`rm -rf zlib*`;
91-
`curl -O ftp://fr.rpmfind.net/pub/libxml/win32/zlib-1.2.3.win32.zip`;
91+
`curl -O http://fr.rpmfind.net/pub/libxml/win32/zlib-1.2.3.win32.zip`;
9292
print "\nInstalling zlib-1.2.3.win32.zip...\n";
9393
`unzip zlib-1.2.3.win32.zip`;
9494
`rm -rf ../zlib`;

‎WebKitTools/Scripts/run-webkit-tests‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,14 @@ sub openDumpRenderTreeIfNeeded()
786786
{
787787
return if $toolOpen;
788788

789+
# Save some requires variables for the linux environment...
790+
my $homeDir = $ENV{'HOME'};
791+
my $dbusAddress = $ENV{'DBUS_SESSION_BUS_ADDRESS'};
792+
789793
local %ENV;
794+
$ENV{DISPLAY} = ":0" if isQt();
795+
$ENV{HOME} = $homeDir if isQt();
796+
$ENV{DBUS_SESSION_BUS_ADDRESS} = $dbusAddress if isQt();
790797
$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
791798
$ENV{XML_CATALOG_FILES} = ""; # work around missing /etc/catalog <rdar://problem/4292995>
792799
$ENV{MallocStackLogging} = 1 if $checkLeaks;

‎WebKitTools/Scripts/webkitdirs.pm‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ sub determineConfiguration
125125
} else {
126126
$configuration = "Release";
127127
}
128+
129+
if (isQt()) {
130+
# We only support one build type for now
131+
$configuration = "";
132+
}
128133
}
129134

130135
sub determineConfigurationProductDir
@@ -257,6 +262,10 @@ sub builtDylibPathForName
257262
if (isCygwin()) {
258263
return "$baseProductDir/$framework.intermediate/$configuration/$framework.intermediate/$framework.lib";
259264
}
265+
if (isQt()) {
266+
return "$baseProductDir/../../../$framework";
267+
}
268+
260269
die "Unsupported platform, can't determine built library locations.";
261270
}
262271

@@ -273,8 +282,14 @@ sub checkFrameworks
273282

274283
sub hasSVGSupport
275284
{
276-
return 0 if isCygwin();
285+
return 0 if isCygwin();
286+
277287
my $path = shift;
288+
289+
if ((isQt()) and ($path =~ /WebCore/)) {
290+
$path .= "/../lib/libWebCore-unity.so";
291+
}
292+
278293
open NM, "-|", "nm", $path or die;
279294
my $hasSVGSupport = 0;
280295
while (<NM>) {
@@ -288,10 +303,10 @@ sub removeLibraryDependingOnSVG
288303
{
289304
my $frameworkName = shift;
290305
my $shouldHaveSVG = shift;
291-
306+
292307
my $path = builtDylibPathForName($frameworkName);
293308
return unless -x $path;
294-
309+
295310
my $hasSVG = hasSVGSupport($path);
296311
system "rm -f $path" if ($shouldHaveSVG xor $hasSVG);
297312
}
@@ -308,6 +323,10 @@ sub checkWebCoreSVGSupport
308323
return $hasSVG;
309324
}
310325

326+
sub isQt()
327+
{
328+
return ($^O eq "linux") and defined($ENV{'QTDIR'})
329+
}
311330

312331
sub isCygwin()
313332
{

0 commit comments

Comments
 (0)