Changeset 86007 in webkit

Timestamp:

May 7, 2011 12:56:39 PM (13 years ago)

Author:

psolanki@apple.com

Message:

Remove references to Tiger in scripts
​https://bugs.webkit.org/show_bug.cgi?id=60438

Reviewed by Darin Adler.

Remove isTiger() and all of the code that depends on it.

• Scripts/build-webkit:
• Scripts/ensure-valid-python:
• Scripts/gdb-safari:
• Scripts/webkitdirs.pm:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-webkit (modified) (1 diff)
• Scripts/ensure-valid-python (modified) (4 diffs)
• Scripts/gdb-safari (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (8 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-07  Pratik Solanki  <psolanki@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Remove references to Tiger in scripts
+        https://bugs.webkit.org/show_bug.cgi?id=60438
+
+        Remove isTiger() and all of the code that depends on it.
+
+        * Scripts/build-webkit:
+        * Scripts/ensure-valid-python:
+        * Scripts/gdb-safari:
+        * Scripts/webkitdirs.pm:
+
 2011-05-06  David Grogan  <dgrogan@chromium.org>
 

trunk/Tools/Scripts/build-webkit

@@ -129 +129 @@
 my @features = (
     { option => "3d-canvas", desc => "Toggle 3D canvas (WebGL) support",
-      define => "ENABLE_WEBGL", default => (isAppleMacWebKit() && !isTiger() && !isLeopard()), value => \$threeDCanvasSupport },
+      define => "ENABLE_WEBGL", default => (isAppleMacWebKit() && !isLeopard()), value => \$threeDCanvasSupport },
 
     { option => "3d-rendering", desc => "Toggle 3D rendering support",
-      define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit() && !isTiger()), value => \$threeDRenderingSupport },
+      define => "ENABLE_3D_RENDERING", default => isAppleMacWebKit(), value => \$threeDRenderingSupport },
 
     { option => "accelerated-2d-canvas", desc => "Toggle accelerated 2D canvas support",

trunk/Tools/Scripts/ensure-valid-python

@@ -28 +28 @@
 use strict;
 
-use File::Basename;
-use File::Spec;
-use File::Temp qw(tempdir);
 use FindBin;
 use Getopt::Long;
@@ -38 +35 @@
 use VCSUtils;
 
-my $macPythonURL = "http://www.python.org/ftp/python/2.6.5/python-2.6.5-macosx10.3-2010-03-24.dmg";
-my $macPythonMD5 = "84489bba813fdbb6041b69d4310a86da";
-my $macPythonInstallerName = "Python.mpkg";
-
-# We could use a consistent download location, like the source or build directory.
-my $tempDirectory = File::Temp::tempdir("WebKitPythonXXXX", TMPDIR => 1, CLEANUP => 1);
-my $downloadDirectory = $tempDirectory;
-my $mountPoint = File::Spec->join($tempDirectory, "mount");
-
 sub checkPythonVersion()
 {
@@ -52 +40 @@
     `python -c "import sys;sys.exit(sys.version_info[:2] < (2,5))"`;
     return exitStatus($?) == 0;
-}
-
-sub downloadFileToPath($$)
-{
-    my ($remoteURL, $localPath) = @_;
-    print "Downloading $remoteURL to $localPath\n";
-    my $exitCode = system("curl", "-o", $localPath, $remoteURL);
-    return exitStatus($exitCode) == 0;
-}
-
-sub checkMD5($$)
-{
-    my ($path, $expectedMD5) = @_;
-    my $md5Output = `md5 -q "$path"`;
-    chomp($md5Output);
-    my $isValid = $md5Output eq $expectedMD5;
-    print "'$md5Output' does not match expected: '$expectedMD5'\n" unless $isValid;
-    return $isValid;
-}
-
-sub mountDMG($$)
-{
-    my ($dmgPath, $mountPoint) = @_;
-    print "Mounting $dmgPath at $mountPoint\n";
-    return system("hdiutil", "attach", "-mountpoint", $mountPoint, "-nobrowse", $dmgPath) == 0;
-}
-
-sub unmountDMG($)
-{
-    my ($mountPoint) = @_;
-    print "Unmounting disk image from $mountPoint\n";
-    my $exitCode = system("hdiutil", "detach", $mountPoint);
-    return exitStatus($exitCode) == 0;
-}
-
-sub runInstaller($)
-{
-    my ($installerPackage) = @_;
-    print "sudo will now ask for your password to run the Python installer.\n";
-    print "The installer will install Python in /Library/Frameworks/Python.framework\n";
-    print "and add symlinks from /usr/local/bin.\n";
-    return system("sudo", "installer", "-verbose", "-pkg", $installerPackage, "-target", "/") == 0;
-}
-
-sub downloadAndMountMacPythonDMG($$)
-{
-    my ($pythonURL, $pythonMD5) = @_;
-    my $localFilename = basename($pythonURL);
-    my $localPath = File::Spec->join($downloadDirectory, $localFilename);
-    
-    downloadFileToPath($pythonURL, $localPath) or die "Failed to download $pythonURL";
-    checkMD5($localPath, $pythonMD5) or die "MD5 check failed on $localPath";
-    return mountDMG($localPath, $mountPoint);
-}
-
-sub installMacPython()
-{
-    downloadAndMountMacPythonDMG($macPythonURL, $macPythonMD5) or die "Failed to download and mount disk image.";
-    print "Mounted python install image at: $mountPoint\n";
-    my $installerPackage = File::Spec->join($mountPoint, $macPythonInstallerName);
-    my $installSuccess = runInstaller($installerPackage);
-    unmountDMG($mountPoint) or die "Failed to unmount disk image from $mountPoint";
-    return $installSuccess;
 }
 
@@ -138 +63 @@
     return 1 if $checkOnly;
 
-    if (!isTiger()) {
-        print "Your Python version is insufficient to run WebKit's Python code.  Please update.\n";
-        print "See http://trac.webkit.org/wiki/PythonGuidelines for more info.\n";
-        return 1;
-    }
-
-    installMacPython() or die "Failed to install Python.";
-
-    checkPythonVersion() or die "Final version check failed, must have failed to update Python";
-    print "Successfully updated python.\n";
+    print "Your Python version is insufficient to run WebKit's Python code.  Please update.\n";
+    print "See http://trac.webkit.org/wiki/PythonGuidelines for more info.\n";
+    return 1;
 }
 

