Changeset 172960 in webkit

Timestamp:

Aug 26, 2014, 9:30:23 AM (11 years ago)

Author:

mitz@apple.com

Message:

runSvnUpdateAndResolveChangeLogs() doesn’t work when invoked from a script outside Tools/Scripts
​https://bugs.webkit.org/show_bug.cgi?id=136254

Reviewed by Tim Horton.

• Scripts/webkitdirs.pm:

(runSvnUpdateAndResolveChangeLogs): Locate resolve-ChangeLogs relative to the source tree,
not the invoking script.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-08-26  Dan Bernstein  <mitz@apple.com>
+
+        runSvnUpdateAndResolveChangeLogs() doesn’t work when invoked from a script outside Tools/Scripts
+        https://bugs.webkit.org/show_bug.cgi?id=136254
+
+        Reviewed by Tim Horton.
+
+        * Scripts/webkitdirs.pm:
+        (runSvnUpdateAndResolveChangeLogs): Locate resolve-ChangeLogs relative to the source tree,
+        not the invoking script.
+
 2014-08-26  Krzysztof Czech  <k.czech@samsung.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -2538 +2538 @@
     if (@conflictedChangeLogs) {
         print "Attempting to merge conflicted ChangeLogs.\n";
-        my $resolveChangeLogsPath = File::Spec->catfile(dirname($0), "resolve-ChangeLogs");
+        my $resolveChangeLogsPath = File::Spec->catfile(sourceDir(), "Tools", "Scripts", "resolve-ChangeLogs");
         (system($resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs) == 0)
             or die "Could not open resolve-ChangeLogs script: $!.\n";