forks/apenwarr-redo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaner environment variable management in redo.py.

Browse source
This commit is contained in:
Avery Pennarun 2010-11-12 22:14:39 -08:00
commit 2ed0511094
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
redo.py
View file

@ -94,6 +94,11 @@ def stamp(t):
os.utime(stampfile, (mtime, mtime)) os.utime(stampfile, (mtime, mtime))
def _preexec(t):
os.putenv('REDO_TARGET', t)
os.putenv('REDO_DEPTH', REDO_DEPTH + ' ')
def build(t): def build(t):
unlink('.redo/dep.%s' % t) unlink('.redo/dep.%s' % t)
open('.redo/dep.%s' % t, 'w').close() open('.redo/dep.%s' % t, 'w').close()
@ -105,8 +110,6 @@ def build(t):
else: else:
raise Exception('no rule to make %r' % t) raise Exception('no rule to make %r' % t)
unlink(t) unlink(t)
os.putenv('REDO_TARGET', t)
os.putenv('REDO_DEPTH', REDO_DEPTH + ' ')
tmpname = '%s.redo.tmp' % t tmpname = '%s.redo.tmp' % t
unlink(tmpname) unlink(tmpname)
f = open(tmpname, 'w+') f = open(tmpname, 'w+')
@ -114,7 +117,8 @@ def build(t):
if REDO_VERBOSE: if REDO_VERBOSE:
argv[1] += 'v' argv[1] += 'v'
log('%s\n' % t) log('%s\n' % t)
rv = subprocess.call(argv, stdout=f.fileno()) rv = subprocess.call(argv, preexec_fn=lambda: _preexec(t),
stdout=f.fileno())
st = os.stat(tmpname) st = os.stat(tmpname)
#log('rv: %d (%d bytes) (%r)\n' % (rv, st.st_size, dofile)) #log('rv: %d (%d bytes) (%r)\n' % (rv, st.st_size, dofile))
stampfile = '.redo/stamp.%s' % t stampfile = '.redo/stamp.%s' % t
@ -132,30 +136,27 @@ def build(t):
raise Exception('non-zero return code building %r' % t) raise Exception('non-zero return code building %r' % t)
if opt.debug:
os.putenv('REDO_DEBUG', '1')
if opt.verbose:
os.putenv('REDO_VERBOSE', '1')
assert(not (opt.ifchange and opt.ifcreate)) assert(not (opt.ifchange and opt.ifcreate))
mkdirp('.redo')
REDO_TARGET = os.getenv('REDO_TARGET', '') REDO_TARGET = os.getenv('REDO_TARGET', '')
REDO_DEPTH = os.getenv('REDO_DEPTH', '') REDO_DEPTH = os.getenv('REDO_DEPTH', '')
REDO_DEBUG = os.getenv('REDO_DEBUG', '') and 1 or 0
REDO_VERBOSE = os.getenv('REDO_VERBOSE', '') and 1 or 0
mkdirp('.redo')
if not REDO_DEPTH: if not REDO_DEPTH:
# toplevel call to redo
exenames = [os.path.abspath(sys.argv[0]), os.path.realpath(sys.argv[0])] exenames = [os.path.abspath(sys.argv[0]), os.path.realpath(sys.argv[0])]
if exenames[0] == exenames[1]: if exenames[0] == exenames[1]:
exenames = [exenames[0]] exenames = [exenames[0]]
dirnames = [os.path.dirname(p) for p in exenames] dirnames = [os.path.dirname(p) for p in exenames]
os.putenv('PATH', ':'.join(dirnames) + ':' + os.getenv('PATH')) os.putenv('PATH', ':'.join(dirnames) + ':' + os.getenv('PATH'))
if opt.debug:
REDO_DEBUG = 1
os.putenv('REDO_DEBUG', '1')
else:
REDO_DEBUG = os.getenv('REDO_DEBUG', '') and 1 or 0
if opt.verbose:
REDO_VERBOSE = 1
os.putenv('REDO_VERBOSE', '1')
else:
REDO_VERBOSE = os.getenv('REDO_VERBOSE', '') and 1 or 0
for t in targets: for t in targets:
if REDO_TARGET: if REDO_TARGET:
add_dep(REDO_TARGET, opt.ifcreate and 'c' or 'm', t) add_dep(REDO_TARGET, opt.ifcreate and 'c' or 'm', t)