diff --git a/.gitignore b/.gitignore index 04cf225adbfcca7769ad85a2daea6d4f54aab3de..b8451a656514cbf0233c784684bb42a23fd28e1b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ build_*/ lib/qtlib/ lib/AppImageUpdate/ +lib/AppImageUpdate-prebuilt/ diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh index 9cfb2a04fbefcb2325e8234534b7f4b2beb7eda0..6cb671e782d65c2ac1eb5d4a0f0d9deb27a0611b 100644 --- a/scripts/build-docker.sh +++ b/scripts/build-docker.sh @@ -37,6 +37,7 @@ build_appimage() { # docker-image: ubuntu:17.10 apt update -qq apt -y install build-essential qt5-default libqt5websockets5-dev + apt -y install cmake libcurl4-gnutls-dev libxpm-dev apt -y install libssl1.0.0 zlib1g apt -y install git apt -y install curl diff --git a/scripts/import.sh b/scripts/import.sh index 4227040c15e71b1c3aeee6d0ae81166362b305ef..c04733215918252e9054d44f8b113b5ed7c6af61 100644 --- a/scripts/import.sh +++ b/scripts/import.sh @@ -10,3 +10,10 @@ if [ ! -d "${PROJDIR}/lib/AppImageUpdate" ]; then git clone https://github.com/AppImage/AppImageUpdate.git -b continuous --single-branch --depth=1 "${PROJDIR}/lib/AppImageUpdate" git -C "${PROJDIR}/lib/AppImageUpdate" submodule update --init --recursive --depth=1 fi + +if [ ! -d "${PROJDIR}/lib/AppImageUpdate-prebuilt" ]; then + mkdir "${PROJDIR}/lib/AppImageUpdate-prebuilt" + cd "${PROJDIR}/lib/AppImageUpdate-prebuilt" + cmake "${PROJDIR}/lib/AppImageUpdate" -DUSE_SYSTEM_CURL=OFF -DBUILD_CPR_TESTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo + make libappimageupdate +fi