From 788afee7e18b1ed596245f38556150ddf2ac2ac1 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 21 Apr 2019 20:26:05 +0200 Subject: Switch to using a submodule for autowaf --- waflib | 1 + waflib/processor.py | 64 ----------------------------------------------------- 2 files changed, 1 insertion(+), 64 deletions(-) create mode 160000 waflib delete mode 100755 waflib/processor.py (limited to 'waflib/processor.py') diff --git a/waflib b/waflib new file mode 160000 index 0000000..2314e23 --- /dev/null +++ b/waflib @@ -0,0 +1 @@ +Subproject commit 2314e236ca6e7d94a26c3c17091da0f25f5867f3 diff --git a/waflib/processor.py b/waflib/processor.py deleted file mode 100755 index 2eecf3b..0000000 --- a/waflib/processor.py +++ /dev/null @@ -1,64 +0,0 @@ -#! /usr/bin/env python -# encoding: utf-8 -# Thomas Nagy, 2016-2018 (ita) - -import os, sys, traceback, base64, signal -try: - import cPickle -except ImportError: - import pickle as cPickle - -try: - import subprocess32 as subprocess -except ImportError: - import subprocess - -try: - TimeoutExpired = subprocess.TimeoutExpired -except AttributeError: - class TimeoutExpired(Exception): - pass - -def run(): - txt = sys.stdin.readline().strip() - if not txt: - # parent process probably ended - sys.exit(1) - [cmd, kwargs, cargs] = cPickle.loads(base64.b64decode(txt)) - cargs = cargs or {} - - ret = 1 - out, err, ex, trace = (None, None, None, None) - try: - proc = subprocess.Popen(cmd, **kwargs) - try: - out, err = proc.communicate(**cargs) - except TimeoutExpired: - if kwargs.get('start_new_session') and hasattr(os, 'killpg'): - os.killpg(proc.pid, signal.SIGKILL) - else: - proc.kill() - out, err = proc.communicate() - exc = TimeoutExpired(proc.args, timeout=cargs['timeout'], output=out) - exc.stderr = err - raise exc - ret = proc.returncode - except Exception as e: - exc_type, exc_value, tb = sys.exc_info() - exc_lines = traceback.format_exception(exc_type, exc_value, tb) - trace = str(cmd) + '\n' + ''.join(exc_lines) - ex = e.__class__.__name__ - - # it is just text so maybe we do not need to pickle() - tmp = [ret, out, err, ex, trace] - obj = base64.b64encode(cPickle.dumps(tmp)) - sys.stdout.write(obj.decode()) - sys.stdout.write('\n') - sys.stdout.flush() - -while 1: - try: - run() - except KeyboardInterrupt: - break - -- cgit v1.2.1