[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit f5fe79849de92ddd1f9e8f860c7546dc0c407832
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 04:42:02 2010 +0000

    2010-02-14  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Darin Adler.
    
            webkit-build-directory misuses terms
            https://bugs.webkit.org/show_bug.cgi?id=34822
    
            * Scripts/webkit-build-directory:
             - Add --top-level and --configuration options and make using one of them required.
            * Scripts/webkitpy/layout_tests/port/mac.py:
             - Use --top-level instead of --base.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54759 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2c2311a..67b8806 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-14  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        webkit-build-directory misuses terms
+        https://bugs.webkit.org/show_bug.cgi?id=34822
+
+        * Scripts/webkit-build-directory:
+         - Add --top-level and --configuration options and make using one of them required.
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+         - Use --top-level instead of --base.
+
 2010-02-14  Chang Shu  <Chang.Shu at nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/WebKitTools/Scripts/webkit-build-directory b/WebKitTools/Scripts/webkit-build-directory
index a85c587..bf7d66d 100755
--- a/WebKitTools/Scripts/webkit-build-directory
+++ b/WebKitTools/Scripts/webkit-build-directory
@@ -34,31 +34,35 @@ use Getopt::Long;
 use lib $FindBin::Bin;
 use webkitdirs;
 
-my $showBaseProductDirectory = 0;
+my $showConfigurationDirectory = 0;
 my $showHelp = 0;
+my $showTopLevelDirectory = 0;
+
 
 my $programName = basename($0);
 my $usage = <<EOF;
 Usage: $programName [options]
-  --base      Show the root build directory instead of one corresponding to the current target (e.g. Debug, Release)
-  --debug     Show build directory for the Debug target
-  -h|--help   Show this help message
-  --release   Show build directory for the Release target
+  --configuration  Show the build directory for a specific configuration (e.g. Debug, Release.  Defaults to the active configuration set by set-webkit-configuration)
+  -h|--help        Show this help message
+  --top-level      Show the top-level build directory
+
+Either --configuration or --top-level is required.
 EOF
 
 setConfiguration(); # Figure out from the command line if we're --debug or --release or the default.
 
 my $getOptionsResult = GetOptions(
-    'base' => \$showBaseProductDirectory,
+    'configuration' => \$showConfigurationDirectory,
+    'top-level' => \$showTopLevelDirectory,
     'help|h' => \$showHelp,
 );
 
-if (!$getOptionsResult || $showHelp) {
+if (!$getOptionsResult || $showHelp || (!$showConfigurationDirectory && !$showTopLevelDirectory)) {
     print STDERR $usage;
     exit 1;
 }
 
-if ($showBaseProductDirectory) {
+if ($showTopLevelDirectory) {
     print baseProductDir() . "\n";
 } else {
     print productDir() . "\n";
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
index 4b73cec..1e57cd2 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
@@ -180,7 +180,7 @@ class MacPort(base.Port):
 
     def _build_path(self, *comps):
         if not self._cached_build_root:
-            self._cached_build_root = executive.run_command(["webkit-build-directory", "--base"]).rstrip()
+            self._cached_build_root = executive.run_command(["webkit-build-directory", "--top-level"]).rstrip()
         return os.path.join(self._cached_build_root, self._options.target, *comps)
 
     def _kill_process(self, pid):

-- 
WebKit Debian packaging