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

Introduce new method `get_env` to create the env.

This commit is contained in:
Matthieu Gautier 2021-04-12 18:11:05 +02:00
parent 76aa746f84
commit b286be1207
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kiwixbuild/dependencies/base.py
View File

@ -293,6 +293,9 @@ class Builder:
if getattr(self, 'configure_option', ''): if getattr(self, 'configure_option', ''):
module['config-opts'] = self.configure_option.split(' ') module['config-opts'] = self.configure_option.split(' ')
def get_env(self, *, cross_comp_flags, cross_compilers, cross_path):
return self.buildEnv.get_env(cross_comp_flags=cross_comp_flags, cross_compilers=cross_compilers, cross_path=cross_path)
class NoopBuilder(Builder): class NoopBuilder(Builder):
def build(self): def build(self):
@ -353,7 +356,7 @@ class MakeBuilder(Builder):
configure_script=pj(self.source_path, self.configure_script), configure_script=pj(self.source_path, self.configure_script),
configure_option=self.all_configure_option configure_option=self.all_configure_option
) )
env = self.buildEnv.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True) env = self.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True)
self.set_configure_env(env) self.set_configure_env(env)
run_command(command, self.build_path, context, env=env) run_command(command, self.build_path, context, env=env)
@ -363,7 +366,7 @@ class MakeBuilder(Builder):
make_target=self.make_target, make_target=self.make_target,
make_option=self.make_option make_option=self.make_option
) )
env = self.buildEnv.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True) env = self.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True)
run_command(command, self.build_path, context, env=env) run_command(command, self.build_path, context, env=env)
def _install(self, context): def _install(self, context):
@ -372,13 +375,13 @@ class MakeBuilder(Builder):
make_install_target=self.make_install_target, make_install_target=self.make_install_target,
make_option=self.make_option make_option=self.make_option
) )
env = self.buildEnv.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True) env = self.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True)
run_command(command, self.build_path, context, env=env) run_command(command, self.build_path, context, env=env)
def _make_dist(self, context): def _make_dist(self, context):
context.try_skip(self.build_path) context.try_skip(self.build_path)
command = "make dist" command = "make dist"
env = self.buildEnv.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True) env = self.get_env(cross_comp_flags=True, cross_compilers=True, cross_path=True)
run_command(command, self.build_path, context, env=env) run_command(command, self.build_path, context, env=env)
@ -403,7 +406,7 @@ class CMakeBuilder(MakeBuilder):
source_path=self.source_path, source_path=self.source_path,
cross_option=cross_option cross_option=cross_option
) )
env = self.buildEnv.get_env(cross_comp_flags=True, cross_compilers=False, cross_path=True) env = self.get_env(cross_comp_flags=True, cross_compilers=False, cross_path=True)
self.set_configure_env(env) self.set_configure_env(env)
run_command(command, self.build_path, context, env=env) run_command(command, self.build_path, context, env=env)
@ -438,7 +441,7 @@ class QMakeBuilder(MakeBuilder):
source_path=self.source_path, source_path=self.source_path,
cross_option=cross_option cross_option=cross_option
) )
env = self.buildEnv.get_env(cross_comp_flags=True, cross_compilers=False, cross_path=True) env = self.get_env(cross_comp_flags=True, cross_compilers=False, cross_path=True)
self.set_configure_env(env) self.set_configure_env(env)
run_command(command, self.build_path, context, env=env) run_command(command, self.build_path, context, env=env)
@ -497,13 +500,13 @@ class MesonBuilder(Builder):
buildEnv=self.buildEnv, buildEnv=self.buildEnv,
cross_option=cross_option cross_option=cross_option
) )
env = self.buildEnv.get_env(cross_comp_flags=False, cross_compilers=False, cross_path=True) env = self.get_env(cross_comp_flags=False, cross_compilers=False, cross_path=True)
run_command(command, self.source_path, context, env=env) run_command(command, self.source_path, context, env=env)
def _compile(self, context): def _compile(self, context):
context.try_skip(self.build_path) context.try_skip(self.build_path)
command = "{} -v".format(neutralEnv('ninja_command')) command = "{} -v".format(neutralEnv('ninja_command'))
env = self.buildEnv.get_env(cross_comp_flags=False, cross_compilers=False, cross_path=True) env = self.get_env(cross_comp_flags=False, cross_compilers=False, cross_path=True)
run_command(command, self.build_path, context, env=env) run_command(command, self.build_path, context, env=env)
def _test(self, context): def _test(self, context):
@ -514,18 +517,18 @@ class MesonBuilder(Builder):
): ):
raise SkipCommand() raise SkipCommand()
command = "{} --verbose {}".format(neutralEnv('mesontest_command'), self.test_option) command = "{} --verbose {}".format(neutralEnv('mesontest_command'), self.test_option)
env = self.buildEnv.get_env(cross_comp_flags=False, cross_compilers=False, cross_path=True) env = self.get_env(cross_comp_flags=False, cross_compilers=False, cross_path=True)
run_command(command, self.build_path, context, env=env) run_command(command, self.build_path, context, env=env)
def _install(self, context): def _install(self, context):
context.try_skip(self.build_path) context.try_skip(self.build_path)
command = "{} -v install".format(neutralEnv('ninja_command')) command = "{} -v install".format(neutralEnv('ninja_command'))
env = self.buildEnv.get_env(cross_comp_flags=False, cross_compilers=False, cross_path=True) env = self.get_env(cross_comp_flags=False, cross_compilers=False, cross_path=True)
run_command(command, self.build_path, context, env=env) run_command(command, self.build_path, context, env=env)
def _make_dist(self, context): def _make_dist(self, context):
command = "{} -v dist".format(neutralEnv('ninja_command')) command = "{} -v dist".format(neutralEnv('ninja_command'))
env = self.buildEnv.get_env(cross_comp_flags=False, cross_compilers=False, cross_path=True) env = self.get_env(cross_comp_flags=False, cross_compilers=False, cross_path=True)
run_command(command, self.build_path, context, env=env) run_command(command, self.build_path, context, env=env)
@ -552,5 +555,5 @@ class GradleBuilder(Builder):
command = command.format( command = command.format(
gradle_target=self.gradle_target, gradle_target=self.gradle_target,
gradle_option=self.gradle_option) gradle_option=self.gradle_option)
env = self.buildEnv.get_env(cross_comp_flags=False, cross_compilers=True, cross_path=True) env = self.get_env(cross_comp_flags=False, cross_compilers=True, cross_path=True)
run_command(command, self.build_path, context, env=env) run_command(command, self.build_path, context, env=env)