Changeset 172795 in webkit
- Timestamp:
- Aug 19, 2014 8:02:16 PM (10 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r172758 r172795 1 2014-08-19 Dan Bernstein <mitz@apple.com> 2 3 update-webkit should not check for the presence of Apple’s Internal directory 4 Last part of https://bugs.webkit.org/show_bug.cgi?id=135815 5 6 Reviewed by Tim Horton. 7 8 * Scripts/update-webkit: 9 1 10 2014-08-19 Zalan Bujtas <zalan@apple.com> 2 11 -
trunk/Tools/Scripts/update-webkit
r172728 r172795 48 48 chdirWebKit(); 49 49 50 # FIXME: Remove the check for ../Internal once Apple-internal users of this script pass --no-auxiliary-libs 51 my $auxiliaryLibs = ! -d "../Internal"; 52 # FIXME: http://webkit.org/b/135815 update-webkit should not check for the presence of Apple's Internal directory 53 my $internal = -d "../Internal"; 50 my $auxiliaryLibs; 51 my $internal; 54 52 55 53 my $getOptionsResult = GetOptions( … … 57 55 'q|quiet' => \$quiet, 58 56 'auxiliary-libs!' => \$auxiliaryLibs, 57 # FIXME: This option is ignored. Remove it once no one in passing it in. 59 58 'internal!' => \$internal, 60 59 ); … … 66 65 -q|--quiet pass -q to svn update for quiet updates 67 66 --[no-]auxiliary-libs [don\'t] update the auxiliary libraries for Windows (default: update) 68 --[no-]internal [don\'t] update ../Internal (default: update if it exists)69 67 __END__ 70 68 exit 1; … … 81 79 runGitUpdate() if isGit(); 82 80 83 if ($internal) {84 chdir("../Internal");85 print "Updating Internal\n" unless $quiet;86 runSvnUpdateAndResolveChangeLogs(@svnOptions) if isSVNDirectory(".");87 runGitUpdate() if isGitDirectory(".");88 }89 90 81 if (isAppleWinWebKit() && $auxiliaryLibs) { 91 82 system("perl", "Tools/Scripts/update-webkit-auxiliary-libs") == 0 or die;
Note: See TracChangeset
for help on using the changeset viewer.