AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #7411 from SomberNight/20210715_macos_build

Browse Source 
mac build: download python from python.org instead of using pyenv
This commit is contained in:
ThomasV
2021-07-16 15:46:12 +02:00
committed by GitHub
parent 4dd82cef74 4fd6282f51
commit 09f7d65b31
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -32,6 +32,7 @@ contrib/build-linux/sdist/fresh_clone/
contrib/build-linux/appimage/build/ contrib/build-linux/appimage/build/
contrib/build-linux/appimage/.cache/ contrib/build-linux/appimage/.cache/
contrib/build-linux/appimage/fresh_clone/ contrib/build-linux/appimage/fresh_clone/
contrib/osx/.cache/
contrib/android/fresh_clone contrib/android/fresh_clone
contrib/android/android_debug.keystore contrib/android/android_debug.keystore
contrib/secp256k1/ contrib/secp256k1/

25
contrib/osx/make_osx
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Parameterize # Parameterize
PYTHON_VERSION=3.7.10 PYTHON_VERSION=3.7.9
BUILDDIR=/tmp/electrum-build BUILDDIR=/tmp/electrum-build
PACKAGE=Electrum PACKAGE=Electrum
GIT_REPO=https://github.com/spesmilo/electrum GIT_REPO=https://github.com/spesmilo/electrum
@@ -16,6 +16,9 @@ export PYTHONDONTWRITEBYTECODE=1 # don't create __pycache__/ folders with .pyc
CONTRIB_OSX="$(dirname "$(realpath "$0")")" CONTRIB_OSX="$(dirname "$(realpath "$0")")"
CONTRIB="$CONTRIB_OSX/.." CONTRIB="$CONTRIB_OSX/.."
PROJECT_ROOT="$CONTRIB/.." PROJECT_ROOT="$CONTRIB/.."
CACHEDIR="$CONTRIB_OSX/.cache"
mkdir -p "$CACHEDIR"
cd "$PROJECT_ROOT" cd "$PROJECT_ROOT"
@@ -60,17 +63,19 @@ function DoCodeSignMaybe { # ARGS: infoName fileOrDirName
codesign -f -v $deep -s "$CODESIGN_CERT" $hardened_arg "$file" || fail "Could not code sign ${infoName}" codesign -f -v $deep -s "$CODESIGN_CERT" $hardened_arg "$file" || fail "Could not code sign ${infoName}"
} }
info "Installing Python $PYTHON_VERSION" info "Installing Python $PYTHON_VERSION"
export PATH="~/.pyenv/bin:~/.pyenv/shims:~/Library/Python/3.7/bin:$PATH" curl -o "$CACHEDIR/python-${PYTHON_VERSION}-macosx10.9.pkg" \
if [ -d "${HOME}/.pyenv" ]; then "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-macosx10.9.pkg"
pyenv update echo "bf54a14eef23467991e8c7a88c7307762e484c024a94ec1ee292ac1db3d41fc9 $CACHEDIR/python-${PYTHON_VERSION}-macosx10.9.pkg" | shasum -a 256 -c \
else || fail "python pkg checksum mismatched"
curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash > /dev/null 2>&1 sudo installer -pkg "$CACHEDIR/python-${PYTHON_VERSION}-macosx10.9.pkg" -target / \
|| fail "failed to install python"
# sanity check "python3" has the version we just installed.
FOUND_PY_VERSION=$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[:3])))')
if [[ "$FOUND_PY_VERSION" != "$PYTHON_VERSION" ]]; then
fail "python version mismatch: $FOUND_PY_VERSION != $PYTHON_VERSION"
fi fi
PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install -s $PYTHON_VERSION && \
pyenv global $PYTHON_VERSION || \
fail "Unable to use Python $PYTHON_VERSION"
break_legacy_easy_install break_legacy_easy_install