Reviewed by Geoff Garen.

        - Fixed run-safari and gdb-safari to use the Safari application in the build results
          directory, if any, falling back to the one in the Applications directory otherwise.
          Does no harm for open source contributors who don't build Safari, and helps out the
          Safari team, since we do build Safari.

        * Scripts/webkitdirs.pm: Added safariPath function that uses WEBKIT_SAFARI environment
        variable, and if that's not present, looks in either the build results directory or
        /Applications; factors code that was in both scripts before into a shared function.
        Also removed some Xcode 2.0 support which is no longer relevant since our projects are
        now in Xcode 2.1 format and incompatible with older versions of Xcode.

        * Scripts/gdb-safari: Use safariPath.
        * Scripts/run-safari: Use safariPath.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5e3d5302c59ed69d6f9a23ef39d7b9a35e864b7b..46b08b3bca434463714a15a6d7a8222f31ec3bca 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2005-07-25  Darin Adler  <darin@apple.com>
+
+        Reviewed by Geoff Garen.
+
+        - Fixed run-safari and gdb-safari to use the Safari application in the build results
+          directory, if any, falling back to the one in the Applications directory otherwise.
+          Does no harm for open source contributors who don't build Safari, and helps out the
+          Safari team, since we do build Safari.
+
+        * Scripts/webkitdirs.pm: Added safariPath function that uses WEBKIT_SAFARI environment
+        variable, and if that's not present, looks in either the build results directory or
+        /Applications; factors code that was in both scripts before into a shared function.
+        Also removed some Xcode 2.0 support which is no longer relevant since our projects are
+        now in Xcode 2.1 format and incompatible with older versions of Xcode.
+
+        * Scripts/gdb-safari: Use safariPath.
+        * Scripts/run-safari: Use safariPath.
+
 2005-07-22  Geoffrey Garen  <ggaren@apple.com>
 
         Moved Tools/Scripts/run-mozilla-tests to WebKitTools/Scripts/run-javascriptcore-tests.
@@ -18,32 +36,22 @@
 
 2005-07-21  Geoffrey Garen  <ggaren@apple.com>
 
-        Reviewed by NOBODY (OOPS!).
-
         * DumpRenderTree/DumpRenderTree.xcode/.cvsignore: Removed.
 
 2005-07-21  Geoffrey Garen  <ggaren@apple.com>
 
-        Reviewed by NOBODY (OOPS!).
-
         * DumpRenderTree/DumpRenderTree.xcode/project.pbxproj: Removed.
 
 2005-07-21  Geoffrey Garen  <ggaren@apple.com>
 
-        Reviewed by NOBODY (OOPS!).
-
         * DumpRenderTree/DumpRenderTree.xcodeproj/.cvsignore: Added.
 
 2005-07-21  Geoffrey Garen  <ggaren@apple.com>
 
-        Reviewed by NOBODY (OOPS!).
-
         * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Added.
 
 2005-07-21  Geoffrey Garen  <ggaren@apple.com>
 
-        Reviewed by NOBODY (OOPS!).
-
         * Scripts/build-webkit:
 
 2005-07-12  Eric Seidel  <eseidel@apple.com>

diff --git a/WebKitTools/Scripts/gdb-safari b/WebKitTools/Scripts/gdb-safari
index ecfec1d89b7312def2677d1aced2de1ddc5006b2..be5f5a0af89b689b665c0bcab8e8eb69380a2c65 100755 (executable)
--- a/WebKitTools/Scripts/gdb-safari
+++ b/WebKitTools/Scripts/gdb-safari
@@ -36,11 +36,7 @@ use webkitdirs;
 
 setConfiguration();
 my $productDir = productDir();
-
-# Check to see that Safari is in the specified place.
-my $safariBundle = $ENV{WEBKIT_SAFARI} || "/Applications/Safari.app";
-my $safariPath = "$safariBundle/Contents/MacOS/Safari";
-die "Can't find executable at $safariPath.\n" unless -x $safariPath;
+my $safariPath = safariPath();
 
 # Check to see that gdb is in the usual place.
 my $gdbPath = "/usr/bin/gdb";

