Add explicit build recipes & support for tkinter

Author: niess

.travis.yml

@@ -12,10 +12,10 @@ branches:
 
 matrix:
   include:
-    - env: ARCH=x86_64 OPENSSL=1.1.1c
+    - env: ARCH=x86_64
 
 install:
-  - docker build -t python-${ARCH} --build-arg Arch=${ARCH} --build-arg OpenSLL=${OPENSSL} .travis
+  - docker build -t python-${ARCH} --build-arg Arch=${ARCH} .travis
 
 script:
   - docker run --cap-add SYS_ADMIN --device /dev/fuse --mount src=$PWD,dst=/work,type=bind python-${ARCH}

.travis/Dockerfile

@@ -2,14 +2,13 @@ FROM ubuntu:trusty
 LABEL maintainer="https://github.com/niess"
 
 ARG Arch=x86_64
-ARG OpenSLL=1.1.1c
-ENV ARCH=${Arch} OPENSSL=${OpenSLL}
+ENV ARCH="${Arch}" OPENSSL="1.1.1c"
 
 RUN apt update -y -qq                                                       && \
     apt install --no-install-recommends -y -qq                                 \
         build-essential libssl-dev zlib1g-dev libncurses5-dev libncursesw5-dev \
         libreadline-dev libsqlite3-dev libgdbm-dev libdb5.3-dev libbz2-dev     \
-        libexpat1-dev liblzma-dev libffi-dev libfuse2 wget                  && \
+        libexpat1-dev liblzma-dev libffi-dev tk-dev libfuse2 wget           && \
     rm -rf /var/lib/apt/lists/*
 
 COPY . /work/.travis

.travis/script.sh

@@ -12,5 +12,9 @@ if [ -n "${OPENSSL}" ]; then
 fi
 
 
-DEBUG=true ./appimage/build-appimage.sh
+DEBUG=true ./appimage/build-plugin.sh
+DEBUG=true ./appimage/build-python.sh python2
+DEBUG=true ./appimage/build-python.sh python3
+DEBUG=true ./appimage/build-python.sh scipy
+
 python3 -m tests

appimage/build-appimage.sh appimage/build-plugin.shappimage/build-appimage.sh renamed to appimage/build-plugin.sh

@@ -31,7 +31,7 @@ pushd $BUILD_DIR
 
 
 # Build the AppImage
-appimagetool="appimagetool-$(arch).AppImage"
+appimagetool="appimagetool-${ARCH}.AppImage"
 
 if [ ! -f "${appimagetool}" ]; then
     url="https://github.com/AppImage/AppImageKit/releases/download/continuous"
@@ -46,11 +46,11 @@ cp -r "${REPO_ROOT}/share" "AppDir"
 
 pushd "AppDir"
 cp "${REPO_ROOT}/${EXEC_NAME}.sh" "."
-cp "${REPO_ROOT}/appimage/resources/"* "."
+cp "${REPO_ROOT}/appimage/resources/python.png" "${EXEC_NAME}.png"
+cp "${REPO_ROOT}/appimage/resources/plugin.desktop" "${EXEC_NAME}.desktop"
 ln -s "${EXEC_NAME}.png" ".DirIcon"
 popd
 
 ARCH="${ARCH}" ./"${appimagetool}" AppDir
-ls -lh
 popd
-mv "${BUILD_DIR}/${EXEC_NAME}-${ARCH}.AppImage" "appimage"
+mv "${BUILD_DIR}/${EXEC_NAME}-${ARCH}.AppImage" "${REPO_ROOT}/appimage"

appimage/build-python.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+
+if [ -z "$DEBUG" ] || [ "$DEBUG" -eq "0" ]; then
+    set -e
+else
+    set -ex
+fi
+
+
+REPO_ROOT=$(readlink -f $(dirname "$0")"/..")
+
+
+if [ -z "$1" ]; then
+    echo "no recipe specified. Aborting..."
+    exit 1
+fi
+if [ -f "$1" ]; then
+    source "$1"
+    filename=$(basename "$1")
+    name="${filename%.*}"
+else
+    source "${REPO_ROOT}/appimage/recipes/${1}.sh"
+    name="$1"
+fi
+
+export PYTHON_SOURCE="${PYTHON_SOURCE:-https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz}"
+export PIP_REQUIREMENTS
+
+
+ARCH="${ARCH:-$(arch)}"
+export ARCH="${ARCH}"
+
+
+# Setup a temporary work space
+if [ -z "${BUILD_DIR}" ]; then
+    BUILD_DIR=$(mktemp -d)
+
+    _cleanup() {
+        rm -rf "${BUILD_DIR}"
+    }
+
+    trap _cleanup EXIT
+else
+    BUILD_DIR=$(readlink -m "${BUILD_DIR}")
+    mkdir -p "${BUILD_DIR}"
+fi
+
+pushd $BUILD_DIR
+
+
+# Build the AppImage
+linuxdeploy="linuxdeploy-${ARCH}.AppImage"
+plugin="linuxdeploy-plugin-python-${ARCH}.AppImage"
+
+if [ ! -f "${linuxdeploy}" ]; then
+    url="https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous"
+    wget --no-check-certificate -q "${url}/${linuxdeploy}"
+    chmod u+x "${linuxdeploy}"
+fi
+
+if [ ! -f "${REPO_ROOT}/appimage/${plugin}" ]; then
+    ${REPO_ROOT}/appimage/build-plugin.sh
+fi
+cp "${REPO_ROOT}/appimage/${plugin}" "."
+
+exe="python${PYTHON_VERSION::3}"
+
+cp "${REPO_ROOT}/appimage/resources/python.desktop" "${name}.desktop"
+sed -i "s|[{][{]exe[}][}]|${exe}|g" "${name}.desktop"
+sed -i "s|[{][{]name[}][}]|${name}|g" "${name}.desktop"
+
+./"${linuxdeploy}" --appdir AppDir \
+                   --plugin python
+./"${linuxdeploy}" --appdir AppDir \
+                   -i "${REPO_ROOT}/appimage/resources/python.png" \
+                   -d "${name}.desktop" \
+                   -e "AppDir/usr/bin/.${exe}" \
+                   --custom-apprun "AppDir/usr/bin/${exe}" \
+                   --output "appimage"
+
+popd
+mv "${BUILD_DIR}/${name}-${ARCH}.AppImage" "${REPO_ROOT}/appimage"

appimage/recipes/python2.sh

@@ -0,0 +1,2 @@
+export PYTHON_VERSION="2.7.16"
+export PIP_REQUIREMENTS=

appimage/recipes/python3.sh

@@ -0,0 +1,2 @@
+export PYTHON_VERSION="3.7.3"
+export PIP_REQUIREMENTS=

appimage/recipes/scipy.sh

@@ -0,0 +1,5 @@
+export PYTHON_VERSION="3.7.3"
+export PIP_REQUIREMENTS="numpy scipy matplotlib"
+
+export LD_LIBRARY_PATH="AppDir/usr/lib/python3.7/site-packages/numpy/.libs:${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="AppDir/usr/lib/python3.7/site-packages/matplotlib/.libs:${LD_LIBRARY_PATH}"

…ources/linuxdeploy-plugin-python.desktop appimage/resources/plugin.desktopappimage/resources/linuxdeploy-plugin-python.desktop renamed to appimage/resources/plugin.desktop appimage/resources/linuxdeploy-plugin-python.desktop renamed to appimage/resources/plugin.desktop

@@ -0,0 +1,6 @@
+[Desktop Entry]
+Categories=Science;Engineering;
+Type=Application
+Icon=python
+Exec={{exe}}
+Name={{name}}