Changes by Stuart Morgan.

        Reviewed by me.

        * Scripts/cvs-abandon: Use cwd instead of `pwd`.
        * Scripts/cvs-apply: Ditto.
        * Scripts/cvs-create-patch: Ditto.
        * Scripts/cvs-unapply: Ditto.
        * Scripts/run-webkit-tests: Ditto.
        * Scripts/webkitdirs.pm: Ditto. Also improve handling when there's no "Configuration" file.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b8dc8c6034ca230b350cc2252be805ed821e60de..cce6c86c82026d3b31fb68ed366a7a671df7f7ff 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2005-06-12  Darin Adler  <darin@apple.com>
+
+        Changes by Stuart Morgan.
+        Reviewed by me.
+
+        * Scripts/cvs-abandon: Use cwd instead of `pwd`.
+        * Scripts/cvs-apply: Ditto.
+        * Scripts/cvs-create-patch: Ditto.
+        * Scripts/cvs-unapply: Ditto.
+        * Scripts/run-webkit-tests: Ditto.
+        * Scripts/webkitdirs.pm: Ditto. Also improve handling when there's no "Configuration" file.
+
 2005-06-12  Darin Adler  <darin@apple.com>
 
         * Scripts/cvs-apply: Handle case of an empty patch better.

diff --git a/WebKitTools/Scripts/cvs-abandon b/WebKitTools/Scripts/cvs-abandon
index 3b9b6436b8fcf79c90f8161ea1820dd8fa61e4fc..bd09e054763547612ddceb05977a2b86cd64662c 100755 (executable)
--- a/WebKitTools/Scripts/cvs-abandon
+++ b/WebKitTools/Scripts/cvs-abandon
@@ -31,6 +31,7 @@
 
 use strict;
 use Getopt::Long;
+use Cwd;
 
 my $verbose = 0;
 GetOptions("verbose|v!" => \$verbose);
@@ -57,8 +58,7 @@ while (<UPDATE>) {
 }
 close UPDATE;
 
-my $startDir = `pwd`;
-chomp $startDir;
+my $startDir = getcwd();
 
 sub getDirAndBase
 {

diff --git a/WebKitTools/Scripts/cvs-apply b/WebKitTools/Scripts/cvs-apply
index ec71cafaf212dace92606278e3e185ac1fe1661b..064f9094ae90b071d9287773361830dbd0be59c6 100755 (executable)
--- a/WebKitTools/Scripts/cvs-apply
+++ b/WebKitTools/Scripts/cvs-apply
@@ -42,9 +42,9 @@
 #   When doing a removal, doesn't check that old file matches what's being removed.
 
 use strict;
+use Cwd;
 
-my $startDir = `pwd`;
-chomp $startDir;
+my $startDir = getcwd();
 
 my $indexPath;
 my $patch;

diff --git a/WebKitTools/Scripts/cvs-create-patch b/WebKitTools/Scripts/cvs-create-patch
index 3d416957bc754c5b7509f3c5d668eecb297ffd33..8a57bbf2ec667b8eef35cc7f9dece71069be5ebe 100755 (executable)
--- a/WebKitTools/Scripts/cvs-create-patch
+++ b/WebKitTools/Scripts/cvs-create-patch
@@ -43,9 +43,9 @@
 #   Handle binary files (some text form of the binary file).
 
 use strict;
+use Cwd;
 
-my $startDir = `pwd`;
-chomp $startDir;
+my $startDir = getcwd();
 
 my %paths;
 

diff --git a/WebKitTools/Scripts/cvs-unapply b/WebKitTools/Scripts/cvs-unapply
index a0963471e6847451308b0483bb1a3467c372271b..a4591708ffccf81da59673f7243bf8078ccd61f6 100755 (executable)
--- a/WebKitTools/Scripts/cvs-unapply
+++ b/WebKitTools/Scripts/cvs-unapply
@@ -42,9 +42,9 @@
 #   When reversing an addition, doesn't check that file matches what's being removed.
 
 use strict;
+use Cwd;
 
-my $startDir = `pwd`;
-chomp $startDir;
+my $startDir = getcwd();
 
 my $indexPath;
 my $patch;

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 826c1e8fa8847273e59cadbc73dffa007bba450c..bd93c846f224df4ac329734c0fbdad61652d35fd 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -31,6 +31,7 @@
 use strict;
 use IPC::Open2;
 use FindBin;
+use Cwd;
 use lib $FindBin::Bin;
 use webkitdirs;
 
@@ -58,8 +59,7 @@ die "can't find executable DumpRenderTree tool (looked in $productDir)\n" if !-x
 
 checkFrameworks();
 
-my $workingDir = `pwd`;
-chomp $workingDir;
+my $workingDir = getcwd();
 my $WebCoreDirectory = "$workingDir/WebCore";
 my $testDirectory = "$WebCoreDirectory/layout-tests";
 my $testResultsDirectory = "/tmp/layout-test-results";

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 612691681e004526ddd5d6568d9a0ff0d99fa977..2b76ef8820bcbcd0250363f1aab7d8143e72c285 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -29,6 +29,7 @@
 use strict;
 use warnings;
 use FindBin;
+use Cwd;
 
 BEGIN {
    use Exporter   ();
@@ -78,9 +79,7 @@ sub determineBaseProductDir
         @baseProductDirOption = ();
     } else {
         chdirWebKit();
-        my $dir = `pwd`;
-        chomp $dir;
-        $baseProductDir = "$dir/WebKitBuild";
+        $baseProductDir = getcwd() . "/WebKitBuild";
         @baseProductDirOption = ("SYMROOT=$baseProductDir");
     }
     $baseProductDir =~ s|^~/|$ENV{HOME}/|;
@@ -90,9 +89,10 @@ sub determineConfiguration
 {
     return if defined $configuration;
     determineBaseProductDir();
-    open CONFIGURATION, "$baseProductDir/Configuration";
-    $configuration = <CONFIGURATION>;
-    close CONFIGURATION;
+    if (open CONFIGURATION, "$baseProductDir/Configuration") {
+        $configuration = <CONFIGURATION>;
+        close CONFIGURATION;
+    }
     if ($configuration) {
         chomp $configuration;
     } else {