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:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16060
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+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:
+
2006-08-24 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Eric. Landed by rwlbuis.
$result = system "xcodebuild", "-project", "DumpRenderTree.xcodeproj", @options;
} elsif (isCygwin()) {
$result = buildVisualStudioProject("DumpRenderTree");
+} elsif (isQt()) {
+ $result = 1;
+ print "Please build DumpRenderTree yourself! Automatic compilation not supported yet!\n";
} else {
die "Building not defined for this platform!\n";
}
if (! -e "iconv-1.9.1.win32.zip") {
print "Downloading iconv-1.9.1.win32.zip...\n\n";
`rm -rf iconv*`;
- `curl -O ftp://fr.rpmfind.net/pub/libxml/win32/iconv-1.9.1.win32.zip`;
+ `curl -O http://fr.rpmfind.net/pub/libxml/win32/iconv-1.9.1.win32.zip`;
print "\nInstalling iconv-1.9.1.win32.zip...\n";
`unzip iconv-1.9.1.win32.zip`;
`rm -rf ../iconv`;
if (! -e "libxml2-2.6.23.win32.zip") {
print "Downloading libxml2-2.6.23.win32.zip...\n\n";
`rm -rf libxml*`;
- `curl -O ftp://fr.rpmfind.net/pub/libxml/win32/libxml2-2.6.23.win32.zip`;
+ `curl -O http://fr.rpmfind.net/pub/libxml/win32/libxml2-2.6.23.win32.zip`;
print "\nInstalling libxml2-2.6.23.win32.zip...\n";
`unzip libxml2-2.6.23.win32.zip`;
`rm -rf ../libxml`;
if (! -e "libxslt-1.1.15.win32.zip") {
print "Downloading libxmslt-1.1.15.win32.zip...\n";
`rm -rf libxslt*`;
- `curl -O ftp://fr.rpmfind.net/pub/libxml/win32/libxslt-1.1.15.win32.zip`;
+ `curl -O http://fr.rpmfind.net/pub/libxml/win32/libxslt-1.1.15.win32.zip`;
print "Installing libxmslt-1.1.15.win32.zip...\n";
`unzip libxslt-1.1.15.win32.zip`;
`rm -rf ../libxslt`;
if (! -e "zlib-1.2.3.win32.zip") {
print "Downloading zlib-1.2.3.win32.zip...\n\n";
`rm -rf zlib*`;
- `curl -O ftp://fr.rpmfind.net/pub/libxml/win32/zlib-1.2.3.win32.zip`;
+ `curl -O http://fr.rpmfind.net/pub/libxml/win32/zlib-1.2.3.win32.zip`;
print "\nInstalling zlib-1.2.3.win32.zip...\n";
`unzip zlib-1.2.3.win32.zip`;
`rm -rf ../zlib`;
{
return if $toolOpen;
+ # Save some requires variables for the linux environment...
+ my $homeDir = $ENV{'HOME'};
+ my $dbusAddress = $ENV{'DBUS_SESSION_BUS_ADDRESS'};
+
local %ENV;
+ $ENV{DISPLAY} = ":0" if isQt();
+ $ENV{HOME} = $homeDir if isQt();
+ $ENV{DBUS_SESSION_BUS_ADDRESS} = $dbusAddress if isQt();
$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
$ENV{XML_CATALOG_FILES} = ""; # work around missing /etc/catalog <rdar://problem/4292995>
$ENV{MallocStackLogging} = 1 if $checkLeaks;
} else {
$configuration = "Release";
}
+
+ if (isQt()) {
+ # We only support one build type for now
+ $configuration = "";
+ }
}
sub determineConfigurationProductDir
if (isCygwin()) {
return "$baseProductDir/$framework.intermediate/$configuration/$framework.intermediate/$framework.lib";
}
+ if (isQt()) {
+ return "$baseProductDir/../../../$framework";
+ }
+
die "Unsupported platform, can't determine built library locations.";
}
sub hasSVGSupport
{
- return 0 if isCygwin();
+ return 0 if isCygwin();
+
my $path = shift;
+
+ if ((isQt()) and ($path =~ /WebCore/)) {
+ $path .= "/../lib/libWebCore-unity.so";
+ }
+
open NM, "-|", "nm", $path or die;
my $hasSVGSupport = 0;
while (<NM>) {
{
my $frameworkName = shift;
my $shouldHaveSVG = shift;
-
+
my $path = builtDylibPathForName($frameworkName);
return unless -x $path;
-
+
my $hasSVG = hasSVGSupport($path);
system "rm -f $path" if ($shouldHaveSVG xor $hasSVG);
}
return $hasSVG;
}
+sub isQt()
+{
+ return ($^O eq "linux") and defined($ENV{'QTDIR'})
+}
sub isCygwin()
{