Add an option to set the build directory of kiwix-build.

This commit is contained in:
Matthieu Gautier 2022-09-21 16:14:08 +02:00
parent 6d4aa756b5
commit e21cb8971a
2 changed files with 9 additions and 2 deletions

View File

@ -13,7 +13,13 @@ def parse_args():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('target', default='kiwix-tools', nargs='?', metavar='TARGET', parser.add_argument('target', default='kiwix-tools', nargs='?', metavar='TARGET',
choices=Dependency.all_deps.keys()) 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('--libprefix', default=None)
parser.add_argument('--target-platform', choices=PlatformInfo.all_platforms) parser.add_argument('--target-platform', choices=PlatformInfo.all_platforms)
parser.add_argument('--verbose', '-v', action="store_true", parser.add_argument('--verbose', '-v', action="store_true",

View File

@ -76,7 +76,8 @@ class BuildEnv:
def __init__(self, platformInfo): def __init__(self, platformInfo):
build_dir = "BUILD_{}".format(platformInfo.name) build_dir = "BUILD_{}".format(platformInfo.name)
self.platformInfo = platformInfo 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.install_dir = pj(self.build_dir, "INSTALL")
self.toolchain_dir = pj(self.build_dir, "TOOLCHAINS") self.toolchain_dir = pj(self.build_dir, "TOOLCHAINS")
self.log_dir = pj(self.build_dir, 'LOGS') self.log_dir = pj(self.build_dir, 'LOGS')