Reviewed by David Kilzer.

        * Scripts/webkitdirs.pm:
        (sub setConfiguration): Added an optional argument to set the
        configuration instead of parsing it from ARGV.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 552fdfd2ab1d5212ffa1cb37f6881d5f13b083d9..791a8f75c6a8ce093c485ebeee49417acd138faf 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-18  Adam Roben  <aroben@apple.com>
+
+        Reviewed by David Kilzer.
+
+        * Scripts/webkitdirs.pm:
+        (sub setConfiguration): Added an optional argument to set the
+        configuration instead of parsing it from ARGV.
+
 2007-04-17  Adam Roben  <aroben@apple.com>
 
         * Scripts/find-included-framework-headers: Search Obj-C and Obj-C++

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 0f251f19a553fcd6c91d4269896005fe834d8d73..9fc81ee3870f17d024bc7dc5ed8c3430b4bb61fb 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -241,6 +241,11 @@ sub passedConfiguration
 
 sub setConfiguration
 {
+    if (my $config = shift @_) {
+        $configuration = $config;
+        return;
+    }
+
     determinePassedConfiguration();
     $configuration = $passedConfiguration if $passedConfiguration;
 }