Changeset 172728 in webkit

Timestamp:

Aug 18, 2014, 2:44:24 PM (11 years ago)

Author:

mitz@apple.com

Message:

Added an update-webkit option to override the ../Internal check.
Part of ​https://bugs.webkit.org/show_bug.cgi?id=135815

Reviewed by Tim Horton.

• Scripts/update-webkit:

Added an explicit --internal option to control updating ../Internal, defaulting to whether
../Internal exists.
(runSvnUpdate): Moved to webkitdirs.pm.
(runGitUpdate): Ditto.

• Scripts/webkitdirs.pm:

(runSvnUpdateAndResolveChangeLogs): Moved runSvnUpdate from update-webkit and renamed to this.
(runGitUpdate): Moved from update-webkit.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/update-webkit (modified) (7 diffs)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog ¶

@@ +1 @@
+2014-08-18  Dan Bernstein  <mitz@apple.com>
+
+        Added an update-webkit option to override the ../Internal check.
+        Part of https://bugs.webkit.org/show_bug.cgi?id=135815
+
+        Reviewed by Tim Horton.
+
+        * Scripts/update-webkit:
+        Added an explicit --internal option to control updating ../Internal, defaulting to whether
+        ../Internal exists.
+        (runSvnUpdate): Moved to webkitdirs.pm.
+        (runGitUpdate): Ditto.
+        * Scripts/webkitdirs.pm:
+        (runSvnUpdateAndResolveChangeLogs): Moved runSvnUpdate from update-webkit and renamed to this.
+        (runGitUpdate): Moved from update-webkit.
+
 2014-08-18  Pratik Solanki  <psolanki@apple.com>
 

trunk/Tools/Scripts/update-webkit ¶

@@ -1 +1 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
+# Copyright (C) 2005-2009, 2013, 2014 Apple Inc. All rights reserved.
 # Copyright (C) 2009 Google Inc. All rights reserved.
 # Copyright (C) 2011 Brent Fulgham. All rights reserved.
@@ -40 +40 @@
 use webkitdirs;
 
-sub runSvnUpdate();
-sub runGitUpdate();
-
 # Handle options
 my $quiet = '';
@@ -53 +50 @@
 # FIXME: Remove the check for ../Internal once Apple-internal users of this script pass --no-auxiliary-libs
 my $auxiliaryLibs = ! -d "../Internal";
+# FIXME: http://webkit.org/b/135815 update-webkit should not check for the presence of Apple's Internal directory
+my $internal = -d "../Internal";
 
 my $getOptionsResult = GetOptions(
@@ -58 +57 @@
     'q|quiet' => \$quiet,
     'auxiliary-libs!' => \$auxiliaryLibs,
-); 
+    'internal!' => \$internal,
+);
 
 if (!$getOptionsResult || $showHelp) {
@@ -66 +66 @@
   -q|--quiet                pass -q to svn update for quiet updates
   --[no-]auxiliary-libs     [don\'t] update the auxiliary libraries for Windows (default: update)
-  --wincairo                also update dependencies of the WinCairo port
+  --[no-]internal           [don\'t] update ../Internal (default: update if it exists)
 __END__
     exit 1;
@@ -78 +78 @@
 
 print "Updating OpenSource\n" unless $quiet;
-runSvnUpdate() if isSVN();
+runSvnUpdateAndResolveChangeLogs(@svnOptions) if isSVN();
 runGitUpdate() if isGit();
 
-if (-d "../Internal") {
+if ($internal) {
     chdir("../Internal");
     print "Updating Internal\n" unless $quiet;
-    runSvnUpdate() if isSVNDirectory(".");
+    runSvnUpdateAndResolveChangeLogs(@svnOptions) if isSVNDirectory(".");
     runGitUpdate() if isGitDirectory(".");
 }
@@ -99 +99 @@
 
 exit 0;
-
-sub runSvnUpdate()
-{
-    open UPDATE, "-|", "svn", "update", @svnOptions or die;
-    my @conflictedChangeLogs;
-    while (my $line = <UPDATE>) {
-        print $line;
-        $line =~ m/^C\s+(.+?)[\r\n]*$/;
-        if ($1) {
-          my $filename = normalizePath($1);
-          push @conflictedChangeLogs, $filename if basename($filename) eq "ChangeLog";
-        }
-    }
-    close UPDATE or die;
-
-    if (@conflictedChangeLogs) {
-        print "Attempting to merge conflicted ChangeLogs.\n";
-        my $resolveChangeLogsPath = File::Spec->catfile(dirname($0), "resolve-ChangeLogs");
-        (system($resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs) == 0)
-            or die "Could not open resolve-ChangeLogs script: $!.\n";
-    }
-}
-
-sub runGitUpdate()
-{
-    # Doing a git fetch first allows setups with svn-remote.svn.fetch = trunk:refs/remotes/origin/master
-    # to perform the rebase much much faster.
-    system("git", "fetch");
-    if (isGitSVN()) {
-        system("git", "svn", "rebase") == 0 or die;
-    } else {
-        # This will die if branch.$BRANCHNAME.merge isn't set, which is
-        # almost certainly what we want.
-        system("git", "pull") == 0 or die;
-    }
-}

trunk/Tools/Scripts/webkitdirs.pm ¶

@@ -2521 +2521 @@
 }
 
+sub runSvnUpdateAndResolveChangeLogs(@)
+{
+    my @svnOptions = @_;
+    open UPDATE, "-|", "svn", "update", @svnOptions or die;
+    my @conflictedChangeLogs;
+    while (my $line = <UPDATE>) {
+        print $line;
+        $line =~ m/^C\s+(.+?)[\r\n]*$/;
+        if ($1) {
+          my $filename = normalizePath($1);
+          push @conflictedChangeLogs, $filename if basename($filename) eq "ChangeLog";
+        }
+    }
+    close UPDATE or die;
+
+    if (@conflictedChangeLogs) {
+        print "Attempting to merge conflicted ChangeLogs.\n";
+        my $resolveChangeLogsPath = File::Spec->catfile(dirname($0), "resolve-ChangeLogs");
+        (system($resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs) == 0)
+            or die "Could not open resolve-ChangeLogs script: $!.\n";
+    }
+}
+
+sub runGitUpdate()
+{
+    # Doing a git fetch first allows setups with svn-remote.svn.fetch = trunk:refs/remotes/origin/master
+    # to perform the rebase much much faster.
+    system("git", "fetch");
+    if (isGitSVN()) {
+        system("git", "svn", "rebase") == 0 or die;
+    } else {
+        # This will die if branch.$BRANCHNAME.merge isn't set, which is
+        # almost certainly what we want.
+        system("git", "pull") == 0 or die;
+    }
+}
+
 1;