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

Find R path.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-23 21:03:44 +00:00
parent 33aa977763
commit 415a183d79
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ognibuild/buildsystem.py
View file

@ -40,6 +40,14 @@ from .requirements import (
OctavePackageRequirement, OctavePackageRequirement,
) )
from .fix_build import run_with_build_fixers from .fix_build import run_with_build_fixers
from .session import which
def guaranteed_which(session, resolver, name):
path = which(session, name)
if not path:
resolver.install([BinaryRequirement(name)])
return which(session, name)
class NoBuildToolsFound(Exception): class NoBuildToolsFound(Exception):
@ -571,13 +579,16 @@ class R(BuildSystem):
pass pass
def dist(self, session, resolver, fixers, quiet=False): def dist(self, session, resolver, fixers, quiet=False):
run_with_build_fixers(session, ["R", "CMD", "build", "."], fixers) r_path = guaranteed_which(session, resolver, "R")
run_with_build_fixers(session, [r_path, "CMD", "build", "."], fixers)
def install(self, session, resolver, fixers, install_target): def install(self, session, resolver, fixers, install_target):
run_with_build_fixers(session, ["R", "CMD", "INSTALL", "."], fixers) r_path = guaranteed_which(session, resolver, "R")
run_with_build_fixers(session, [r_path, "CMD", "INSTALL", "."], fixers)
def test(self, session, resolver, fixers): def test(self, session, resolver, fixers):
run_with_build_fixers(session, ["R", "CMD", "check", "."], fixers) r_path = guaranteed_which(session, resolver, "R")
run_with_build_fixers(session, [r_path, "CMD", "check", "."], fixers)
@classmethod @classmethod
def probe(cls, path): def probe(cls, path):