smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow user to specify the working directory. 

We now specify the working directory instead of the install directory.
So all created files/directories will be under the the working directory.

By default, working dir is the current one.
This commit is contained in:
Matthieu Gautier 2017-01-17 11:02:59 +01:00 committed by Matthieu Gautier
parent 576a368b21
commit 0676667fe0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kiwix-build.py
View File

@ -109,14 +109,16 @@ def extract_archive(archive_path, dest_dir, topdir=None, name=None):
class BuildEnv: class BuildEnv:
def __init__(self, options): def __init__(self, options):
self.source_dir = pj(os.getcwd(), "SOURCE") self.source_dir = pj(options.working_dir, "SOURCE")
self.build_dir = pj(os.getcwd(), "BUILD_{mode}".format(mode='native')) self.build_dir = pj(options.working_dir, "BUILD")
self.archive_dir = pj(os.getcwd(), "ARCHIVE") self.archive_dir = pj(options.working_dir, "ARCHIVE")
self.log_dir = pj(os.getcwd(), 'LOGS') self.log_dir = pj(options.working_dir, 'LOGS')
self.install_dir = pj(self.build_dir, "INSTALL")
os.makedirs(self.source_dir, exist_ok=True) os.makedirs(self.source_dir, exist_ok=True)
os.makedirs(self.archive_dir, exist_ok=True) os.makedirs(self.archive_dir, exist_ok=True)
os.makedirs(self.build_dir, exist_ok=True) os.makedirs(self.build_dir, exist_ok=True)
os.makedirs(self.log_dir, exist_ok=True) os.makedirs(self.log_dir, exist_ok=True)
os.makedirs(self.install_dir, exist_ok=True)
self.ninja_command = self._detect_ninja() self.ninja_command = self._detect_ninja()
self.meson_command = self._detect_meson() self.meson_command = self._detect_meson()
self.options = options self.options = options
@ -559,7 +561,7 @@ class Builder:
def parse_args(): def parse_args():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('install_dir') parser.add_argument('working_dir', default=".", nargs='?')
parser.add_argument('--libprefix', default=None) parser.add_argument('--libprefix', default=None)
parser.add_argument('--target_arch', default="x86_64") parser.add_argument('--target_arch', default="x86_64")
parser.add_argument('--build_static', action="store_true") parser.add_argument('--build_static', action="store_true")
@ -567,7 +569,7 @@ def parse_args():
if __name__ == "__main__": if __name__ == "__main__":
options = parse_args() options = parse_args()
options.install_dir = os.path.abspath(options.install_dir) options.working_dir = os.path.abspath(options.working_dir)
buildEnv = BuildEnv(options) buildEnv = BuildEnv(options)
builder = Builder(buildEnv) builder = Builder(buildEnv)
try: try: