From e21cb8971a561f1132526bee1a2f8c83962cf3c9 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 21 Sep 2022 16:14:08 +0200 Subject: [PATCH] Add an option to set the build directory of kiwix-build. --- kiwixbuild/__init__.py | 8 +++++++- kiwixbuild/buildenv.py | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/kiwixbuild/__init__.py b/kiwixbuild/__init__.py index b283e8f..cdbd6b9 100644 --- a/kiwixbuild/__init__.py +++ b/kiwixbuild/__init__.py @@ -13,7 +13,13 @@ def parse_args(): parser = argparse.ArgumentParser() parser.add_argument('target', default='kiwix-tools', nargs='?', metavar='TARGET', choices=Dependency.all_deps.keys()) - parser.add_argument('--working-dir', default=".") + parser.add_argument('--working-dir', default=".", + help=("Directory where kiwix-build puts all its files " + "(source, archive and build)\n" + "working-dir can be absolute path or a relative (to cwd) one.")) + parser.add_argument('--build-dir', default=".", + help=("Directory where kiwix-build puts all build files.\n" + "build-dir can be absolute path or a relative (to working-dir) one.")) parser.add_argument('--libprefix', default=None) parser.add_argument('--target-platform', choices=PlatformInfo.all_platforms) parser.add_argument('--verbose', '-v', action="store_true", diff --git a/kiwixbuild/buildenv.py b/kiwixbuild/buildenv.py index 7575d10..3d86bc3 100644 --- a/kiwixbuild/buildenv.py +++ b/kiwixbuild/buildenv.py @@ -76,7 +76,8 @@ class BuildEnv: def __init__(self, platformInfo): build_dir = "BUILD_{}".format(platformInfo.name) self.platformInfo = platformInfo - self.build_dir = pj(option('working_dir'), build_dir) + self.base_build_dir = pj(option('working_dir'), option('build_dir')) + self.build_dir = pj(self.base_build_dir, build_dir) self.install_dir = pj(self.build_dir, "INSTALL") self.toolchain_dir = pj(self.build_dir, "TOOLCHAINS") self.log_dir = pj(self.build_dir, 'LOGS')