diff --git a/WebKitTools/Scripts/run-safari b/WebKitTools/Scripts/run-safari
index ad758671cc5f73fa1db1788b70f0c596c5371508..a1c6ee5c8e3a4bfad68e77cd3cb293d12b35f8bd 100755 (executable)
--- a/WebKitTools/Scripts/run-safari
+++ b/WebKitTools/Scripts/run-safari
@@ -35,11 +35,7 @@ use webkitdirs;
 
 setConfiguration();
 my $productDir = productDir();
-
-# Check to see that Safari is in the specified place.
-my $safariBundle = $ENV{WEBKIT_SAFARI} || "/Applications/Safari.app";
-my $safariPath = "$safariBundle/Contents/MacOS/Safari";
-die "Can't find executable at $safariPath.\n" unless -x $safariPath;
+my $safariPath = safariPath();
 
 # Check to see that all the frameworks are built.
 checkFrameworks();

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index f8f99aa68b2d7dfda5a162a39ba83881737a0015..37506497691ee00a44b795223d833a82184e1fb9 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -35,7 +35,7 @@ BEGIN {
    our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
    $VERSION     = 1.00;
    @ISA         = qw(Exporter);
-   @EXPORT      = qw(&chdirWebKit &baseProductDir &productDir &XcodeOptions &passedConfiguration &setConfiguration &checkFrameworks);
+   @EXPORT      = qw(&chdirWebKit &baseProductDir &productDir &XcodeOptions &passedConfiguration &setConfiguration &safariPath &checkFrameworks);
    %EXPORT_TAGS = ( );
    @EXPORT_OK   = ();
 }
@@ -46,7 +46,6 @@ my $baseProductDir;
 my @baseProductDirOption;
 my $configuration;
 my $configurationProductDir;
-my $XcodeVersion;
 my $sourceDir;
 
 sub determineSourceDir
@@ -58,16 +57,6 @@ sub determineSourceDir
     }
 }
 
-sub determineXcodeVersion
-{
-    return if defined $XcodeVersion;
-    # Could use "xcodebuild -version" instead.
-    open VERSION, "defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString 2> /dev/null |" or die;
-    $XcodeVersion = <VERSION>;
-    close VERSION;
-    chomp $XcodeVersion;
-}
-
 sub determineBaseProductDir
 {
     return if defined $baseProductDir;
@@ -104,22 +93,11 @@ sub determineConfiguration
     }
 }
 
-sub oldXcode
-{
-    determineXcodeVersion();
-    return $XcodeVersion =~ /^1\./ || $XcodeVersion eq "2.0";
-}
-
 sub determineConfigurationProductDir
 {
     determineBaseProductDir();
     determineConfiguration();
-    determineXcodeVersion();
-    if (oldXcode()) {
-        $configurationProductDir = $baseProductDir;
-    } else {
-        $configurationProductDir = "$baseProductDir/$configuration";
-    }
+    $configurationProductDir = "$baseProductDir/$configuration";
 }
 
 sub chdirWebKit
@@ -144,8 +122,6 @@ sub XcodeOptions
 {
     determineBaseProductDir();
     determineConfiguration();
-    determineXcodeVersion();
-    return (@baseProductDirOption, "-buildstyle", $configuration) if oldXcode();
     return (@baseProductDirOption, "-configuration", $configuration);
 }
 
@@ -164,6 +140,26 @@ sub setConfiguration
     $configuration = $passed if $passed;
 }
 
+# Locate Safari.
+sub safariPath
+{
+    # Use WEBKIT_SAFARI environment variable if present.
+    my $safariBundle = $ENV{WEBKIT_SAFARI};
+    if (!$safariBundle) {
+        determineConfigurationProductDir();
+        # Use Safari.app in product directory if present (good for Safari development team).
+        if (-d "$configurationProductDir/Safari.app") {
+            $safariBundle = "$configurationProductDir/Safari.app";
+        } else {
+            # Otherwise use Safari.app in Applications directory.
+            $safariBundle = "/Applications/Safari.app";
+        }
+    }
+    my $safariPath = "$safariBundle/Contents/MacOS/Safari";
+    die "Can't find executable at $safariPath.\n" unless -x $safariPath;
+    return $safariPath;
+}
+
 # Check to see that all the frameworks are built.
 sub checkFrameworks
 {