From 88ee1bf5fac625b1a08e3e058b3895a24b0b0974 Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Mon, 7 Mar 2016 08:06:17 -0800 Subject: [PATCH] support new option --builddir --- tldp/config.py | 4 ++++ tldp/driver.py | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tldp/config.py b/tldp/config.py index e72bc64..8be110a 100644 --- a/tldp/config.py +++ b/tldp/config.py @@ -59,6 +59,10 @@ def collectconfiguration(tag, argv): '-o', default=None, type=arg_isdirectory, help='a directory containing LDP output documents') + ap.add_argument('--builddir', '--build-dir', '--build-directory', + '-d', + default=None, type=arg_isdirectory, + help='a scratch directory used for building') ap.add_argument('--configfile', '--config-file', '--cfg', '-c', default='/etc/ldptool/ldptool.ini', diff --git a/tldp/driver.py b/tldp/driver.py index c05bc5d..454390c 100644 --- a/tldp/driver.py +++ b/tldp/driver.py @@ -14,7 +14,7 @@ from tldp.sources import SourceDocument, arg_issourcedoc from tldp.outputs import OutputDirectory from tldp.inventory import Inventory, status_classes, status_types, stypes from tldp.config import collectconfiguration -from tldp.utils import arg_isloglevel +from tldp.utils import arg_isloglevel, arg_isdirectory from tldp.doctypes.common import preamble, postamble logformat = '%(levelname)-9s %(name)s %(filename)s#%(lineno)s %(funcName)s %(message)s' @@ -362,6 +362,14 @@ def run(argv): logger.info("Assuming --build, since no other action was specified...") config.build = True + if not config.builddir: + builddir = os.path.dirname(os.path.abspath(config.pubdir)) + builddir = os.path.join(builddir, 'ldp-builddir') + if not arg_isdirectory(builddir): + logger.debug("Creating build directory %s.", builddir) + os.mkdir(builddir) + config.builddir = builddir + if not config.pubdir: return need_repos_p + "to --build" return build(config, docs)