janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

build.py: Fix missing global declaration

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-21 10:44:36 +00:00
commit 50f50e563d
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/build.py
View file

@ -95,17 +95,18 @@ def calculate_order(order, modules, prereq_type):
return 1 return 1
def run_make(module, target): def run_make(module, target):
global cur_project
cur_project=cur_project+1 cur_project=cur_project+1
make_cmd = "make " + target + " 2>&1" make_cmd = "make " + target + " 2>&1"
path = find_proj_path(module) path = find_proj_path(module)
print(',---------- %d / %d: running %s in %s -------------------------- >' % (cur_project, len(order), make_cmd, path)) print(',---------- %d/%d: running %s in %s -------------------------- >' % (cur_project, len(order), make_cmd, path))
os.chdir(path) os.chdir(path)
p = subprocess.Popen(make_cmd, shell=True, stdout=subprocess.PIPE) p = subprocess.Popen(make_cmd, shell=True, stdout=subprocess.PIPE)
for line in iter(p.stdout.readline, ''): for line in iter(p.stdout.readline, ''):
sys.stdout.write('| ' + line) # avoid extra newlines from print() sys.stdout.write('| ' + line) # avoid extra newlines from print()
sys.stdout.flush() sys.stdout.flush()
p.wait() p.wait()
print('`---------- %d / %d: running %s in %s -------------------------- <' % (cur_project, len(order), make_cmd, path)) print('`---------- %d/%d: running %s in %s -------------------------- <' % (cur_project, len(order), make_cmd, path))
if p.returncode: if p.returncode:
print(make_cmd + ' failed') print(make_cmd + ' failed')
raise Exception(time.strftime("%Y-%m-%d %H:%M") + ": failed to make target " + target + " in module " + module + " below base " + proj_base) raise Exception(time.strftime("%Y-%m-%d %H:%M") + ": failed to make target " + target + " in module " + module + " below base " + proj_base)