trunk/Tools/Scripts/gdb-safari

@@ -50 +50 @@
 
 print "Starting Safari under gdb with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
-my @architectureFlags = ("-arch", architecture()) if !isTiger();
+my @architectureFlags = ("-arch", architecture());
 exec $gdbPath, @architectureFlags, "--arg", $safariPath, @ARGV or die;

trunk/Tools/Scripts/webkitdirs.pm

@@ -227 +227 @@
         chomp $architecture;
     } else {
-        if (isTiger() or isLeopard()) {
+        if (isLeopard()) {
             $architecture = `arch`;
         } else {
@@ -1013 +1013 @@
     determineOSXVersion();
     return $osXVersion;
-}
-
-sub isTiger()
-{
-    return isDarwin() && osXVersion()->{"minor"} == 4;
 }
 
@@ -1911 +1906 @@
         $ENV{DYLD_FRAMEWORK_PATH} = $productDir;
         $ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES";
-        if (!isTiger() && architecture()) {
+        if (architecture()) {
             return system "arch", "-" . architecture(), safariPath(), @ARGV;
         } else {
@@ -1944 +1939 @@
         $ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES";
         my $miniBrowserPath = "$productDir/MiniBrowser.app/Contents/MacOS/MiniBrowser";
-        if (!isTiger() && architecture()) {
+        if (architecture()) {
             return system "arch", "-" . architecture(), $miniBrowserPath, @ARGV;
         } else {
@@ -1968 +1963 @@
 
         print "Starting MiniBrowser under gdb with DYLD_FRAMEWORK_PATH set to point to built WebKit2 in $productDir.\n";
-        my @architectureFlags = ("-arch", architecture()) if !isTiger();
+        my @architectureFlags = ("-arch", architecture());
         exec $gdbPath, @architectureFlags, $miniBrowserPath or die;
         return;
@@ -1984 +1979 @@
         $ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES";
         my $webKitTestRunnerPath = "$productDir/WebKitTestRunner";
-        if (!isTiger() && architecture()) {
+        if (architecture()) {
             return system "arch", "-" . architecture(), $webKitTestRunnerPath, @ARGV;
         } else {
@@ -2007 +2002 @@
 
         print "Starting WebKitTestRunner under gdb with DYLD_FRAMEWORK_PATH set to point to $productDir.\n";
-        my @architectureFlags = ("-arch", architecture()) if !isTiger();
+        my @architectureFlags = ("-arch", architecture());
         exec $gdbPath, @architectureFlags, $webKitTestRunnerPath or die;
         return;
@@ -2023 +2018 @@
         $ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES";
         my $testWebKitAPIPath = "$productDir/TestWebKitAPI";
-        if (!isTiger() && architecture()) {
+        if (architecture()) {
             return system "arch", "-" . architecture(), $testWebKitAPIPath, @ARGV;
         } else {