Changeset 86007 in webkit
- Timestamp:
- May 7, 2011 12:56:39 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r85988 r86007 1 2011-05-07 Pratik Solanki <psolanki@apple.com> 2 3 Reviewed by Darin Adler. 4 5 Remove references to Tiger in scripts 6 https://bugs.webkit.org/show_bug.cgi?id=60438 7 8 Remove isTiger() and all of the code that depends on it. 9 10 * Scripts/build-webkit: 11 * Scripts/ensure-valid-python: 12 * Scripts/gdb-safari: 13 * Scripts/webkitdirs.pm: 14 1 15 2011-05-06 David Grogan <dgrogan@chromium.org> 2 16 -
trunk/Tools/Scripts/build-webkit
r85861 r86007 129 129 my @features = ( 130 130 { option => "3d-canvas", desc => "Toggle 3D canvas (WebGL) support", 131 define => "ENABLE_WEBGL", default => (isAppleMacWebKit() && !is Tiger() && !isLeopard()), value => \$threeDCanvasSupport },131 define => "ENABLE_WEBGL", default => (isAppleMacWebKit() && !isLeopard()), value => \$threeDCanvasSupport }, 132 132 133 133 { option => "3d-rendering", desc => "Toggle 3D rendering support", 134 define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit() && !isTiger()), value => \$threeDRenderingSupport },134 define => "ENABLE_3D_RENDERING", default => isAppleMacWebKit(), value => \$threeDRenderingSupport }, 135 135 136 136 { option => "accelerated-2d-canvas", desc => "Toggle accelerated 2D canvas support", -
trunk/Tools/Scripts/ensure-valid-python
r62526 r86007 28 28 use strict; 29 29 30 use File::Basename;31 use File::Spec;32 use File::Temp qw(tempdir);33 30 use FindBin; 34 31 use Getopt::Long; … … 38 35 use VCSUtils; 39 36 40 my $macPythonURL = "http://www.python.org/ftp/python/2.6.5/python-2.6.5-macosx10.3-2010-03-24.dmg";41 my $macPythonMD5 = "84489bba813fdbb6041b69d4310a86da";42 my $macPythonInstallerName = "Python.mpkg";43 44 # We could use a consistent download location, like the source or build directory.45 my $tempDirectory = File::Temp::tempdir("WebKitPythonXXXX", TMPDIR => 1, CLEANUP => 1);46 my $downloadDirectory = $tempDirectory;47 my $mountPoint = File::Spec->join($tempDirectory, "mount");48 49 37 sub checkPythonVersion() 50 38 { … … 52 40 `python -c "import sys;sys.exit(sys.version_info[:2] < (2,5))"`; 53 41 return exitStatus($?) == 0; 54 }55 56 sub downloadFileToPath($$)57 {58 my ($remoteURL, $localPath) = @_;59 print "Downloading $remoteURL to $localPath\n";60 my $exitCode = system("curl", "-o", $localPath, $remoteURL);61 return exitStatus($exitCode) == 0;62 }63 64 sub checkMD5($$)65 {66 my ($path, $expectedMD5) = @_;67 my $md5Output = `md5 -q "$path"`;68 chomp($md5Output);69 my $isValid = $md5Output eq $expectedMD5;70 print "'$md5Output' does not match expected: '$expectedMD5'\n" unless $isValid;71 return $isValid;72 }73 74 sub mountDMG($$)75 {76 my ($dmgPath, $mountPoint) = @_;77 print "Mounting $dmgPath at $mountPoint\n";78 return system("hdiutil", "attach", "-mountpoint", $mountPoint, "-nobrowse", $dmgPath) == 0;79 }80 81 sub unmountDMG($)82 {83 my ($mountPoint) = @_;84 print "Unmounting disk image from $mountPoint\n";85 my $exitCode = system("hdiutil", "detach", $mountPoint);86 return exitStatus($exitCode) == 0;87 }88 89 sub runInstaller($)90 {91 my ($installerPackage) = @_;92 print "sudo will now ask for your password to run the Python installer.\n";93 print "The installer will install Python in /Library/Frameworks/Python.framework\n";94 print "and add symlinks from /usr/local/bin.\n";95 return system("sudo", "installer", "-verbose", "-pkg", $installerPackage, "-target", "/") == 0;96 }97 98 sub downloadAndMountMacPythonDMG($$)99 {100 my ($pythonURL, $pythonMD5) = @_;101 my $localFilename = basename($pythonURL);102 my $localPath = File::Spec->join($downloadDirectory, $localFilename);103 104 downloadFileToPath($pythonURL, $localPath) or die "Failed to download $pythonURL";105 checkMD5($localPath, $pythonMD5) or die "MD5 check failed on $localPath";106 return mountDMG($localPath, $mountPoint);107 }108 109 sub installMacPython()110 {111 downloadAndMountMacPythonDMG($macPythonURL, $macPythonMD5) or die "Failed to download and mount disk image.";112 print "Mounted python install image at: $mountPoint\n";113 my $installerPackage = File::Spec->join($mountPoint, $macPythonInstallerName);114 my $installSuccess = runInstaller($installerPackage);115 unmountDMG($mountPoint) or die "Failed to unmount disk image from $mountPoint";116 return $installSuccess;117 42 } 118 43 … … 138 63 return 1 if $checkOnly; 139 64 140 if (!isTiger()) { 141 print "Your Python version is insufficient to run WebKit's Python code. Please update.\n"; 142 print "See http://trac.webkit.org/wiki/PythonGuidelines for more info.\n"; 143 return 1; 144 } 145 146 installMacPython() or die "Failed to install Python."; 147 148 checkPythonVersion() or die "Final version check failed, must have failed to update Python"; 149 print "Successfully updated python.\n"; 65 print "Your Python version is insufficient to run WebKit's Python code. Please update.\n"; 66 print "See http://trac.webkit.org/wiki/PythonGuidelines for more info.\n"; 67 return 1; 150 68 } 151 69 -
trunk/Tools/Scripts/gdb-safari
r83807 r86007 50 50 51 51 print "Starting Safari under gdb with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n"; 52 my @architectureFlags = ("-arch", architecture()) if !isTiger();52 my @architectureFlags = ("-arch", architecture()); 53 53 exec $gdbPath, @architectureFlags, "--arg", $safariPath, @ARGV or die; -
trunk/Tools/Scripts/webkitdirs.pm
r85177 r86007 227 227 chomp $architecture; 228 228 } else { 229 if (is Tiger() or isLeopard()) {229 if (isLeopard()) { 230 230 $architecture = `arch`; 231 231 } else { … … 1013 1013 determineOSXVersion(); 1014 1014 return $osXVersion; 1015 }1016 1017 sub isTiger()1018 {1019 return isDarwin() && osXVersion()->{"minor"} == 4;1020 1015 } 1021 1016 … … 1911 1906 $ENV{DYLD_FRAMEWORK_PATH} = $productDir; 1912 1907 $ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES"; 1913 if ( !isTiger() &&architecture()) {1908 if (architecture()) { 1914 1909 return system "arch", "-" . architecture(), safariPath(), @ARGV; 1915 1910 } else { … … 1944 1939 $ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES"; 1945 1940 my $miniBrowserPath = "$productDir/MiniBrowser.app/Contents/MacOS/MiniBrowser"; 1946 if ( !isTiger() &&architecture()) {1941 if (architecture()) { 1947 1942 return system "arch", "-" . architecture(), $miniBrowserPath, @ARGV; 1948 1943 } else { … … 1968 1963 1969 1964 print "Starting MiniBrowser under gdb with DYLD_FRAMEWORK_PATH set to point to built WebKit2 in $productDir.\n"; 1970 my @architectureFlags = ("-arch", architecture()) if !isTiger();1965 my @architectureFlags = ("-arch", architecture()); 1971 1966 exec $gdbPath, @architectureFlags, $miniBrowserPath or die; 1972 1967 return; … … 1984 1979 $ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES"; 1985 1980 my $webKitTestRunnerPath = "$productDir/WebKitTestRunner"; 1986 if ( !isTiger() &&architecture()) {1981 if (architecture()) { 1987 1982 return system "arch", "-" . architecture(), $webKitTestRunnerPath, @ARGV; 1988 1983 } else { … … 2007 2002 2008 2003 print "Starting WebKitTestRunner under gdb with DYLD_FRAMEWORK_PATH set to point to $productDir.\n"; 2009 my @architectureFlags = ("-arch", architecture()) if !isTiger();2004 my @architectureFlags = ("-arch", architecture()); 2010 2005 exec $gdbPath, @architectureFlags, $webKitTestRunnerPath or die; 2011 2006 return; … … 2023 2018 $ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES"; 2024 2019 my $testWebKitAPIPath = "$productDir/TestWebKitAPI"; 2025 if ( !isTiger() &&architecture()) {2020 if (architecture()) { 2026 2021 return system "arch", "-" . architecture(), $testWebKitAPIPath, @ARGV; 2027 2022 } else {
Note: See TracChangeset
for help on using the changeset viewer.