diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-10-30 01:29:41 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-10-30 01:29:41 +0000 |
| commit | 69fdb9c26ab5c065e3e892a77982413f34dac7fe (patch) | |
| tree | 4d6052268d7a9a0d6eedc159256a0bcffe69ff78 /buildtool.cpp | |
| parent | Update to trunk (diff) | |
| parent | suppress uninitialized variables (x and y) warning, don't ask why... g++'s wa... (diff) | |
| download | inkscape-69fdb9c26ab5c065e3e892a77982413f34dac7fe.tar.gz inkscape-69fdb9c26ab5c065e3e892a77982413f34dac7fe.zip | |
Update to trunk
(bzr r11950.1.191)
Diffstat (limited to 'buildtool.cpp')
| -rw-r--r-- | buildtool.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/buildtool.cpp b/buildtool.cpp index 46c4c91ae..c6aa6e127 100644 --- a/buildtool.cpp +++ b/buildtool.cpp @@ -4140,8 +4140,8 @@ bool MakeBase::executeCommand(const String &command, String &errbuf) { - status("============ cmd ============\n%s\n=============================", - command.c_str()); +// status("============ cmd ============\n%s\n=============================", +// command.c_str()); outbuf.clear(); errbuf.clear(); @@ -7060,8 +7060,9 @@ public: //# First we check if the source is newer than the .o if (isNewerThan(srcFullName, destFullName)) { - taskstatus("compile of %s required by source: %s", - destFullName.c_str(), srcFullName.c_str()); +// taskstatus("compile of %s (req. by: %s)", +// destFullName.c_str(), srcFullName.c_str()); + fprintf(stdout, "compile %s\n", srcFullName.c_str()); compileMe = true; } else @@ -7083,8 +7084,8 @@ public: // destFullName.c_str(), depFullName.c_str()); if (depRequires) { - taskstatus("compile of %s required by included: %s", - destFullName.c_str(), depFullName.c_str()); + taskstatus("compile %s (%s modified)", + srcFullName.c_str(), depFullName.c_str()); compileMe = true; break; } @@ -7143,11 +7144,13 @@ public: fprintf(f, "#### STDERR ###\n%s\n\n", errString.c_str()); fflush(f); } - if (!ret) - { + if (!ret) { error("problem compiling: %s", errString.c_str()); errorOccurred = true; - } + } else if (!errString.empty()) { + fprintf(stdout, "STDERR: \n%s\n", errString.c_str()); + } + if (errorOccurred && !continueOnError) { #ifndef _OPENMP // figure out a way to break the loop here with OpenMP |