From 93f96964914ae30686d30e5667bff92f2d17b791 Mon Sep 17 00:00:00 2001 From: Michael Schwarz Date: Fri, 11 Sep 2015 22:03:03 +0200 Subject: Check for Asymptote not writing a PDF file. If no drawing commands are called in an Asymptote script, no PDF output is created and no error is generated. This confuses the build process, which expect a target to exist after its commands were called. With this change, the Python wrapper checks whether a PDF was actually written and throws an error otherwise. --- support/asymptote/__main__.py | 3 +++ support/lib/util.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'support') diff --git a/support/asymptote/__main__.py b/support/asymptote/__main__.py index 5c6f67a..91902dd 100644 --- a/support/asymptote/__main__.py +++ b/support/asymptote/__main__.py @@ -17,6 +17,9 @@ def main(in_path, out_path): # Asymptote creates A LOT of temp files (presumably when invoking LaTeX) and leaves some of them behind. Thus we run asymptote in a temporary directory. _asymptote(absolute_in_path, 'out', os.path.dirname(absolute_in_path), temp_dir) + if not os.path.exists(temp_out_path): + raise util.UserError('Asymptote did not generate a PDF file for input file {}.', in_path) + shutil.copyfile(temp_out_path, out_path) else: raise Exception('Unknown file type: {}'.format(out_suffix)) diff --git a/support/lib/util.py b/support/lib/util.py index 915e33c..e343b73 100644 --- a/support/lib/util.py +++ b/support/lib/util.py @@ -35,7 +35,7 @@ def TemporaryDirectory(): shutil.rmtree(dir) -def command(args, remove_env = [], set_env = { }): +def command(args, remove_env = [], set_env = { }, working_dir = None): env = dict(os.environ) for i in remove_env: @@ -45,7 +45,7 @@ def command(args, remove_env = [], set_env = { }): env[k] = v try: - process = subprocess.Popen(args, env = env) + process = subprocess.Popen(args, env = env, cwd = working_dir) process.wait() except OSError as e: raise UserError('Error running {}: {}', args[0], e) -- cgit