toolchain log output cosmetic

ibobalo · ibobalo · commit 5bdaf52850fb · 2015-11-09T14:19:37.000+02:00
diff --git a/pythonforandroid/bootstraps/pygame/__init__.py b/pythonforandroid/bootstraps/pygame/__init__.py
@@ -43,7 +43,8 @@ def run_distribute(self):
             info('Copying python distribution')
             hostpython = sh.Command(self.ctx.hostpython)
             # AND: This *doesn't* need to be in arm env?
-            shprint(hostpython, '-OO', '-m', 'compileall', self.ctx.get_python_install_dir())
+            shprint(hostpython, '-OO', '-m', 'compileall', self.ctx.get_python_install_dir(),
+                    _tail=10, _critical=True)
             if not exists('python-install'):
                 shprint(sh.cp, '-a', self.ctx.get_python_install_dir(), './python-install')
 
diff --git a/pythonforandroid/recipes/pygame/__init__.py b/pythonforandroid/recipes/pygame/__init__.py
@@ -60,7 +60,8 @@ def build_armeabi(self):
         with current_directory(self.get_build_dir('armeabi')):
             info('hostpython is ' + self.ctx.hostpython)
             hostpython = sh.Command(self.ctx.hostpython)
-            shprint(hostpython, 'setup.py', 'install', '-O2', _env=env)
+            shprint(hostpython, 'setup.py', 'install', '-O2', _env=env,
+                    _tail=10, _critical=True)
 
             info('strip is ' + env['STRIP'])
             build_lib = glob.glob('./build/lib*')
diff --git a/pythonforandroid/recipes/sdl/__init__.py b/pythonforandroid/recipes/sdl/__init__.py
@@ -18,7 +18,7 @@ def build_armeabi(self):
         env = ArchAndroid(self.ctx).get_env()
 
         with current_directory(self.get_jni_dir()):
-            shprint(sh.ndk_build, 'V=1', _env=env)
+            shprint(sh.ndk_build, 'V=1', _env=env, _tail=20, _critical=True)
 
         libs_dir = join(self.ctx.bootstrap.build_dir, 'libs', 'armeabi')
         import os
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -159,14 +159,14 @@ def shprint(command, *args, **kwargs):
     except sh.ErrorReturnCode, err:
         if need_closing_newline: sys.stdout.write('{}\r{:>{width}}\r'.format(Style.RESET_ALL, ' ', width=(columns - 1)))
         if tail_n:
-            lines = err.stdout.splitlines()
-            if len(lines) <= tail_n:
-                info('STDOUT:\n{}\t{}{}'.format(Fore.YELLOW, '\t\n'.join(lines), Fore.RESET))
-            else:
-                info('STDOUT (last {} lines of {}):\n{}\t{}{}'.format(tail_n, len(lines), Fore.YELLOW, '\t\n'.join(lines[-tail_n:]), Fore.RESET))
-            lines = err.stderr.splitlines()
-            if len(lines):
-                warning('STDERR:\n{}\t{}{}'.format(Fore.RED, '\t\n'.join(lines), Fore.RESET))
+            def printtail(name, forecolor, tail_n, out):
+                lines = out.splitlines()
+                if tail_n == 0 or len(lines) <= tail_n:
+                    info('{}:\n{}\t{}{}'.format(name, forecolor, '\t\n'.join(lines), Fore.RESET))
+                else:
+                    info('{} (last {} lines of {}):\n{}\t{}{}'.format(name, tail_n, len(lines), forecolor, '\t\n'.join(lines[-tail_n:]), Fore.RESET))
+            printtail('STDOUT', Fore.YELLOW, tail_n, err.stdout)
+            printtail('STDERR', Fore.RED, 0, err.stderr)
         if is_critical:
             warning("{}ERROR: {} failed!{}".format(Fore.RED, command, Fore.RESET))
             exit(1)
