* Scripts/webkitdirs.pm: Changed SVG check to work even if the path has

        spaces in it by using the form of open that treats each argument as a string
        rather than backtick syntax for reading the output of the nm tool.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12234 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 38c35a579a89b6ba659d4e72a5b1d3d596df01ab..adeed73d8b831201872f94a20fb51dc54da9275c 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-19  Darin Adler  <darin@apple.com>
+
+        * Scripts/webkitdirs.pm: Changed SVG check to work even if the path has
+        spaces in it by using the form of open that treats each argument as a string
+        rather than backtick syntax for reading the output of the nm tool.
+
 2006-01-12  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin.

diff --git a/WebKitTools/Scripts/check-dom-results b/WebKitTools/Scripts/check-dom-results
index 8348ecbd442c299749c61d52dc832cf7c7fd4081..d104ef40afd044c225d1373104f6a65c46f56bd6 100755 (executable)
--- a/WebKitTools/Scripts/check-dom-results
+++ b/WebKitTools/Scripts/check-dom-results
@@ -68,19 +68,19 @@ foreach my $suite (@suites) {
     my $count = 0;
 
     foreach my $result (@results) {
-       $count++;
-       my $success = 0;
-       open RESULT, "<$result";
-       while (<RESULT>) {
-           if (/Success/) {
-               $success = 1;
-               last;
-           }
-       }
-       close RESULT;
-       if (!$success) {
-           push @failures, $result;
-       }
+        $count++;
+        my $success = 0;
+        open RESULT, "<$result";
+        while (<RESULT>) {
+            if (/Success/) {
+                $success = 1;
+                last;
+            }
+        }
+        close RESULT;
+        if (!$success) {
+            push @failures, $result;
+        }
     }
 
     my $disabledCount = (scalar @disabled);
@@ -99,29 +99,29 @@ foreach my $suite (@suites) {
     print " ($disabledCount disabled)" if $disabledCount;
     print "\n";
     if ($verbose) {
-       print "\n";
-       if (@disabled) {
-           print "    Disabled:\n";
-           
-           foreach my $failure (sort @disabled) {
-               $failure =~ s|.*/||;
-               $failure =~ s|-disabled||;
-               print "        ${directory}/${failure}";
-           }
-       }
-       if (@failures) {
-           print "    Failed:\n";
-           
-           foreach my $failure (sort @failures) {
+        print "\n";
+        if (@disabled) {
+            print "    Disabled:\n";
+            
+            foreach my $failure (sort @disabled) {
+                $failure =~ s|.*/||;
+                $failure =~ s|-disabled||;
+                print "        ${directory}/${failure}";
+            }
+        }
+        if (@failures) {
+            print "    Failed:\n";
+            
+            foreach my $failure (sort @failures) {
                 $directory =~ m|^dom/(\w+)|;
                 my $extension = $1;
-               $failure =~ s|.*/||;
-               $failure =~ s|-expected\.txt|.${extension}|;
-               print "        ${directory}/${failure}";
-           }
-       }
+                $failure =~ s|.*/||;
+                $failure =~ s|-expected\.txt|.${extension}|;
+                print "        ${directory}/${failure}";
+            }
+        }
 
-       print "\n";
+        print "\n";
     }
 
     $totalCount += $count;

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index b0906d4953674ba4dd3b95507e83d389ec826d25..ab8637573d6f8836c3990291d2fd0c98cfeeb4a2 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -109,7 +109,7 @@ my $extensionPart = "-name '*.html' -or -name '*.xml' -or -name '*.xhtml'";
 if ($testSVGs) {
     $extensionPart = "-name '*.svg' -or -name '*.xml'";
 } elsif ($haveSVGSupport) { 
-       $extensionPart .= " -or -name '*.svg'";
+    $extensionPart .= " -or -name '*.svg'";
 } else {
     $prunePart .= " -or \\( -name svg \\! -prune \\)";
 }

diff --git a/WebKitTools/Scripts/svn-apply b/WebKitTools/Scripts/svn-apply
index d42630ef150b9607c22ae14203a0bc62f5b128aa..03043f3c9873aaf3324b425c49621a6947f05969 100755 (executable)
--- a/WebKitTools/Scripts/svn-apply
+++ b/WebKitTools/Scripts/svn-apply
@@ -107,9 +107,9 @@ sub patch
     my ($fullpath, $prefix, $base) = ($1, $2, $4);
 
     my $previousRevision = 0;
-       if($patch =~ /\n--- .+\(revision (\d+)\)\n/) { 
-           $previousRevision = $1;
-       }
+        if($patch =~ /\n--- .+\(revision (\d+)\)\n/) { 
+            $previousRevision = $1;
+        }
 
     if ($previousRevision != 0 || $patch !~ /\ndiff -N/) {
         # Standard patch, patch tool can handle this.
@@ -157,4 +157,4 @@ sub chdirAddingDirectoriesIfNeeded
         }
         chdir $dir or die "Failed to chdir to $dir\n";
     }
-}
\ No newline at end of file
+}

diff --git a/WebKitTools/Scripts/svn-unapply b/WebKitTools/Scripts/svn-unapply
index 284a4da965b904c851fc536ee531e2dc88c294d0..222c8ef740b8f36a58e10bc3a14d57375466466d 100755 (executable)
--- a/WebKitTools/Scripts/svn-unapply
+++ b/WebKitTools/Scripts/svn-unapply
@@ -76,9 +76,9 @@ sub patch
     return if !$patch;
 
     my $previousRevision = 0;
-       if($patch =~ /\n--- .+\(revision (\d+)\)\n/) { 
-           $previousRevision = $1;
-       }
+        if($patch =~ /\n--- .+\(revision (\d+)\)\n/) { 
+            $previousRevision = $1;
+        }
 
     if ($previousRevision != 0 || $patch !~ /\ndiff -N/) {
         # Standard patch, patch tool can handle this.

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 5c950adbc023e5c0fecec09abe4244d56f1b382a..7c4ca77387df73ebc425abe747a6001fbb2e1af7 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
+# Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -128,12 +128,12 @@ sub XcodeOptions
 
 sub XcodeOptionString
 {
-       return join " ", XcodeOptions();
+    return join " ", XcodeOptions();
 }
 
 sub XcodeOptionStringNoConfig
 {
-       return join " ", @baseProductDirOption;
+    return join " ", @baseProductDirOption;
 }
 
 my $passedConfiguration;
@@ -209,8 +209,12 @@ sub checkFrameworks
 sub hasSVGSupport
 {
     my $path = shift;
-    my $frameworkSymbols = `nm $path`;
-    my $hasSVGSupport = ($frameworkSymbols =~ /SVGElementImpl/);
+    open NM, "-|", "nm", $path or die;
+    my $hasSVGSupport = 0;
+    while (<NM>) {
+        $hasSVGSupport = 1 if /SVGElement/;
+    }
+    close NM;
     return $hasSVGSupport;
 }
 
@@ -228,12 +232,12 @@ sub removeLibraryDependingOnSVG
 
 sub checkWebCoreSVGSupport
 {
-       my $required = shift;
+    my $required = shift;
     my $framework = "WebCore";
     my $path = builtDylibPathForName($framework);
     my $hasSVG = hasSVGSupport($path);
     if ($required && !$hasSVG) {
-       die "$framework at \"$path\" does not include SVG Support, please run build-webkit --svg\n";
+        die "$framework at \"$path\" does not include SVG Support, please run build-webkit --svg\n";
     }
     return $hasSVG;
 }