Changeset 172795 in webkit


Ignore:
Timestamp:
Aug 19, 2014 8:02:16 PM (10 years ago)
Author:
mitz@apple.com
Message:

update-webkit should not check for the presence of Apple’s Internal directory
Last part of https://bugs.webkit.org/show_bug.cgi?id=135815

Reviewed by Tim Horton.

  • Scripts/update-webkit:
Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r172758 r172795  
     12014-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
    1102014-08-19  Zalan Bujtas  <zalan@apple.com>
    211
  • trunk/Tools/Scripts/update-webkit

    r172728 r172795  
    4848chdirWebKit();
    4949
    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";
     50my $auxiliaryLibs;
     51my $internal;
    5452
    5553my $getOptionsResult = GetOptions(
     
    5755    'q|quiet' => \$quiet,
    5856    'auxiliary-libs!' => \$auxiliaryLibs,
     57    # FIXME: This option is ignored. Remove it once no one in passing it in.
    5958    'internal!' => \$internal,
    6059);
     
    6665  -q|--quiet                pass -q to svn update for quiet updates
    6766  --[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)
    6967__END__
    7068    exit 1;
     
    8179runGitUpdate() if isGit();
    8280
    83 if ($internal) {
    84     chdir("../Internal");
    85     print "Updating Internal\n" unless $quiet;
    86     runSvnUpdateAndResolveChangeLogs(@svnOptions) if isSVNDirectory(".");
    87     runGitUpdate() if isGitDirectory(".");
    88 }
    89 
    9081if (isAppleWinWebKit() && $auxiliaryLibs) {
    9182    system("perl", "Tools/Scripts/update-webkit-auxiliary-libs") == 0 or die;
Note: See TracChangeset for help on using the changeset viewer.