IntenseWebs/pgadmin4
3
0 Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2026-11-02 20:30:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure the Mac Appbundle builds correctly both with and without code signing.

Browse Source 
Correct current versions of Python/Qt while we're passing.
This commit is contained in:
Atira Odhner authored and Dave Page committed 2017-02-16 11:25:32 +00:00
1 parent 9ad1316990
commit e3041f1113
8 files changed
+108 -69
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pkg/mac/build.sh
+18 -4
View File
@@ -8,6 +8,14 @@ export BUILDROOT=$WD/../../mac-build
export DISTROOT=$WD/../../dist
export VIRTUALENV=venv
if [ ! -f $SOURCEDIR/pkg/mac/framework.conf ]; then
echo
echo "Error: pkg/mac/framework.conf not found!"
echo "Copy pkg/mac/framework.conf.in to pkg/mac/framework.conf and edit as required for the current system."
echo
exit 1
fi
if [ "x$PYTHON_HOME" == "x" ]; then
echo "PYTHON_HOME not set. Setting it to default"
export PYTHON_HOME=/System/Library/Frameworks/Python.framework/Versions/2.7
@@ -24,7 +32,7 @@ else
exit 1
fi
if [ "$PYTHON_VERSION" -gt "35" -a "$PYTHON_VERSION" -lt "26" ]; then
if [ "$PYTHON_VERSION" -gt "36" -a "$PYTHON_VERSION" -lt "26" ]; then
echo "Python version not supported"
exit 1
fi
@@ -41,7 +49,7 @@ fi
if [ "x$QTDIR" == "x" ]; then
echo "QTDIR not set. Setting it to default"
export QTDIR=~/Qt/5.7/clang_64
export QTDIR=~/Qt/5.8/clang_64
fi
export QMAKE=$QTDIR/bin/qmake
if ! $QMAKE --version > /dev/null 2>&1; then
@@ -175,9 +183,14 @@ _complete_bundle() {
find . -name *.pyc | xargs rm -f
}
_framework_config() {
cd $SOURCEDIR/pkg/mac
./framework-config.sh "$BUILDROOT/$APP_BUNDLE_NAME" || { echo "framework-config.sh failed"; exit 1; }
}
_codesign_bundle() {
cd $SOURCEDIR/pkg/mac
if [ ! -f codesign.conf ]; then
echo
echo "******************************************************************"
@@ -188,7 +201,7 @@ _codesign_bundle() {
return
fi
./codesign-bundle.sh "$BUILDROOT/$APP_BUNDLE_NAME" || { echo codesign-bundle.sh failed; exit 1; }
./codesign-bundle.sh "$BUILDROOT/$APP_BUNDLE_NAME" || { echo codesign-bundle.sh failed; exit 1; }
}
_create_dmg() {
@@ -219,6 +232,7 @@ _cleanup
_build_runtime || { echo Runtime build failed; exit 1; }
_build_doc
_complete_bundle
_framework_config
_codesign_bundle
_create_dmg
_codesign_dmg