Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add maintainer command to use xmu #80

Merged
merged 1 commit into from
Sep 10, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 56 additions & 1 deletion xbstrap/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import json
import os
import shutil
import subprocess
import sys
import tarfile
import urllib.parse
Expand Down Expand Up @@ -820,7 +821,7 @@ def do_rolling_determine(args):

def do_prereqs(args):
comps = set(args.components)
valid_comps = ["cbuildrt", "xbps"]
valid_comps = ["cbuildrt", "xbps", "xmu"]
if not comps.issubset(valid_comps):
raise RuntimeError(f"Unknown component given; choose from: {valid_comps}")

Expand Down Expand Up @@ -853,6 +854,36 @@ def do_prereqs(args):
if os.path.dirname(info.name) == "./usr/bin":
info.name = os.path.basename(info.name)
tar.extract(info, bin_dir)
if "xmu" in comps:
info_url = (
"https://api.github.com/repos/managarm/xbstrap-maintainer-utilities/releases/latest"
)
releases = json.load(urllib.request.urlopen(info_url))
url = releases["tarball_url"]
tar_path = os.path.join(home, f"xmu-{releases['name']}.tar.gz")

_util.log_info(f"Downloading xmu {releases['name']} from {url} to {tar_path}")
_util.interactive_download(url, tar_path)
with tarfile.open(tar_path, "r") as tar:
for info in tar:
if "/" not in info.name:
commit = info.name[-7:]
tar.extract(info, bin_dir)

extract_dir = os.path.join(bin_dir, f"managarm-xbstrap-maintainer-utilities-{commit}")
dest_dir = os.path.join(bin_dir, "xmu")

xbstrap.base.try_rmtree(dest_dir)
shutil.move(extract_dir, dest_dir)
if shutil.which("npm") is None:
_util.log_err("npm not found")
return
_util.log_info("Installing xmu with npm")
proc = subprocess.Popen(["npm", "install"], cwd=dest_dir)
no92 marked this conversation as resolved.
Show resolved Hide resolved
proc.wait()
if proc.returncode != 0:
_util.log_err(f"Installation of xmu failed with status code {proc.returncode}")
xbstrap.base.try_unlink(tar_path)


do_prereqs.parser = main_subparsers.add_parser("prereqs")
Expand Down Expand Up @@ -918,6 +949,28 @@ def resolve_host_paths(x):
# ----------------------------------------------------------------------------------------


def do_maintainer(args):
cfg = config_for_args(args)
xmu_dir = os.path.join(_util.find_home(), "bin", "xmu")
if not os.access(os.path.join(xmu_dir, "xmu.js"), os.F_OK):
_util.log_err("The maintainer utilities are not installed.")
_util.log_info("Try running `xbstrap prereqs xmu` to install them.")
return
proc = subprocess.Popen(
[os.path.join(xmu_dir, "xmu.js")] + args.args, cwd=os.path.abspath(cfg.source_root)
)
avdgrinten marked this conversation as resolved.
Show resolved Hide resolved
avdgrinten marked this conversation as resolved.
Show resolved Hide resolved
proc.wait()
if proc.returncode != 0:
_util.log_err(f"xmu returned with status {proc.returncode}")


do_maintainer.parser = main_subparsers.add_parser("maintainer")
do_maintainer.parser.add_argument("args", type=str, nargs="*")
do_maintainer.parser.set_defaults(_impl=do_maintainer)

# ----------------------------------------------------------------------------------------


def do_execute_manifest(args):
if args.c is not None:
manifest = yaml.load(args.c, Loader=xbstrap.base.global_yaml_loader)
Expand Down Expand Up @@ -993,6 +1046,8 @@ def main():
do_run_task(args)
elif args.command == "lsp":
do_lsp(args)
elif args.command == "maintainer":
do_maintainer(args)
else:
assert not "Unexpected command"
except (
Expand Down
Loading