From 0e267f162754fa7ee6c6f81a09b4b79ba3dc9d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6k=C3=A7en=20Eraslan?= Date: Fri, 9 Jan 2009 13:12:24 +0000 Subject: [PATCH] pisi/actionsapi/cmaketools.py: If both -v and -d parameters are + given, pass VERBOSE=1 parameter to make command. This results printing commands in make to the screen in addition to the colorful cmake progress lines. --- ChangeLog | 5 +++++ pisi/actionsapi/cmaketools.py | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f760a3f6..54d9c750 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-01-09 Gökçen Eraslan + * pisi/actionsapi/cmaketools.py: If both -v and -d parameters are + given, pass VERBOSE=1 parameter to make command. This results printing + commands in make to the screen in addition to the colorful cmake progress lines. + 2009-01-07 Faik Uygur * pisi-2.1.1 diff --git a/pisi/actionsapi/cmaketools.py b/pisi/actionsapi/cmaketools.py index ba1a2c93..22b8b19c 100644 --- a/pisi/actionsapi/cmaketools.py +++ b/pisi/actionsapi/cmaketools.py @@ -70,7 +70,12 @@ def configure(parameters = '', installPrefix = '/%s' % get.defaultprefixDIR(), s def make(parameters = ''): '''build source with given parameters''' if can_access_file('Makefile'): - if system('make %s %s' % (get.makeJOBS(), parameters)): + if ctx.config.get_option("verbose") and ctx.config.get_option("debug"): + command = 'make VERBOSE=1 %s %s' % (get.makeJOBS(), parameters) + else: + command = 'make %s %s' % (get.makeJOBS(), parameters) + + if system(command): raise MakeError(_('Make failed.')) else: raise InstallError(_('No Makefile found.'))