[webkit-changes] cvs commit: WebKitTools/Scripts build-webkit
prepare-ChangeLog run-webkit-tests webkitdirs.pm
Eric
eseidel at opensource.apple.com
Mon Nov 21 01:36:53 PST 2005
eseidel 05/11/21 01:36:53
Modified: . ChangeLog checkout
Scripts build-webkit prepare-ChangeLog run-webkit-tests
webkitdirs.pm
Log:
Bug #: 5788
Submitted by: eseidel
Reviewed by: hyatt
Some simple fixes to the build/test scripts now that SVG uses the
WebCore DOM. JSC+SVG is no longer needed, nor is RTTI support
or symlinks for KDOM.
* Scripts/build-webkit: No longer builds JavaScriptCore+SVG
* Scripts/prepare-ChangeLog: handles missing LayoutTests directory
* Scripts/run-webkit-tests: now runs SVG tests using DRT
* Scripts/webkitdirs.pm: use SVG symbols instead of RTTI
* checkout: no longer symlink kdom
Revision Changes Path
1.120 +14 -0 WebKitTools/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKitTools/ChangeLog,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- ChangeLog 10 Nov 2005 22:37:59 -0000 1.119
+++ ChangeLog 21 Nov 2005 09:36:51 -0000 1.120
@@ -1,3 +1,17 @@
+2005-11-21 Eric Seidel <eseidel at apple.com>
+
+ Reviewed by hyatt.
+
+ Some simple fixes to the build/test scripts now that SVG uses the
+ WebCore DOM. JSC+SVG is no longer needed, nor is RTTI support
+ or symlinks for KDOM.
+
+ * Scripts/build-webkit: No longer builds JavaScriptCore+SVG
+ * Scripts/prepare-ChangeLog: handles missing LayoutTests directory
+ * Scripts/run-webkit-tests: now runs SVG tests using DRT
+ * Scripts/webkitdirs.pm: use SVG symbols instead of RTTI
+ * checkout: no longer symlink kdom
+
2005-11-10 Eric Seidel <eseidel at apple.com>
Reviewed by ggaren.
1.5 +0 -1 WebKitTools/checkout
Index: checkout
===================================================================
RCS file: /cvs/root/WebKitTools/checkout,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- checkout 30 Sep 2005 21:44:41 -0000 1.4
+++ checkout 21 Nov 2005 09:36:51 -0000 1.5
@@ -73,7 +73,6 @@
if ($includeSVG) {
# Make the necessary symlinks
print "\nCreating symlinks (kdom, kcanvas, ksvg2, WebCore+SVG, svg-tests) from WebCore into SVGSupport\n";
- symlink("../SVGSupport/kdom", "WebCore/kdom");
symlink("../SVGSupport/kcanvas", "WebCore/kcanvas");
symlink("../SVGSupport/ksvg2", "WebCore/ksvg2");
symlink("../SVGSupport/WebCore+SVG", "WebCore/WebCore+SVG");
1.17 +2 -5 WebKitTools/Scripts/build-webkit
Index: build-webkit
===================================================================
RCS file: /cvs/root/WebKitTools/Scripts/build-webkit,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build-webkit 10 Nov 2005 22:38:00 -0000 1.16
+++ build-webkit 21 Nov 2005 09:36:51 -0000 1.17
@@ -75,14 +75,13 @@
}
# Force re-link of existing libraries if different than expected
-removeLibraryDependingOnRTTI("JavaScriptCore", $svgSupport);
-removeLibraryDependingOnRTTI("WebCore", $svgSupport);
+removeLibraryDependingOnSVG("WebCore", $svgSupport);
# Build, and abort if the build fails.
for my $dir (@projects) {
chdir $dir or die;
my $result;
- if ($svgSupport && ($dir eq "JavaScriptCore" || $dir eq "WebCore")) {
+ if ($svgSupport && ($dir eq "WebCore")) {
$result = system "xcodebuild", "-project", "$dir.xcodeproj", @options, "-target", "$dir+SVG";
} else {
$result = system "xcodebuild", "-project", "$dir.xcodeproj", @options;
@@ -103,7 +102,5 @@
if ($svgSupport) {
print "\n NOTE: WebKit has been built with SVG support enabled.\n";
print " Safari will have basic SVG viewing capatibilies.\n";
- print " Additional SVG testing is possible using DrawTest:\n";
- print " run \"build-drawtest\" followed by \"run-drawtest\"\n";
}
print "===========================================================\n";
1.5 +1 -1 WebKitTools/Scripts/prepare-ChangeLog
Index: prepare-ChangeLog
===================================================================
RCS file: /cvs/root/WebKitTools/Scripts/prepare-ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- prepare-ChangeLog 30 Sep 2005 21:44:42 -0000 1.4
+++ prepare-ChangeLog 21 Nov 2005 09:36:51 -0000 1.5
@@ -254,7 +254,7 @@
if ($prefix =~ m/WebCore/ || `pwd` =~ m/WebCore/) {
my $testsDir = "../LayoutTests";
$testsDir = "$prefix/$testsDir" if length($prefix);
- my $haveNewTests = (system("find \"$testsDir/../LayoutTests\" -path \"*/CVS/Entries\" | xargs grep -q \"/0/dummy timestamp//\"") == 0);
+ my $haveNewTests = ((-x "$testsDir/../LayoutTests") && (system("find \"$testsDir/../LayoutTests\" -path \"*/CVS/Entries\" | xargs grep -q \"/0/dummy timestamp//\"") == 0));
print CHANGE_LOG " WARNING: NO TEST CASES ADDED\n\n" unless $haveNewTests;
}
1.34 +5 -5 WebKitTools/Scripts/run-webkit-tests
Index: run-webkit-tests
===================================================================
RCS file: /cvs/root/WebKitTools/Scripts/run-webkit-tests,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- run-webkit-tests 3 Nov 2005 18:47:46 -0000 1.33
+++ run-webkit-tests 21 Nov 2005 09:36:51 -0000 1.34
@@ -70,8 +70,8 @@
'pixel-tests|p' => \$pixelTests,
'leaks|l' => \$checkLeaks,
'guard-malloc|g' => \$guardMalloc,
- 'max-width|w' => \$maxWidth,
- 'max-height|h' => \$maxHeight,
+ 'max-width|w=s' => \$maxWidth,
+ 'max-height|h=s' => \$maxHeight,
'verbose|v' => \$verbose,
'quiet|q' => \$quiet,
'singly|1' => \$singly);
@@ -80,10 +80,10 @@
my $result = system "WebKitTools/Scripts/build-dumprendertree", @ARGV;
exit $result if $result;
if ($testSVGs) {
- my $result = system "WebKitTools/Scripts/build-dumpkcanvastree", @ARGV;
- exit $result if $result;
- $dumpToolName = "DumpKCanvasTree";
$pixelTests = 1; # Pixel tests are always on for SVG.
+ # Temporary Hack: to pass w3c SVG layout tests which assume a smaller window size.
+ $maxWidth = 480 if (!$maxWidth);
+ $maxHeight = 360 if (!$maxHeight);
}
my $tool = "$productDir/$dumpToolName";
1.18 +9 -9 WebKitTools/Scripts/webkitdirs.pm
Index: webkitdirs.pm
===================================================================
RCS file: /cvs/root/WebKitTools/Scripts/webkitdirs.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- webkitdirs.pm 23 Sep 2005 03:31:47 -0000 1.17
+++ webkitdirs.pm 21 Nov 2005 09:36:52 -0000 1.18
@@ -196,32 +196,32 @@
}
}
-sub isRTTIEnabled
+sub hasSVGSupport
{
my $path = shift;
my $frameworkSymbols = `nm $path`;
- my $isRTTIEnabled = ($frameworkSymbols =~ /__ZTI/);
- return $isRTTIEnabled;
+ my $hasSVGSupport = ($frameworkSymbols =~ /SVGElementImpl/);
+ return $hasSVGSupport;
}
-sub removeLibraryDependingOnRTTI
+sub removeLibraryDependingOnSVG
{
my $frameworkName = shift;
- my $shouldHaveRTTI = shift;
+ my $shouldHaveSVG = shift;
my $path = builtDylibPathForName($frameworkName);
return unless -x $path;
- my $hasRTTI = isRTTIEnabled($path);
- system "rm -f $path" if ($shouldHaveRTTI xor $hasRTTI);
+ my $hasSVG = hasSVGSupport($path);
+ system "rm -f $path" if ($shouldHaveSVG xor $hasSVG);
}
sub checkWebCoreSVGSupport
{
my $framework = "WebCore";
my $path = builtDylibPathForName($framework);
- my $hasSVGSupport = isRTTIEnabled($path);
- die "$framework at \"$path\" does not include SVG Support, please run build-webkit --svg\n" unless $hasSVGSupport;
+ my $hasSVG = hasSVGSupport($path);
+ die "$framework at \"$path\" does not include SVG Support, please run build-webkit --svg\n" unless $hasSVG;
}
sub checkRequiredSystemConfig
More information about the webkit-changes
mailing list