FWGS/waifu
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

waifulib: strip_on_install: more informative log

Browse Source
This commit is contained in:
Alibek Omarov 2019-10-07 20:35:55 +03:00
parent 7775867ee3
commit b8a8cf9904
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/waifulib/strip_on_install.py
View File

@ -16,7 +16,7 @@ def options(opt):
def configure(conf): def configure(conf):
if conf.env.DEST_BINFMT in ['elf', 'mac-o']: if conf.env.DEST_BINFMT in ['elf', 'mac-o']:
conf.find_program('strip') conf.find_program('strip', var='STRIP')
if not conf.env.STRIPFLAGS: if not conf.env.STRIPFLAGS:
conf.env.STRIPFLAGS = os.environ['STRIPFLAGS'] if 'STRIPFLAGS' in os.environ else [] conf.env.STRIPFLAGS = os.environ['STRIPFLAGS'] if 'STRIPFLAGS' in os.environ else []
@ -32,12 +32,15 @@ def copy_fun(self, src, tgt):
if getattr(self.generator, 'link_task', None) and self.generator.link_task.outputs[0] in self.inputs: if getattr(self.generator, 'link_task', None) and self.generator.link_task.outputs[0] in self.inputs:
cmd = self.env.STRIP + self.env.STRIPFLAGS + [tgt] cmd = self.env.STRIP + self.env.STRIPFLAGS + [tgt]
try: try:
self.generator.bld.cmd_and_log(cmd, output=Context.BOTH, quiet=Context.BOTH)
if not self.generator.bld.progress_bar: if not self.generator.bld.progress_bar:
c1 = Logs.colors.NORMAL c1 = Logs.colors.NORMAL
c2 = Logs.colors.CYAN c2 = Logs.colors.CYAN
Logs.info('%s+ strip %s%s%s', c1, c2, tgt, c2) f1 = os.path.getsize(src)
self.generator.bld.cmd_and_log(cmd, output=Context.BOTH, quiet=Context.BOTH) f2 = os.path.getsize(tgt)
Logs.info('%s+ strip %s%s%s (%d bytes change)', c1, c2, tgt, c1, f2 - f1)
except Errors.WafError as e: except Errors.WafError as e:
print(e.stdout, e.stderr) print(e.stdout, e.stderr)