Skip to content

Commit

Permalink
* remove meson --wipe command
Browse files Browse the repository at this point in the history
  • Loading branch information
jdhughes-usgs committed Jun 14, 2024
1 parent 67e1d67 commit c15446d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
4 changes: 3 additions & 1 deletion pymake/pymake_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,11 @@ def main(
if meson:
if not inplace:
inplace = True
makeclean = False
print(
f"Using meson to build {os.path.basename(target)}, "
+ "resetting inplace to True"
+ "resetting inplace to True and "
+ "makeclean to False."
)

if srcdir is not None and target is not None:
Expand Down
3 changes: 2 additions & 1 deletion pymake/pymake_build_apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ def build_apps(
shutil.rmtree(pth)

# set object to clean after each build
pmobj.makeclean = True
if not pmobj.meson:
pmobj.makeclean = True

# reset variables based on passed args
if download_dir is not None:
Expand Down
4 changes: 3 additions & 1 deletion pymake/utils/_meson_build.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import shutil
from contextlib import contextmanager
from pathlib import Path

Expand Down Expand Up @@ -197,7 +198,8 @@ def meson_setup(
command_list.append(f"--bindir={libdir}")

if os.path.isdir(build_dir):
command_list.append("--wipe")
shutil.rmtree(build_dir)
# command_list.append("--wipe")

command = " ".join(command_list)
print(f"\n{command}\n")
Expand Down

0 comments on commit c15446d

Please sign in to comment.