Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: Tools/Scripts/webkitdirs.pm

Issue 20652002: Fix trailing whitespace in scripts and misc. files (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Don't change literal diff. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (C) 2005, 2006, 2007, 2010, 2011, 2012 Apple Inc. All rights reserve d. 1 # Copyright (C) 2005, 2006, 2007, 2010, 2011, 2012 Apple Inc. All rights reserve d.
2 # Copyright (C) 2009 Google Inc. All rights reserved. 2 # Copyright (C) 2009 Google Inc. All rights reserved.
3 # Copyright (C) 2011 Research In Motion Limited. All rights reserved. 3 # Copyright (C) 2011 Research In Motion Limited. All rights reserved.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions 6 # modification, are permitted provided that the following conditions
7 # are met: 7 # are met:
8 # 8 #
9 # 1. Redistributions of source code must retain the above copyright 9 # 1. Redistributions of source code must retain the above copyright
10 # notice, this list of conditions and the following disclaimer. 10 # notice, this list of conditions and the following disclaimer.
11 # 2. Redistributions in binary form must reproduce the above copyright 11 # 2. Redistributions in binary form must reproduce the above copyright
12 # notice, this list of conditions and the following disclaimer in the 12 # notice, this list of conditions and the following disclaimer in the
13 # documentation and/or other materials provided with the distribution. 13 # documentation and/or other materials provided with the distribution.
14 # 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of 14 # 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
15 # its contributors may be used to endorse or promote products derived 15 # its contributors may be used to endorse or promote products derived
16 # from this software without specific prior written permission. 16 # from this software without specific prior written permission.
17 # 17 #
18 # THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 18 # THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
19 # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 19 # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 20 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21 # DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 21 # DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
22 # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 22 # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 23 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 24 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
25 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 # Defined in VCSUtils. 119 # Defined in VCSUtils.
120 sub exitStatus($); 120 sub exitStatus($);
121 121
122 sub determineSourceDir 122 sub determineSourceDir
123 { 123 {
124 return if $sourceDir; 124 return if $sourceDir;
125 $sourceDir = $FindBin::Bin; 125 $sourceDir = $FindBin::Bin;
126 $sourceDir =~ s|/+$||; # Remove trailing '/' as we would die later 126 $sourceDir =~ s|/+$||; # Remove trailing '/' as we would die later
127 127
128 # walks up path checking each directory to see if it is the main WebKit proj ect dir, 128 # walks up path checking each directory to see if it is the main WebKit proj ect dir,
129 # defined by containing Sources, core, and WebKit 129 # defined by containing Sources, core, and WebKit
130 until ((-d "$sourceDir/Source" && -d "$sourceDir/Source/core" && -d "$source Dir/Source/WebKit") || (-d "$sourceDir/Internal" && -d "$sourceDir/OpenSource")) 130 until ((-d "$sourceDir/Source" && -d "$sourceDir/Source/core" && -d "$source Dir/Source/WebKit") || (-d "$sourceDir/Internal" && -d "$sourceDir/OpenSource"))
131 { 131 {
132 if ($sourceDir !~ s|/[^/]+$||) { 132 if ($sourceDir !~ s|/[^/]+$||) {
133 die "Could not find top level webkit directory above source director y using FindBin.\n"; 133 die "Could not find top level webkit directory above source director y using FindBin.\n";
134 } 134 }
135 } 135 }
136 136
137 $sourceDir = "$sourceDir/OpenSource" if -d "$sourceDir/OpenSource"; 137 $sourceDir = "$sourceDir/OpenSource" if -d "$sourceDir/OpenSource";
138 } 138 }
(...skipping 1521 matching lines...) Expand 10 before | Expand all | Expand 10 after
1660 } 1660 }
1661 1661
1662 sub setupAppleWinEnv() 1662 sub setupAppleWinEnv()
1663 { 1663 {
1664 return unless isAppleWinWebKit(); 1664 return unless isAppleWinWebKit();
1665 1665
1666 if (isWindowsNT()) { 1666 if (isWindowsNT()) {
1667 my $restartNeeded = 0; 1667 my $restartNeeded = 0;
1668 my %variablesToSet = (); 1668 my %variablesToSet = ();
1669 1669
1670 # FIXME: We should remove this explicit version check for cygwin once we stop supporting Cygwin 1.7.9 or older versions. 1670 # FIXME: We should remove this explicit version check for cygwin once we stop supporting Cygwin 1.7.9 or older versions.
1671 # https://bugs.webkit.org/show_bug.cgi?id=85791 1671 # https://bugs.webkit.org/show_bug.cgi?id=85791
1672 my $uname_version = (POSIX::uname())[2]; 1672 my $uname_version = (POSIX::uname())[2];
1673 $uname_version =~ s/\(.*\)//; # Remove the trailing cygwin version, if any. 1673 $uname_version =~ s/\(.*\)//; # Remove the trailing cygwin version, if any.
1674 if (version->parse($uname_version) < version->parse("1.7.10")) { 1674 if (version->parse($uname_version) < version->parse("1.7.10")) {
1675 # Setting the environment variable 'CYGWIN' to 'tty' makes cygwin en able extra support (i.e., termios) 1675 # Setting the environment variable 'CYGWIN' to 'tty' makes cygwin en able extra support (i.e., termios)
1676 # for UNIX-like ttys in the Windows console 1676 # for UNIX-like ttys in the Windows console
1677 $variablesToSet{CYGWIN} = "tty" unless $ENV{CYGWIN}; 1677 $variablesToSet{CYGWIN} = "tty" unless $ENV{CYGWIN};
1678 } 1678 }
1679 1679
1680 # Those environment variables must be set to be able to build inside Vis ual Studio. 1680 # Those environment variables must be set to be able to build inside Vis ual Studio.
1681 $variablesToSet{WEBKITLIBRARIESDIR} = windowsLibrariesDir() unless $ENV{ WEBKITLIBRARIESDIR}; 1681 $variablesToSet{WEBKITLIBRARIESDIR} = windowsLibrariesDir() unless $ENV{ WEBKITLIBRARIESDIR};
1682 $variablesToSet{WEBKIT_LIBRARIES} = windowsLibrariesDir() unless $ENV{WE BKIT_LIBRARIES}; 1682 $variablesToSet{WEBKIT_LIBRARIES} = windowsLibrariesDir() unless $ENV{WE BKIT_LIBRARIES};
1683 $variablesToSet{WEBKITOUTPUTDIR} = windowsOutputDir() unless $ENV{WEBKIT OUTPUTDIR}; 1683 $variablesToSet{WEBKITOUTPUTDIR} = windowsOutputDir() unless $ENV{WEBKIT OUTPUTDIR};
1684 $variablesToSet{WEBKIT_OUTPUTDIR} = windowsOutputDir() unless $ENV{WEBKI T_OUTPUTDIR}; 1684 $variablesToSet{WEBKIT_OUTPUTDIR} = windowsOutputDir() unless $ENV{WEBKI T_OUTPUTDIR};
1685 $variablesToSet{WEBKIT_SOURCE} = windowsSourceSourceDir() unless $ENV{WE BKIT_SOURCE}; 1685 $variablesToSet{WEBKIT_SOURCE} = windowsSourceSourceDir() unless $ENV{WE BKIT_SOURCE};
1686 1686
1687 foreach my $variable (keys %variablesToSet) { 1687 foreach my $variable (keys %variablesToSet) {
1688 print "Setting the Environment Variable '" . $variable . "' to '" . $variablesToSet{$variable} . "'\n\n"; 1688 print "Setting the Environment Variable '" . $variable . "' to '" . $variablesToSet{$variable} . "'\n\n";
1689 system qw(regtool -s set), '\\HKEY_CURRENT_USER\\Environment\\' . $v ariable, $variablesToSet{$variable}; 1689 system qw(regtool -s set), '\\HKEY_CURRENT_USER\\Environment\\' . $v ariable, $variablesToSet{$variable};
1690 $restartNeeded ||= $variable eq "WEBKITLIBRARIESDIR" || $variable eq "WEBKITOUTPUTDIR" || $variable eq "WEBKIT_LIBRARIES" || $variable eq "WEBKIT_OU TPUTDIR" || $variable eq "WEBKIT_SOURCE"; 1690 $restartNeeded ||= $variable eq "WEBKITLIBRARIESDIR" || $variable eq "WEBKITOUTPUTDIR" || $variable eq "WEBKIT_LIBRARIES" || $variable eq "WEBKIT_OU TPUTDIR" || $variable eq "WEBKIT_SOURCE";
1691 } 1691 }
1692 1692
1693 if ($restartNeeded) { 1693 if ($restartNeeded) {
1694 print "Please restart your computer before attempting to build insid e Visual Studio.\n\n"; 1694 print "Please restart your computer before attempting to build insid e Visual Studio.\n\n";
1695 } 1695 }
1696 } else { 1696 } else {
1697 if (!$ENV{'WEBKITLIBRARIESDIR'}) { 1697 if (!$ENV{'WEBKITLIBRARIESDIR'}) {
1698 # VS2005 version. This will be removed as part of https://bugs.webk it.org/show_bug.cgi?id=109472. 1698 # VS2005 version. This will be removed as part of https://bugs.webk it.org/show_bug.cgi?id=109472.
1699 print "Warning: You must set the 'WebKitLibrariesDir' environment va riable\n"; 1699 print "Warning: You must set the 'WebKitLibrariesDir' environment va riable\n";
1700 print " to be able build WebKit from within Visual Studio 20 05.\n"; 1700 print " to be able build WebKit from within Visual Studio 20 05.\n";
1701 print " Make sure that 'WebKitLibrariesDir' points to the\n" ; 1701 print " Make sure that 'WebKitLibrariesDir' points to the\n" ;
1702 print " 'WebKitLibraries/win' directory, not the 'WebKitLibr aries/' directory.\n\n"; 1702 print " 'WebKitLibraries/win' directory, not the 'WebKitLibr aries/' directory.\n\n";
1703 } 1703 }
1704 if (!$ENV{'WEBKIT_LIBRARIES'}) { 1704 if (!$ENV{'WEBKIT_LIBRARIES'}) {
1705 # VS2010 (and newer) version. This will replace the VS2005 version a s part of 1705 # VS2010 (and newer) version. This will replace the VS2005 version a s part of
1706 # https://bugs.webkit.org/show_bug.cgi?id=109472. 1706 # https://bugs.webkit.org/show_bug.cgi?id=109472.
1707 print "Warning: You must set the 'WebKit_Libraries' environment vari able\n"; 1707 print "Warning: You must set the 'WebKit_Libraries' environment vari able\n";
1708 print " to be able build WebKit from within Visual Studio 20 10 and newer.\n"; 1708 print " to be able build WebKit from within Visual Studio 20 10 and newer.\n";
1709 print " Make sure that 'WebKit_Libraries' points to the\n"; 1709 print " Make sure that 'WebKit_Libraries' points to the\n";
1710 print " 'WebKitLibraries/win' directory, not the 'WebKitLibr aries/' directory.\n\n"; 1710 print " 'WebKitLibraries/win' directory, not the 'WebKitLibr aries/' directory.\n\n";
1711 } 1711 }
1712 if (!$ENV{'WEBKITOUTPUTDIR'}) { 1712 if (!$ENV{'WEBKITOUTPUTDIR'}) {
1713 # VS2005 version. This will be removed as part of https://bugs.webk it.org/show_bug.cgi?id=109472. 1713 # VS2005 version. This will be removed as part of https://bugs.webk it.org/show_bug.cgi?id=109472.
1714 print "Warning: You must set the 'WebKitOutputDir' environment varia ble\n"; 1714 print "Warning: You must set the 'WebKitOutputDir' environment varia ble\n";
1715 print " to be able build WebKit from within Visual Studio 20 05.\n\n"; 1715 print " to be able build WebKit from within Visual Studio 20 05.\n\n";
1716 } 1716 }
1717 if (!$ENV{'WEBKIT_OUTPUTDIR'}) { 1717 if (!$ENV{'WEBKIT_OUTPUTDIR'}) {
1718 # VS2010 (and newer) version. This will replace the VS2005 version a s part of 1718 # VS2010 (and newer) version. This will replace the VS2005 version a s part of
1719 # https://bugs.webkit.org/show_bug.cgi?id=109472. 1719 # https://bugs.webkit.org/show_bug.cgi?id=109472.
1720 print "Warning: You must set the 'WebKit_OutputDir' environment vari able\n"; 1720 print "Warning: You must set the 'WebKit_OutputDir' environment vari able\n";
1721 print " to be able build WebKit from within Visual Studio 20 10 and newer.\n\n"; 1721 print " to be able build WebKit from within Visual Studio 20 10 and newer.\n\n";
1722 } 1722 }
1723 if (!$ENV{'WEBKIT_SOURCE'}) { 1723 if (!$ENV{'WEBKIT_SOURCE'}) {
1724 print "Warning: You must set the 'WebKit_Source' environment variabl e\n"; 1724 print "Warning: You must set the 'WebKit_Source' environment variabl e\n";
1725 print " to be able build WebKit from within Visual Studio 20 10 and newer.\n\n"; 1725 print " to be able build WebKit from within Visual Studio 20 10 and newer.\n\n";
1726 } 1726 }
1727 } 1727 }
1728 } 1728 }
1729 1729
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
1762 1762
1763 my $qtSDKPath = File::Spec->catdir($programFilesPath, "QuickTime SDK"); 1763 my $qtSDKPath = File::Spec->catdir($programFilesPath, "QuickTime SDK");
1764 if (0 && ! -e $qtSDKPath) { 1764 if (0 && ! -e $qtSDKPath) {
1765 print "*************************************************************\n"; 1765 print "*************************************************************\n";
1766 print "Cannot find '$qtSDKPath'\n"; 1766 print "Cannot find '$qtSDKPath'\n";
1767 print "Please download the QuickTime SDK for Windows from\n"; 1767 print "Please download the QuickTime SDK for Windows from\n";
1768 print "http://developer.apple.com/quicktime/download/\n"; 1768 print "http://developer.apple.com/quicktime/download/\n";
1769 print "*************************************************************\n"; 1769 print "*************************************************************\n";
1770 die; 1770 die;
1771 } 1771 }
1772 1772
1773 unless ($ENV{WEBKITLIBRARIESDIR}) { 1773 unless ($ENV{WEBKITLIBRARIESDIR}) {
1774 $ENV{'WEBKITLIBRARIESDIR'} = File::Spec->catdir($sourceDir, "WebKitLibra ries", "win"); 1774 $ENV{'WEBKITLIBRARIESDIR'} = File::Spec->catdir($sourceDir, "WebKitLibra ries", "win");
1775 chomp($ENV{WEBKITLIBRARIESDIR} = `cygpath -wa '$ENV{WEBKITLIBRARIESDIR}' `) if isCygwin(); 1775 chomp($ENV{WEBKITLIBRARIESDIR} = `cygpath -wa '$ENV{WEBKITLIBRARIESDIR}' `) if isCygwin();
1776 } 1776 }
1777 unless ($ENV{WEBKIT_LIBRARIES}) { 1777 unless ($ENV{WEBKIT_LIBRARIES}) {
1778 $ENV{'WEBKIT_LIBRARIES'} = File::Spec->catdir($sourceDir, "WebKitLibrari es", "win"); 1778 $ENV{'WEBKIT_LIBRARIES'} = File::Spec->catdir($sourceDir, "WebKitLibrari es", "win");
1779 chomp($ENV{WEBKIT_LIBRARIES} = `cygpath -wa '$ENV{WEBKIT_LIBRARIES}'`) i f isCygwin(); 1779 chomp($ENV{WEBKIT_LIBRARIES} = `cygpath -wa '$ENV{WEBKIT_LIBRARIES}'`) i f isCygwin();
1780 } 1780 }
1781 1781
1782 print "Building results into: ", baseProductDir(), "\n"; 1782 print "Building results into: ", baseProductDir(), "\n";
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
1870 sub buildVisualStudioProject 1870 sub buildVisualStudioProject
1871 { 1871 {
1872 my ($project, $clean) = @_; 1872 my ($project, $clean) = @_;
1873 setupCygwinEnv(); 1873 setupCygwinEnv();
1874 1874
1875 my $config = configurationForVisualStudio(); 1875 my $config = configurationForVisualStudio();
1876 1876
1877 dieIfWindowsPlatformSDKNotInstalled() if $willUseVCExpressWhenBuilding; 1877 dieIfWindowsPlatformSDKNotInstalled() if $willUseVCExpressWhenBuilding;
1878 1878
1879 chomp($project = `cygpath -w "$project"`) if isCygwin(); 1879 chomp($project = `cygpath -w "$project"`) if isCygwin();
1880 1880
1881 my $action = "/build"; 1881 my $action = "/build";
1882 if ($clean) { 1882 if ($clean) {
1883 $action = "/clean"; 1883 $action = "/clean";
1884 } 1884 }
1885 1885
1886 my @command = ($vcBuildPath, $project, $action, $config); 1886 my @command = ($vcBuildPath, $project, $action, $config);
1887 1887
1888 print join(" ", @command), "\n"; 1888 print join(" ", @command), "\n";
1889 return system @command; 1889 return system @command;
1890 } 1890 }
1891 1891
1892 sub downloadWafIfNeeded 1892 sub downloadWafIfNeeded
1893 { 1893 {
1894 # get / update waf if needed 1894 # get / update waf if needed
1895 my $waf = "$sourceDir/Tools/waf/waf"; 1895 my $waf = "$sourceDir/Tools/waf/waf";
1896 my $wafURL = 'http://wxwebkit.kosoftworks.com/downloads/deps/waf'; 1896 my $wafURL = 'http://wxwebkit.kosoftworks.com/downloads/deps/waf';
1897 if (!-f $waf) { 1897 if (!-f $waf) {
1898 my $result = system "curl -o $waf $wafURL"; 1898 my $result = system "curl -o $waf $wafURL";
1899 chmod 0755, $waf; 1899 chmod 0755, $waf;
1900 } 1900 }
1901 } 1901 }
1902 1902
1903 sub buildWafProject 1903 sub buildWafProject
1904 { 1904 {
1905 my ($project, $shouldClean, @options) = @_; 1905 my ($project, $shouldClean, @options) = @_;
1906 1906
1907 # set the PYTHONPATH for waf 1907 # set the PYTHONPATH for waf
1908 my $pythonPath = $ENV{'PYTHONPATH'}; 1908 my $pythonPath = $ENV{'PYTHONPATH'};
1909 if (!defined($pythonPath)) { 1909 if (!defined($pythonPath)) {
1910 $pythonPath = ''; 1910 $pythonPath = '';
1911 } 1911 }
1912 my $sourceDir = sourceDir(); 1912 my $sourceDir = sourceDir();
1913 my $newPythonPath = "$sourceDir/Tools/waf/build:$pythonPath"; 1913 my $newPythonPath = "$sourceDir/Tools/waf/build:$pythonPath";
1914 if (isCygwin()) { 1914 if (isCygwin()) {
1915 $newPythonPath = `cygpath --mixed --path $newPythonPath`; 1915 $newPythonPath = `cygpath --mixed --path $newPythonPath`;
1916 } 1916 }
1917 $ENV{'PYTHONPATH'} = $newPythonPath; 1917 $ENV{'PYTHONPATH'} = $newPythonPath;
1918 1918
1919 print "Building $project\n"; 1919 print "Building $project\n";
1920 1920
1921 my $wafCommand = "$sourceDir/Tools/waf/waf"; 1921 my $wafCommand = "$sourceDir/Tools/waf/waf";
1922 if ($ENV{'WXWEBKIT_WAF'}) { 1922 if ($ENV{'WXWEBKIT_WAF'}) {
1923 $wafCommand = $ENV{'WXWEBKIT_WAF'}; 1923 $wafCommand = $ENV{'WXWEBKIT_WAF'};
1924 } 1924 }
1925 if (isCygwin()) { 1925 if (isCygwin()) {
1926 $wafCommand = `cygpath --windows "$wafCommand"`; 1926 $wafCommand = `cygpath --windows "$wafCommand"`;
1927 chomp($wafCommand); 1927 chomp($wafCommand);
1928 } 1928 }
1929 if ($shouldClean) { 1929 if ($shouldClean) {
1930 return system $wafCommand, "uninstall", "clean", "distclean"; 1930 return system $wafCommand, "uninstall", "clean", "distclean";
1931 } 1931 }
1932 1932
1933 return system $wafCommand, 'configure', 'build', 'install', @options; 1933 return system $wafCommand, 'configure', 'build', 'install', @options;
1934 } 1934 }
1935 1935
1936 sub retrieveQMakespecVar 1936 sub retrieveQMakespecVar
1937 { 1937 {
1938 my $mkspec = $_[0]; 1938 my $mkspec = $_[0];
1939 my $varname = $_[1]; 1939 my $varname = $_[1];
1940 1940
1941 my $varvalue = undef; 1941 my $varvalue = undef;
1942 #print "retrieveMakespecVar " . $mkspec . ", " . $varname . "\n"; 1942 #print "retrieveMakespecVar " . $mkspec . ", " . $varname . "\n";
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
2752 setUpGuardMallocIfNeeded(); 2752 setUpGuardMallocIfNeeded();
2753 2753
2754 my @architectureFlags = ($architectureSwitch, architecture()); 2754 my @architectureFlags = ($architectureSwitch, architecture());
2755 if (!shouldTargetWebProcess()) { 2755 if (!shouldTargetWebProcess()) {
2756 print "Starting @{[basename($appPath)]} under $debugger with DYLD_FRAMEW ORK_PATH set to point to built WebKit in $productDir.\n"; 2756 print "Starting @{[basename($appPath)]} under $debugger with DYLD_FRAMEW ORK_PATH set to point to built WebKit in $productDir.\n";
2757 exec { $debuggerPath } $debuggerPath, @architectureFlags, $argumentsSepa rator, $appPath, argumentsForRunAndDebugMacWebKitApp() or die; 2757 exec { $debuggerPath } $debuggerPath, @architectureFlags, $argumentsSepa rator, $appPath, argumentsForRunAndDebugMacWebKitApp() or die;
2758 } else { 2758 } else {
2759 if (shouldUseXPCServiceForWebProcess()) { 2759 if (shouldUseXPCServiceForWebProcess()) {
2760 die "Targetting the Web Process is not compatible with using an XPC Service for the Web Process at this time."; 2760 die "Targetting the Web Process is not compatible with using an XPC Service for the Web Process at this time.";
2761 } 2761 }
2762 2762
2763 my $webProcessShimPath = File::Spec->catfile($productDir, "SecItemShim.d ylib"); 2763 my $webProcessShimPath = File::Spec->catfile($productDir, "SecItemShim.d ylib");
2764 my $webProcessPath = File::Spec->catdir($productDir, "WebProcess.app"); 2764 my $webProcessPath = File::Spec->catdir($productDir, "WebProcess.app");
2765 my $webKit2ExecutablePath = File::Spec->catfile($productDir, "WebKit2.fr amework", "WebKit2"); 2765 my $webKit2ExecutablePath = File::Spec->catfile($productDir, "WebKit2.fr amework", "WebKit2");
2766 2766
2767 appendToEnvironmentVariableList("DYLD_INSERT_LIBRARIES", $webProcessShim Path); 2767 appendToEnvironmentVariableList("DYLD_INSERT_LIBRARIES", $webProcessShim Path);
2768 2768
2769 print "Starting WebProcess under $debugger with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n"; 2769 print "Starting WebProcess under $debugger with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
2770 exec { $debuggerPath } $debuggerPath, @architectureFlags, $argumentsSepa rator, $webProcessPath, $webKit2ExecutablePath, "-type", "webprocess", "-client- executable", $appPath or die; 2770 exec { $debuggerPath } $debuggerPath, @architectureFlags, $argumentsSepa rator, $webProcessPath, $webKit2ExecutablePath, "-type", "webprocess", "-client- executable", $appPath or die;
2771 } 2771 }
2772 } 2772 }
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
2814 } 2814 }
2815 2815
2816 return 1; 2816 return 1;
2817 } 2817 }
2818 2818
2819 sub debugMiniBrowser 2819 sub debugMiniBrowser
2820 { 2820 {
2821 if (isAppleMacWebKit()) { 2821 if (isAppleMacWebKit()) {
2822 execMacWebKitAppForDebugging(File::Spec->catfile(productDir(), "MiniBrow ser.app", "Contents", "MacOS", "MiniBrowser")); 2822 execMacWebKitAppForDebugging(File::Spec->catfile(productDir(), "MiniBrow ser.app", "Contents", "MacOS", "MiniBrowser"));
2823 } 2823 }
2824 2824
2825 return 1; 2825 return 1;
2826 } 2826 }
2827 2827
2828 sub runWebKitTestRunner 2828 sub runWebKitTestRunner
2829 { 2829 {
2830 if (isAppleMacWebKit()) { 2830 if (isAppleMacWebKit()) {
2831 return runMacWebKitApp(File::Spec->catfile(productDir(), "WebKitTestRunn er")); 2831 return runMacWebKitApp(File::Spec->catfile(productDir(), "WebKitTestRunn er"));
2832 } elsif (isGtk()) { 2832 } elsif (isGtk()) {
2833 my $productDir = productDir(); 2833 my $productDir = productDir();
2834 my $injectedBundlePath = "$productDir/Libraries/.libs/libTestRunnerInjec tedBundle"; 2834 my $injectedBundlePath = "$productDir/Libraries/.libs/libTestRunnerInjec tedBundle";
(...skipping 28 matching lines...) Expand all
2863 2863
2864 my $error = system "regtool", "--wow32", "set", "-s", $valueName, $string; 2864 my $error = system "regtool", "--wow32", "set", "-s", $valueName, $string;
2865 2865
2866 # On Windows Vista/7 with UAC enabled, regtool will fail to modify the regis try, but will still 2866 # On Windows Vista/7 with UAC enabled, regtool will fail to modify the regis try, but will still
2867 # return a successful exit code. So we double-check here that the value we t ried to write to the 2867 # return a successful exit code. So we double-check here that the value we t ried to write to the
2868 # registry was really written. 2868 # registry was really written.
2869 return !$error && readRegistryString($valueName) eq $string; 2869 return !$error && readRegistryString($valueName) eq $string;
2870 } 2870 }
2871 2871
2872 1; 2872 1;
OLDNEW
« no previous file with comments | « Tools/Scripts/validate-committer-lists ('k') | Tools/Scripts/webkitperl/VCSUtils_unittest/fixChangeLogPatch.pl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698