Skip to content

Commit

Permalink
Appveyor macos: We are now using python 3.9 which is the latest provi…
Browse files Browse the repository at this point in the history
…ded by

brew, appveyor and required by the latest Glib (which is required by
libsigrokdecode).

We want to fix the Python version to 3.8, until we figure out how to do it,
we will use Python 3.9 for MacOS installers.

Signed-off-by: AlexandraTrifan <[email protected]>
  • Loading branch information
AlexandraTrifan committed Oct 29, 2020
1 parent 5fa04d5 commit e02cebe
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion CI/appveyor/package_darwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ elif [ -e /usr/local/opt/python/Frameworks/Python.framework/Versions/3.6/Python
elif [ -e /usr/local/opt/python/Frameworks/Python.framework/Versions/3.8/Python ] ; then
pyversion=3.8
pythonidrpath="$(otool -D /usr/local/opt/python/Frameworks/Python.framework/Versions/3.8/Python | head -2 | tail -1)"
elif [ -e /usr/local/opt/python/Frameworks/Python.framework/Versions/3.9/Python ] ; then
pyversion=3.9
pythonidrpath="$(otool -D /usr/local/opt/python/Frameworks/Python.framework/Versions/3.9/Python | head -2 | tail -1)"
else
echo "No Python 3.8, 3.7 or 3.6 paths found"
echo "No Python 3.9, 3.8, 3.7 or 3.6 paths found"
exit 1
fi
libusbpath="$(otool -L ./Scopy.app/Contents/Frameworks/iio.framework/iio | grep libusb | cut -d " " -f 1)"
Expand All @@ -50,6 +53,8 @@ iioid=${iiorpath#"@rpath/"}
ad9361id=${ad9361rpath#"@rpath/"}
if [ "${pyversion}" = "3.8" ] ; then
pythonid=${pythonidrpath#"/usr/local/opt/[email protected]/Frameworks/"}
elif [ "${pyversion}" = "3.9" ] ; then
pythonid=${pythonidrpath#"/usr/local/opt/[email protected]/Frameworks/"}
else
pythonid=${pythonidrpath#"/usr/local/opt/python/Frameworks/"}
fi
Expand Down

0 comments on commit e02cebe

Please sign in to comment.