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

We now can run subprocess with a wrapper from cross-compiling.

This commit is contained in:
Matthieu Gautier 2017-01-17 11:26:52 +01:00 committed by Matthieu Gautier
parent 7cd02ce146
commit e5bb2c65c2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kiwix-build.py
View File

@ -185,8 +185,10 @@ class BuildEnv:
if retcode == 0: if retcode == 0:
return n return n
def run_command(self, command, cwd, context, env=None, input=None): def run_command(self, command, cwd, context, env=None, input=None, allow_wrapper=True):
os.makedirs(cwd, exist_ok=True) os.makedirs(cwd, exist_ok=True)
if allow_wrapper and self.wrapper:
command = "{} {}".format(self.wrapper, command)
if env is None: if env is None:
env = dict(os.environ) env = dict(os.environ)
log = None log = None
@ -278,7 +280,7 @@ class ReleaseDownloadMixin:
context.try_skip(self.extract_path) context.try_skip(self.extract_path)
for p in self.patches: for p in self.patches:
with open(pj(SCRIPT_DIR, 'patches', p), 'r') as patch_input: with open(pj(SCRIPT_DIR, 'patches', p), 'r') as patch_input:
self.buildEnv.run_command("patch -p1", self.extract_path, context, input=patch_input) self.buildEnv.run_command("patch -p1", self.extract_path, context, input=patch_input, allow_wrapper=False)
def prepare(self): def prepare(self):
self._download() self._download()
@ -424,19 +426,19 @@ class MesonMixin(MakeMixin):
buildEnv=self.buildEnv, buildEnv=self.buildEnv,
cross_option = "--cross-file {}".format(self.buildEnv.meson_crossfile) if self.buildEnv.meson_crossfile else "" cross_option = "--cross-file {}".format(self.buildEnv.meson_crossfile) if self.buildEnv.meson_crossfile else ""
) )
self.buildEnv.run_command(command, self.source_path, context, env=env) self.buildEnv.run_command(command, self.source_path, context, env=env, allow_wrapper=False)
@command("compile") @command("compile")
def _compile(self, context): def _compile(self, context):
env = self._gen_env() env = self._gen_env()
command = "{} -v".format(self.buildEnv.ninja_command) command = "{} -v".format(self.buildEnv.ninja_command)
self.buildEnv.run_command(command, self.build_path, context, env=env) self.buildEnv.run_command(command, self.build_path, context, env=env, allow_wrapper=False)
@command("install") @command("install")
def _install(self, context): def _install(self, context):
env = self._gen_env() env = self._gen_env()
command = "{} -v install".format(self.buildEnv.ninja_command) command = "{} -v install".format(self.buildEnv.ninja_command)
self.buildEnv.run_command(command, self.build_path, context) self.buildEnv.run_command(command, self.build_path, context, allow_wrapper=False)
def build(self): def build(self):
self._configure() self._configure()