diff --git a/scripts/macpython-build-common.sh b/scripts/macpython-build-common.sh index a6d6d31..982a0c0 100644 --- a/scripts/macpython-build-common.sh +++ b/scripts/macpython-build-common.sh @@ -69,6 +69,10 @@ for PYBIN in "${PYBINARIES[@]}"; do VENVS+=(${VENV}) done +# ----------------------------------------------------------------------- +SKBUILD_DIR=_skbuild + + # ----------------------------------------------------------------------- # Ensure that requirements are met brew update diff --git a/scripts/macpython-build-module-wheels.sh b/scripts/macpython-build-module-wheels.sh index 8b6d491..b857a53 100755 --- a/scripts/macpython-build-module-wheels.sh +++ b/scripts/macpython-build-module-wheels.sh @@ -45,8 +45,17 @@ fi # ----------------------------------------------------------------------- # These variables are set in common script: # +# * CMAKE_EXECUTABLE +# * CMAKE_OPTIONS +# * MACPYTHON_PY_PREFIX +# * PYBINARIES +# * PYTHON_VERSIONS +# * NINJA_EXECUTABLE +# * SCRIPT_DIR +# * SKBUILD_DIR +# * VENVS=() + MACPYTHON_PY_PREFIX="" -# PYBINARIES="" # unused SCRIPT_DIR="" VENVS=() @@ -105,7 +114,7 @@ for VENV in "${VENVS[@]}"; do -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \ ${CMAKE_OPTIONS} \ || exit 1 - # ${Python3_EXECUTABLE} setup.py clean # Permission denied + # rm -r ${SKBUILD_DIR} # Permission denied done for wheel in $PWD/dist/*.whl; do diff --git a/scripts/macpython-build-wheels.sh b/scripts/macpython-build-wheels.sh index fb25cec..d1dfd43 100755 --- a/scripts/macpython-build-wheels.sh +++ b/scripts/macpython-build-wheels.sh @@ -19,6 +19,16 @@ # ----------------------------------------------------------------------- # These variables are set in common script: # +# * CMAKE_EXECUTABLE +# * CMAKE_OPTIONS +# * MACPYTHON_PY_PREFIX +# * PYBINARIES +# * PYTHON_VERSIONS +# * NINJA_EXECUTABLE +# * SCRIPT_DIR +# * SKBUILD_DIR +# * VENVS=() + MACPYTHON_PY_PREFIX="" PYBINARIES="" SCRIPT_DIR="" @@ -136,7 +146,7 @@ for VENV in "${VENVS[@]}"; do -DITK_WRAP_DOC:BOOL=ON \ ${CMAKE_OPTIONS} # Cleanup - ${Python3_EXECUTABLE} setup.py clean + rm -r ${SKBUILD_DIR} else @@ -199,7 +209,7 @@ for VENV in "${VENVS[@]}"; do ${CMAKE_OPTIONS} \ || exit 1 # Cleanup - ${Python3_EXECUTABLE} setup.py clean + rm -r ${SKBUILD_DIR} done fi