Changeset 95733 in webkit

Timestamp:

Sep 22, 2011 10:47:40 AM (13 years ago)

Author:

Adam Roben

Message:

Remove all uses of FindSafari

It isn't really needed anymore.

Fixes <​http://webkit.org/b/68626>.

Reviewed by Darin Adler.

• Scripts/old-run-webkit-tests: Moved read/writeRegistryString from here to webkitdirs.pm.

• Scripts/run-webkit-nightly.cmd: Removed. This used to be used to launch nightly builds of

WebKit, but now we use WebKit.exe for that.

• Scripts/webkitdirs.pm:

(installedSafariPath): Changed to use readRegistryString instead of invoking FindSafari to
do the same thing.

(readRegistryString):
(writeRegistryString):
Moved here from old-run-webkit-tests.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/old-run-webkit-tests (modified) (1 diff)
• Scripts/run-webkit-nightly.cmd (deleted)
• Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-22  Adam Roben  <aroben@apple.com>
+
+        Remove all uses of FindSafari
+
+        It isn't really needed anymore.
+
+        Fixes <http://webkit.org/b/68626>.
+
+        Reviewed by Darin Adler.
+
+        * Scripts/old-run-webkit-tests: Moved read/writeRegistryString from here to webkitdirs.pm.
+
+        * Scripts/run-webkit-nightly.cmd: Removed. This used to be used to launch nightly builds of
+        WebKit, but now we use WebKit.exe for that.
+
+        * Scripts/webkitdirs.pm:
+        (installedSafariPath): Changed to use readRegistryString instead of invoking FindSafari to
+        do the same thing.
+
+        (readRegistryString):
+        (writeRegistryString):
+        Moved here from old-run-webkit-tests.
+
 2011-09-22  Adam Roben  <aroben@apple.com>
 

trunk/Tools/Scripts/old-run-webkit-tests

@@ -2713 +2713 @@
 }
 
-sub readRegistryString($)
-{
-    my ($valueName) = @_;
-    chomp(my $string = `regtool --wow32 get "$valueName"`);
-    return $string;
-}
-
-sub writeRegistryString($$)
-{
-    my ($valueName, $string) = @_;
-
-    my $error = system "regtool", "--wow32", "set", "-s", $valueName, $string;
-
-    # On Windows Vista/7 with UAC enabled, regtool will fail to modify the registry, but will still
-    # return a successful exit code. So we double-check here that the value we tried to write to the
-    # registry was really written.
-    return !$error && readRegistryString($valueName) eq $string;
-}
-
 sub setUpWindowsCrashLogSaving()
 {

trunk/Tools/Scripts/webkitdirs.pm

@@ -566 +566 @@
         $safariBundle = "/Applications/Safari.app";
     } elsif (isAppleWinWebKit()) {
-        $safariBundle = `"$configurationProductDir/FindSafari.exe"`;
+        $safariBundle = readRegistryString("/HKLM/SOFTWARE/Apple Computer, Inc./Safari/InstallDir");
         $safariBundle =~ s/[\r\n]+$//;
         $safariBundle = `cygpath -u '$safariBundle'` if isCygwin();
@@ -2142 +2142 @@
 }
 
+sub readRegistryString
+{
+    my ($valueName) = @_;
+    chomp(my $string = `regtool --wow32 get "$valueName"`);
+    return $string;
+}
+
+sub writeRegistryString
+{
+    my ($valueName, $string) = @_;
+
+    my $error = system "regtool", "--wow32", "set", "-s", $valueName, $string;
+
+    # On Windows Vista/7 with UAC enabled, regtool will fail to modify the registry, but will still
+    # return a successful exit code. So we double-check here that the value we tried to write to the
+    # registry was really written.
+    return !$error && readRegistryString($valueName) eq $string;
+}
+
 1;