billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle distTar not existing.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-24 03:30:38 +00:00
parent 2262b299cc
commit 815a6796fd
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ognibuild/buildsystem.py
View file

@ -536,31 +536,39 @@ class Gradle(BuildSystem):
if not self.executable.startswith('./'): if not self.executable.startswith('./'):
resolver.install([BinaryRequirement(self.executable)]) resolver.install([BinaryRequirement(self.executable)])
def _run(self, session, resolver, args, fixers): def _run(self, session, resolver, task, args, fixers):
self.setup(resolver) self.setup(resolver)
argv = []
if self.executable.startswith('./') and ( if self.executable.startswith('./') and (
not os.access(os.path.join(self.path, self.executable), os.X_OK)): not os.access(os.path.join(self.path, self.executable), os.X_OK)):
argv = ['sh', self.executable] argv.append('sh')
else: argv.extend([self.executable, task])
argv = [self.executable] argv.extend(args)
run_with_build_fixers(session, argv + args, fixers) try:
run_with_build_fixers(session, argv, fixers)
except UnidentifiedError as e:
if any([re.match(
r"Task '" + task + "' not found in root project '.*'\.",
line) for line in e.lines]):
raise NotImplementedError
raise
def clean(self, session, resolver, fixers): def clean(self, session, resolver, fixers):
self._run(session, resolver, ['clean'], fixers) self._run(session, resolver, 'clean', [], fixers)
def build(self, session, resolver, fixers): def build(self, session, resolver, fixers):
self._run(session, resolver, ['build'], fixers) self._run(session, resolver, 'build', [], fixers)
def test(self, session, resolver, fixers): def test(self, session, resolver, fixers):
self._run(session, resolver, ['test'], fixers) self._run(session, resolver, 'test', [], fixers)
def dist(self, session, resolver, fixers, quiet=False): def dist(self, session, resolver, fixers, quiet=False):
self._run(session, resolver, ['distTar'], fixers) self._run(session, resolver, 'distTar', [], fixers)
def install(self, session, resolver, fixers, install_target): def install(self, session, resolver, fixers, install_target):
raise NotImplementedError raise NotImplementedError
# TODO(jelmer): installDist just creates files under build/install/... # TODO(jelmer): installDist just creates files under build/install/...
self._run(session, resolver, ['installDist'], fixers) self._run(session, resolver, 'installDist', [], fixers)
class R(BuildSystem): class R(BuildSystem):