From 9330bfbaa7e7855c4b1caa75de78c97197d45733 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 9 Nov 2016 17:08:05 +1100 Subject: waf: Users without the extra fonts need to use '--disable-extra-fonts' to build PDF. --- common/latex.py | 3 ++- common/waf.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'common') diff --git a/common/latex.py b/common/latex.py index bf5c91d..7f2765c 100644 --- a/common/latex.py +++ b/common/latex.py @@ -107,7 +107,6 @@ def local_packages(): return packages def configure_tests(conf): - # # Using a hint from ita (thank you) : # https://github.com/waf-project/waf/blob/master/demos/tex/wscript @@ -164,4 +163,6 @@ def configure_tests(conf): if fails == 0: conf.env.RTEMSEXTRAFONTS = 'rtemsextrafonts.sty' else: + if not conf.options.disable_extra_fonts: + conf.fatal('Extra fonts not found, install or use --disable-extra-fonts') conf.env.RTEMSEXTRAFONTS = 'rtemsextrafonts-null.sty' diff --git a/common/waf.py b/common/waf.py index c1d3f81..33fff4d 100644 --- a/common/waf.py +++ b/common/waf.py @@ -203,7 +203,6 @@ def doc_pdf(ctx, source_dir, conf_dir): quiet = True) def doc_singlehtml(ctx, source_dir, conf_dir): - # # Use a run command to handle stdout and stderr output from inliner. Using # a standard rule in the build context locks up. @@ -283,6 +282,10 @@ def cmd_build(ctx, conf_dir = ".", source_dir = "."): doc_html(ctx, source_dir, conf_dir) def cmd_options(ctx): + ctx.add_option('--disable-extra-fonts', + action = 'store_true', + default = False, + help = "Disable building with extra fonts for better quality (lower quality).") ctx.add_option('--sphinx-verbose', action = 'store', default = "-Q", -- cgit v1.2.3