Title: [172960] trunk/Tools
- Revision
- 172960
- Author
- m...@apple.com
- Date
- 2014-08-26 09:30:23 -0700 (Tue, 26 Aug 2014)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (172959 => 172960)
--- trunk/Tools/ChangeLog 2014-08-26 15:55:01 UTC (rev 172959)
+++ trunk/Tools/ChangeLog 2014-08-26 16:30:23 UTC (rev 172960)
@@ -1,3 +1,14 @@
+2014-08-26 Dan Bernstein <m...@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.cz...@samsung.com>
[EFL] Utilize espeak as a synthesizer back-end for WebSpeech
Modified: trunk/Tools/Scripts/webkitdirs.pm (172959 => 172960)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-08-26 15:55:01 UTC (rev 172959)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-08-26 16:30:23 UTC (rev 172960)
@@ -2537,7 +2537,7 @@
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";
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
