Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions scripts/macpython-build-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ for PYBIN in "${PYBINARIES[@]}"; do
VENVS+=(${VENV})
done

# -----------------------------------------------------------------------
SKBUILD_DIR=_skbuild


# -----------------------------------------------------------------------
# Ensure that requirements are met
brew update
Expand Down
13 changes: 11 additions & 2 deletions scripts/macpython-build-module-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=()

Expand Down Expand Up @@ -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
Expand Down
14 changes: 12 additions & 2 deletions scripts/macpython-build-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down