Skip to content

Commit b1a9482

Browse files
committed
Allow absolute build paths
1 parent 88c2c10 commit b1a9482

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

spin/cmds/meson.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,9 @@ def _check_coverage_tool_installation(coverage_type: GcovReportFormat, build_dir
234234
"-C",
235235
"--build-dir",
236236
default="build",
237-
help="Meson build directory; package is installed into './{build-dir}-install'",
237+
show_envvar=True,
238+
envvar="SPIN_BUILD_DIR",
239+
help="Meson build directory; package is installed into './{build-dir}-install'.",
238240
)
239241

240242

@@ -279,13 +281,14 @@ def build(
279281
280282
CFLAGS="-O0 -g" spin build
281283
282-
Build into a different build/build-install directory:
284+
Build into a different build/build-install directory via the
285+
`-C/--build-dir` flag:
283286
284287
spin build -C build-for-feature-x
285288
286289
This feature is useful in combination with a shell alias, e.g.:
287290
288-
$ alias spin-clang="spin -C build-clang"
291+
$ alias spin-clang="SPIN_BUILD_DIR=build-clang CC=clang spin"
289292
290293
Which can then be used to build (`spin-clang build`), to test (`spin-clang test ...`), etc.
291294
@@ -350,7 +353,9 @@ def build(
350353
"-C",
351354
build_dir,
352355
"--destdir",
353-
f"../{install_dir}",
356+
install_dir
357+
if os.path.isabs(install_dir)
358+
else os.path.join("..", install_dir),
354359
],
355360
output=(not quiet) and verbose,
356361
)

spin/color_format.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def write_dl(self, items):
3636
},
3737
default={"bold": True, "fg": "cyan"},
3838
)
39-
val_fmt = RegexpFormatter({r"\[default: .*?\]": {"dim": True}})
39+
val_fmt = RegexpFormatter({r"\[(env var: .*?; )?default: .*?\]": {"dim": True}})
4040
items = [(key_fmt(key), val_fmt(val)) for (key, val) in items]
4141
super().write_dl(items)
4242

0 commit comments

Comments
 (0)