Changeset 116036 in webkit

Timestamp:

May 3, 2012 4:09:41 PM (12 years ago)

Author:

eric@webkit.org

Message:

--coverage should not not use the "feature" options system in build-webkit, similarly remove special-casing for WTF_URL
​https://bugs.webkit.org/show_bug.cgi?id=85542

Reviewed by Daniel Bates.

Remove these last two odd-men-out, so that we can generate the default feature options
for build-webkit using the new generate-feature-files command.
The Mac build system has some special casing for ENABLE_ defines which gets them
defined as -D on the build command, even though initially they start out as
environment variables ENABLE_FOO = ENABLE_FOO. The Feature options in build-webkit
depend on this support, but it doesn't work for WTF_USE_ defines like WTF_USE_WTF_URL.
I'm told that WTF_URL is not actively being worked on, so just removing it for now.
It should probably come back to life as an ENABLE_, or build-webkit or the Xcode projects
should be made generically smarter about these USE_WTF defines.
(There is still WTF_USE_TILED_BACKING_STORE in the feature list, but it only seems
used by Qt. If someone tried build-webkit --tiled-backing-store on Mac today it
would not work!)

• Scripts/build-webkit:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (9 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-03  Eric Seidel  <eric@webkit.org>
+
+        --coverage should not not use the "feature" options system in build-webkit, similarly remove special-casing for WTF_URL
+        https://bugs.webkit.org/show_bug.cgi?id=85542
+
+        Reviewed by Daniel Bates.
+
+        Remove these last two odd-men-out, so that we can generate the default feature options
+        for build-webkit using the new generate-feature-files command.
+        The Mac build system has some special casing for ENABLE_ defines which gets them
+        defined as -D on the build command, even though initially they start out as
+        environment variables ENABLE_FOO = ENABLE_FOO.  The Feature options in build-webkit
+        depend on this support, but it doesn't work for WTF_USE_ defines like WTF_USE_WTF_URL.
+        I'm told that WTF_URL is not actively being worked on, so just removing it for now.
+        It should probably come back to life as an ENABLE_, or build-webkit or the Xcode projects
+        should be made generically smarter about these USE_WTF defines.
+        (There is still WTF_USE_TILED_BACKING_STORE in the feature list, but it only seems
+        used by Qt.  If someone tried build-webkit --tiled-backing-store on Mac today it
+        would not work!)
+
+        * Scripts/build-webkit:
+
 2012-05-03  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/Scripts/build-webkit

@@ -62 +62 @@
 my $onlyWebKitProject = 0;
 my $noWebKit2 = 0;
+my $coverageSupport = 0;
 my $startTime = time();
 
@@ -73 +74 @@
     $blobSupport,
     $channelMessagingSupport,
-    $coverageSupport,
     $cssFiltersSupport,
     $cssGridLayoutSupport,
@@ -143 +143 @@
     $workersSupport,
     $xsltSupport,
-    $wtfURL,
 );
 
@@ -183 +182 @@
       define => "ENABLE_CSS_SHADERS", default => 0, value => \$cssShadersSupport },
 
-    { option => "coverage", desc => "Toggle code coverage support",
-      define => "", default => 0, value => \$coverageSupport },
-
     { option => "sql-database", desc => "Toggle SQL Database Support",
       define => "ENABLE_SQL_DATABASE", default => 1, value => \$sqlDatabaseSupport },
@@ -374 +370 @@
     { option => "workers", desc => "Toggle Web Workers support",
       define => "ENABLE_WORKERS", default => (isAppleWebKit() || isGtk() || isBlackBerry() || isEfl()), value => \$workersSupport },
-
-    { option => "wtfurl", desc => "Toogle the use of WTFURL for URL parsing",
-      define => "WTF_USE_WTFURL", default => 0, value => \$wtfURL },
 
     { option => "xslt", desc => "Toggle XSLT support",
@@ -428 +421 @@
   --debug                           Compile in debug mode
   --gyp                             Use GYP-generated project files
-  --dsym                            Change debugging format to dwarf-with-dsym (Mac only)
+  --coverage                        Enable Code Coverage support (Mac only)
 
   --blackberry                      Build the BlackBerry port on Mac/Linux
@@ -470 +463 @@
     'only-webkit' => \$onlyWebKitProject,
     'no-webkit2' => \$noWebKit2,
+    'coverage' => \$coverageSupport,
 );
 
@@ -548 +542 @@
 
     foreach (@features) {
-        if ($_->{option} ne "coverage" && $_->{option} ne "wtfurl") {
-            my $option = option($_->{define}, ${$_->{value}}, $_->{default});
-            push @options, $option unless $option eq "";
-        }
+        my $option = option($_->{define}, ${$_->{value}}, $_->{default});
+        push @options, $option unless $option eq "";
     }
 
@@ -719 +711 @@
         my @local_options = @options;
         push @local_options, XcodeCoverageSupportOptions() if $coverageSupport && $project ne "ANGLE";
-        push @local_options, "OTHER_CFLAGS= \$(OTHER_CFLAGS) -DWTF_USE_WTFURL=1" if $wtfURL;
         my $useGYPProject = $useGYP && ($project =~ "WebCore|JavaScriptCore");
         my $projectPath = $useGYPProject ? "gyp/$project" : $project;