Add an appbundle-webkit build target to build an appbundle, but force the use of QtWebKit.

This commit is contained in:
Dave Page
2017-04-05 12:35:07 +01:00
parent ee17c77093
commit 53c4e2df3b
2 changed files with 9 additions and 1 deletions

View File

@@ -25,6 +25,9 @@ pip: docs
appbundle: docs appbundle: docs
./pkg/mac/build.sh ./pkg/mac/build.sh
appbundle-webkit: docs
PGADMIN4_USE_WEBKIT=1 ./pkg/mac/build.sh
src: src:
./pkg/src/build.sh ./pkg/src/build.sh

View File

@@ -133,7 +133,12 @@ _create_python_virtualenv() {
_build_runtime() { _build_runtime() {
_create_python_virtualenv || exit 1 _create_python_virtualenv || exit 1
cd $SOURCEDIR/runtime cd $SOURCEDIR/runtime
make clean
if [ "$PGADMIN4_USE_WEBKIT" == "1" ]; then
$QMAKE DEFINES+=PGADMIN4_USE_WEBKIT || { echo qmake failed; exit 1; }
else
$QMAKE || { echo qmake failed; exit 1; } $QMAKE || { echo qmake failed; exit 1; }
fi
make || { echo make failed; exit 1; } make || { echo make failed; exit 1; }
cp -r pgAdmin4.app "$BUILDROOT/$APP_BUNDLE_NAME" cp -r pgAdmin4.app "$BUILDROOT/$APP_BUNDLE_NAME"
} }