From 179090ceb257133129e7c495c2198090ec1cfa53 Mon Sep 17 00:00:00 2001 From: Konstantin Dmitriev Date: Dec 19 2019 12:15:32 +0000 Subject: Include python3-lxml into OSX package --- diff --git a/1-setup-osx-brew.sh b/1-setup-osx-brew.sh index c639f97..47b770c 100755 --- a/1-setup-osx-brew.sh +++ b/1-setup-osx-brew.sh @@ -57,7 +57,7 @@ if ! ( which pip >/dev/null ); then fi # Installing lxml using pip -STATIC_DEPS=true sudo pip install lxml +STATIC_DEPS=true sudo pip3 install lxml #HOMEBREW_NO_AUTO_UPDATE=1 brew bundle -no-upgrade --file=-<<-EOF diff --git a/3-package-osx-dmg.sh b/3-package-osx-dmg.sh index 7781190..9c19340 100755 --- a/3-package-osx-dmg.sh +++ b/3-package-osx-dmg.sh @@ -198,6 +198,11 @@ mkapp() "$SCRIPTPATH/autobuild/osx/relocate-binary.sh" "${MACPORTS}${PKG_PREFIX}/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Resources/Python.app/Contents/MacOS/Python" "$MACPORTS" "$APPCONTENTS" mkdir -p "${APPCONTENTS}/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/" rsync -av --exclude "__pycache__" "${MACPORTS}${PKG_PREFIX}/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/" "${APPCONTENTS}/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/" + pushd "${APPCONTENTS}/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/" > /dev/null + mkdir -p ../../../../../../lib/python3.6/site-packages + ln -sf ../../../../../../lib/python3.6/site-packages site-packages + popd > /dev/null + rsync -av --exclude "__pycache__" "/usr/local/lib/python${PYTHON_VERSION}/site-packages/lxml*" "${APPCONTENTS}/lib/python${PYTHON_VERSION}/site-packages/" #cp -R "${MACPORTS}${PKG_PREFIX}/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python3.3" "${APPCONTENTS}/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/" #find ${APPCONTENTS}/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib -name "__pycache__" -exec rm -rf {} \;