Changeset 116008 in webkit

Timestamp:

May 3, 2012 2:07:17 PM (12 years ago)

Author:

eric@webkit.org

Message:

Remove dead code from build-webkit for working around old XCode dependency bug
​https://bugs.webkit.org/show_bug.cgi?id=85535

Reviewed by Adam Barth.

Xcode used to have a bug whereby it didn't notice if you changed the #defines
passed on the command line to xcodebuild. I wrote code to work around this
while bringing up SVG support 5-6 years ago. I think we can finally remove this
code from build-webkit, since SVG is the only feature flag to ever use it
(modern in-progress features like MathML don't seem to be using the support)
an I suspect the XCode bug has long been fixed.

• Scripts/build-webkit:
• Scripts/webkitperl/features.pm:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (3 diffs)
• Scripts/webkitperl/features.pm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-03  Eric Seidel  <eric@webkit.org>
+
+        Remove dead code from build-webkit for working around old XCode dependency bug
+        https://bugs.webkit.org/show_bug.cgi?id=85535
+
+        Reviewed by Adam Barth.
+
+        Xcode used to have a bug whereby it didn't notice if you changed the #defines
+        passed on the command line to xcodebuild.  I wrote code to work around this
+        while bringing up SVG support 5-6 years ago.  I think we can finally remove this
+        code from build-webkit, since SVG is the only feature flag to ever use it
+        (modern in-progress features like MathML don't seem to be using the support)
+        an I suspect the XCode bug has long been fixed.
+
+        * Scripts/build-webkit:
+        * Scripts/webkitperl/features.pm:
+
 2012-05-03  Andy Estes  <aestes@apple.com>
 

trunk/Tools/Scripts/build-webkit

@@ -40 +40 @@
 use lib $FindBin::Bin;
 use webkitdirs;
-use webkitperl::features;
 use POSIX;
 
@@ -422 +421 @@
 }
 
-$svgSupport = $svgSupport || $svgDOMObjCBindingsSupport || $svgFontsSupport;
-
-$blobSupport = $blobSupport || $mediaStreamSupport;
-
 my $programName = basename($0);
 my $usage = <<EOF;
@@ -635 +630 @@
 # build options, etc.
 @projects = ("Source/WebKit") if $onlyWebKitProject;
-
-# Force re-link of existing libraries if different than expected
-removeLibraryDependingOnFeature("WebCore", "SVG", $svgSupport);
 
 if (isInspectorFrontend()) {

trunk/Tools/Scripts/webkitperl/features.pm

@@ -41 +41 @@
    $VERSION     = 1.00;
    @ISA         = qw(Exporter);
-   @EXPORT      = qw(&checkWebCoreFeatureSupport
-                     &removeLibraryDependingOnFeature);
+   @EXPORT      = qw(&checkWebCoreFeatureSupport);
    %EXPORT_TAGS = ( );
    @EXPORT_OK   = ();
-}
-
-sub libraryContainsSymbol($$)
-{
-    my ($path, $symbol) = @_;
-
-    if (isCygwin() or isWindows()) {
-        # FIXME: Implement this for Windows.
-        return 0;
-    }
-
-    my $foundSymbol = 0;
-    if (-e $path) {
-        open NM, "-|", nmPath(), $path or die;
-        while (<NM>) {
-            $foundSymbol = 1 if /$symbol/; # FIXME: This should probably check for word boundaries before/after the symbol name.
-        }
-        close NM;
-    }
-    return $foundSymbol;
 }
 
@@ -95 +74 @@
 }
 
-sub removeLibraryDependingOnFeature($$$)
-{
-    my ($libraryName, $featureName, $shouldHaveFeature) = @_;
-    my $path = builtDylibPathForName($libraryName);
-    return unless -x $path;
-
-    my $hasFeature = hasFeature($featureName, $path);
-    system "rm -f $path" if ($shouldHaveFeature xor $hasFeature);
-}
-
 1;