5c4f710f4e
This makes them more reliable to parse. redo-log can parse each line, format and print it, then recurse if necessary. This got a little ugly because I wanted 'redo --raw-logs' to work, which we want to format the output nicely, but not call redo-log. (As a result, --raw-logs has a different meaning to redo and redo-log, which is kinda dumb. I should fix that.) As an added bonus, redo-log now handles indenting of recursive logs, so if the build was a -> a/b -> a/b/c, and you look at the log for a/b, it can still start at the top level indentation.
85 lines
2.6 KiB
Python
Executable file
85 lines
2.6 KiB
Python
Executable file
#!/usr/bin/env python2
|
|
import sys, os
|
|
import options
|
|
from helpers import atoi
|
|
|
|
optspec = """
|
|
redo [targets...]
|
|
--
|
|
j,jobs= maximum number of jobs to build at once
|
|
d,debug print dependency checks as they happen
|
|
v,verbose print commands as they are read from .do files (variables intact)
|
|
x,xtrace print commands as they are executed (variables expanded)
|
|
k,keep-going keep going as long as possible even if some targets fail
|
|
shuffle randomize the build order to find dependency bugs
|
|
no-details only show 'redo' recursion trace (to see more later, use redo-log)
|
|
no-status don't display build summary line at the bottom of the screen
|
|
raw-logs don't use redo-log, just send all output straight to stderr
|
|
debug-locks print messages about file locking (useful for debugging)
|
|
debug-pids print process ids as part of log messages (useful for debugging)
|
|
version print the current version and exit
|
|
"""
|
|
o = options.Options(optspec)
|
|
(opt, flags, extra) = o.parse(sys.argv[1:])
|
|
|
|
targets = extra
|
|
|
|
if opt.version:
|
|
import version
|
|
print version.TAG
|
|
sys.exit(0)
|
|
if opt.debug:
|
|
os.environ['REDO_DEBUG'] = str(opt.debug or 0)
|
|
if opt.verbose:
|
|
os.environ['REDO_VERBOSE'] = '1'
|
|
if opt.xtrace:
|
|
os.environ['REDO_XTRACE'] = '1'
|
|
if opt.keep_going:
|
|
os.environ['REDO_KEEP_GOING'] = '1'
|
|
if opt.shuffle:
|
|
os.environ['REDO_SHUFFLE'] = '1'
|
|
if opt.raw_logs:
|
|
os.environ['REDO_RAW_LOGS'] = '1'
|
|
if opt.debug_locks or not os.environ.get('REDO_RAW_LOGS'):
|
|
# FIXME: force-enabled for redo-log, for now
|
|
os.environ['REDO_DEBUG_LOCKS'] = '1'
|
|
if opt.debug_pids:
|
|
os.environ['REDO_DEBUG_PIDS'] = '1'
|
|
|
|
import vars_init
|
|
vars_init.init(targets)
|
|
|
|
import vars, state, builder, jwack
|
|
from logs import warn, err
|
|
|
|
try:
|
|
if vars_init.is_toplevel:
|
|
builder.start_stdin_log_reader(status=opt.status, details=opt.details)
|
|
for t in targets:
|
|
if os.path.exists(t):
|
|
f = state.File(name=t)
|
|
if not f.is_generated:
|
|
warn('%s: exists and not marked as generated; not redoing.\n'
|
|
% f.nicename())
|
|
state.rollback()
|
|
|
|
j = atoi(opt.jobs or 1)
|
|
if j < 1 or j > 1000:
|
|
err('invalid --jobs value: %r\n' % opt.jobs)
|
|
jwack.setup(j)
|
|
try:
|
|
assert(state.is_flushed())
|
|
retcode = builder.main(targets, lambda t: (True, True))
|
|
assert(state.is_flushed())
|
|
finally:
|
|
try:
|
|
state.rollback()
|
|
finally:
|
|
jwack.force_return_tokens()
|
|
if vars_init.is_toplevel:
|
|
builder.await_log_reader()
|
|
sys.exit(retcode)
|
|
except KeyboardInterrupt:
|
|
if vars_init.is_toplevel:
|
|
builder.await_log_reader()
|
|
sys.exit(200)
|