diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 13:05:17 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 13:05:53 +0100 |
| commit | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (patch) | |
| tree | 35eb9f4732a3e24672c9aa37247a6384d701ddfe | |
| parent | 1489f497e23bcd455aa036faa87f0451fc10a63c (diff) | |
| download | external_webkit-7e7a70bfa49a1122b2597a1e6367d89eb4035eca.zip external_webkit-7e7a70bfa49a1122b2597a1e6367d89eb4035eca.tar.gz external_webkit-7e7a70bfa49a1122b2597a1e6367d89eb4035eca.tar.bz2 | |
WebKitMerge tool fixes.
| -rw-r--r-- | WebKitTools/android/webkitmerge/webkitmerge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKitTools/android/webkitmerge/webkitmerge.cpp b/WebKitTools/android/webkitmerge/webkitmerge.cpp index 637a1ed..c769f5a 100644 --- a/WebKitTools/android/webkitmerge/webkitmerge.cpp +++ b/WebKitTools/android/webkitmerge/webkitmerge.cpp @@ -1365,7 +1365,7 @@ void CompareDirs(const char* workingDir, bool renamePass) // at this point, the file is in both old and new webkits; see if it changed // ignore executables, different or not (or always copy, or do text compare? or find binary compare? ) if (oldExecutable != newExecutable) - fprintf(commandFile, "*** %s/%s differs in the execute bit (may cause problems for perforce)\n", workingDir, oldFile); + fprintf(stderr, "*** %s/%s differs in the execute bit (may cause problems for perforce)\n", workingDir, oldFile); // myassert(sandOrder != 0 || sandFile[sandLen - 1] == '*'); // Diff(oldBase, sandboxBase, workingDir, oldFile); bool oldNewDiff = CompareFiles(oldBase, newBase, workingDir, oldList); @@ -1795,7 +1795,7 @@ int main (int argCount, char* const args[]) if (options.mergeCore) { if (options.verbose) fprintf(stderr, "executing command.sh\n"); - string execCommand = "cd " + options.androidWebKit + "; . " + outputDir + "commands.sh"; + string execCommand = "cd " + options.androidWebKit + "; . " + outputDir + "command.sh"; err = system(execCommand.c_str()); myassert(err == 0); if (options.verbose) |