IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup Python detection in the runtime project file. Fixes #5444

Browse Source
This commit is contained in:
Dave Page
2020-05-04 10:20:51 +01:00
parent 908e156113
commit 94bd1f1680
6 changed files with 127 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/mac/build.sh
View File

@@ -82,7 +82,7 @@ _cleanup() {
rm -f ${DISTROOT}/pgadmin4*.dmg
}
_create_python_virtualenv() {
_create_venv() {
export PATH=${PGDIR}/bin:${PATH}
export LD_LIBRARY_PATH=${PGDIR}/lib:${LD_LIBRARY_PATH}
test -d ${BUILDROOT} || mkdir ${BUILDROOT} || exit 1
@@ -147,10 +147,9 @@ _create_python_virtualenv() {
}
_build_runtime() {
_create_python_virtualenv || exit 1
cd ${SOURCEDIR}/runtime
make clean
${QMAKE} || { echo qmake failed; exit 1; }
PGADMIN_PYTHON_DIR=${PYTHON_HOME} ${QMAKE} || { echo qmake failed; exit 1; }
make || { echo make failed; exit 1; }
cp -r pgAdmin4.app "${BUILDROOT}/${APP_BUNDLE_NAME}"
}
@@ -280,6 +279,7 @@ _codesign_dmg() {
_get_version || { echo Could not get versioning; exit 1; }
_cleanup
_create_venv || { echo venv creation failed; exit 1; }
_build_runtime || { echo Runtime build failed; exit 1; }
_build_doc
_complete_bundle