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

Attempt to ensure the runtime is built with the correct Python version.

Browse Source
This commit is contained in:
Dave Page 2018-02-20 10:44:01 +00:00
parent 8a56eb9cd0
commit 8148a61279
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci/build_runtime_qt4.sh
View File

@ -3,8 +3,14 @@
echo "EXECUTING: Build runtime - QT4" echo "EXECUTING: Build runtime - QT4"
echo echo
if [ ${PYTHON_VERSION:0:1} == "3" ]; then
CONFIG=/usr/local/python-$PYTHON_VERSION/bin/python-config3
else
CONFIG=/usr/local/python-$PYTHON_VERSION/bin/python-config
fi
cd $WORKSPACE/runtime cd $WORKSPACE/runtime
make clean make clean
PATH=/usr/local/python-$PYTHON_VERSION/bin:$PATH /bin/qmake-qt4 || { echo 'ERROR: Failed to run the QT4 qmake step.' ; exit 1; } PATH=/usr/local/python-$PYTHON_VERSION/bin:$PATH PYTHON_CONFIG=$CONFIG /bin/qmake-qt4 || { echo 'ERROR: Failed to run the QT4 qmake step.' ; exit 1; }
make all || { echo 'ERROR: Failed to build the QT4 runtime.' ; exit 1; } make all || { echo 'ERROR: Failed to build the QT4 runtime.' ; exit 1; }

8
ci/build_runtime_qt5.sh
View File

@ -3,8 +3,14 @@
echo "EXECUTING: Build runtime - QT5" echo "EXECUTING: Build runtime - QT5"
echo echo
if [ ${PYTHON_VERSION:0:1} == "3" ]; then
CONFIG=/usr/local/python-$PYTHON_VERSION/bin/python-config3
else
CONFIG=/usr/local/python-$PYTHON_VERSION/bin/python-config
fi
cd $WORKSPACE/runtime cd $WORKSPACE/runtime
make clean make clean
PATH=/usr/local/python-$PYTHON_VERSION/bin:$PATH /bin/qmake-qt5 DEFINES+=PGADMIN4_USE_WEBKIT || { echo 'ERROR: Failed to run the QT5 qmake step.' ; exit 1; } PATH=/usr/local/python-$PYTHON_VERSION/bin:$PATH PYTHON_CONFIG=$CONFIG /bin/qmake-qt5 DEFINES+=PGADMIN4_USE_WEBKIT || { echo 'ERROR: Failed to run the QT5 qmake step.' ; exit 1; }
make all || { echo 'ERROR: Failed to build the QT4 runtime.' ; exit 1; } make all || { echo 'ERROR: Failed to build the QT4 runtime.' ; exit 1; }