Add flag to specify if GTK builds are supported

This commit is contained in:
Robin Dunn
2019-06-28 16:02:12 -07:00
parent 1d7e08ff09
commit 4a0436ae7c
5 changed files with 18 additions and 1 deletions

View File

@@ -32,6 +32,11 @@ if [ "$TARBALL" == "" ]; then
exit 1
fi
if [ $PYENV != all -a ! -d ~/venv/$PYENV ]; then
echo "ERROR: The $PYENV environment not found in the $DIST_NAME image."
exit 1
fi
# This function is called to do each build.
# It is given the Python virtualenv to be used, a tag (gtk2 or gtk3) to be
@@ -42,6 +47,11 @@ function do_build {
TAG=$2
FLAG=$3
if [ $TAG = gtk2 -a $GTK2_OK = no ]; then
echo "The $DIST_NAME image does not support building for GTK2."
return
fi
rm -rf ~/wxPython-*
# setup
@@ -68,7 +78,6 @@ function do_build {
python build.py $FLAG build_wx build_py bdist_wheel
# copy the results back to the host's shared dist folder
WXPYVER=$(python -c "import buildtools; buildtools.printVersion()")
DEST=/dist/linux/$TAG/$DIST_NAME
mkdir -p $DEST
mv dist/*.whl $DEST

View File

@@ -4,3 +4,8 @@ echo " User: " $(whoami)
echo " ~/bin: " $(ls ~/bin)
echo " ~/venvs:" $(ls ~/venvs)
echo " /dist: " $(ls /dist)
echo ""
if [ -x /usr/bin/lsb_release ]; then
/usr/bin/lsb_release -a
fi

View File

@@ -8,6 +8,7 @@ ENV USER=wxpy
ENV HOME=/home/$USER
ENV PYTHONUNBUFFERED=1
ENV PATH=$HOME/bin:$PATH
ENV GTK2_OK=yes
# Update and install basic OS packages
RUN \

View File

@@ -8,6 +8,7 @@ ENV USER=wxpy
ENV HOME=/home/$USER
ENV PYTHONUNBUFFERED=1
ENV PATH=$HOME/bin:$PATH
ENV GTK2_OK=yes
# Update and install basic OS packages
RUN \

View File

@@ -8,6 +8,7 @@ ENV USER=wxpy
ENV HOME=/home/$USER
ENV PYTHONUNBUFFERED=1
ENV PATH=$HOME/bin:$PATH
ENV GTK2_OK=yes
# Update and install basic OS packages
RUN \