src/Pure/Tools/build_job.scala
changeset 74306 a117c076aa22
parent 74259 6d48d6ba58df
child 74657 9fcf80ceb863
equal deleted inserted replaced
74305:28a582aa25dd 74306:a117c076aa22
   143 
   143 
   144           if (errors.nonEmpty) {
   144           if (errors.nonEmpty) {
   145             val msg = Symbol.output(unicode_symbols, cat_lines(errors))
   145             val msg = Symbol.output(unicode_symbols, cat_lines(errors))
   146             progress.echo("\nBuild errors:\n" + Output.error_message_text(msg))
   146             progress.echo("\nBuild errors:\n" + Output.error_message_text(msg))
   147           }
   147           }
   148           if (rc != 0) progress.echo("\n" + Process_Result.print_return_code(rc))
   148           if (rc != Process_Result.RC.ok) {
       
   149             progress.echo("\n" + Process_Result.RC.print_long(rc))
       
   150           }
   149       }
   151       }
   150     })
   152     })
   151   }
   153   }
   152 
   154 
   153 
   155 
   306                     val prt = Protocol_Message.expose_no_reports(err)
   308                     val prt = Protocol_Message.expose_no_reports(err)
   307                     Pretty.string_of(prt, metric = Symbol.Metric)
   309                     Pretty.string_of(prt, metric = Symbol.Metric)
   308                   }
   310                   }
   309                 (rc, errors)
   311                 (rc, errors)
   310               }
   312               }
   311               catch { case ERROR(err) => (2, List(err)) }
   313               catch { case ERROR(err) => (Process_Result.RC.failure, List(err)) }
   312 
   314 
   313             session.protocol_command("Prover.stop", rc.toString)
   315             session.protocol_command("Prover.stop", rc.toString)
   314             Build_Session_Errors(errors)
   316             Build_Session_Errors(errors)
   315             true
   317             true
   316           }
   318           }
   506           if (errs.nonEmpty) {
   508           if (errs.nonEmpty) {
   507             result.error_rc.output(
   509             result.error_rc.output(
   508               errs.flatMap(s => split_lines(Output.error_message_text(s))) :::
   510               errs.flatMap(s => split_lines(Output.error_message_text(s))) :::
   509                 errs.map(Protocol.Error_Message_Marker.apply))
   511                 errs.map(Protocol.Error_Message_Marker.apply))
   510           }
   512           }
   511           else if (progress.stopped && result.ok) result.copy(rc = Process_Result.interrupt_rc)
   513           else if (progress.stopped && result.ok) result.copy(rc = Process_Result.RC.interrupt)
   512           else result
   514           else result
   513         case Exn.Exn(Exn.Interrupt()) =>
   515         case Exn.Exn(Exn.Interrupt()) =>
   514           if (result.ok) result.copy(rc = Process_Result.interrupt_rc)
   516           if (result.ok) result.copy(rc = Process_Result.RC.interrupt)
   515           else result
   517           else result
   516         case Exn.Exn(exn) => throw exn
   518         case Exn.Exn(exn) => throw exn
   517       }
   519       }
   518     }
   520     }
   519 
   521