From f2fa0056cbadccf902f45dbd93a9c139924096b1 Mon Sep 17 00:00:00 2001 From: Akira Ohgaki <akiraohgaki@gmail.com> Date: Fri, 17 Nov 2017 01:11:16 +0900 Subject: [PATCH] Prebuild libappimageupdate --- .gitignore | 1 + scripts/build-docker.sh | 1 + scripts/import.sh | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index 04cf225..b8451a6 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 9cfb2a0..6cb671e 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 4227040..c047332 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 -- GitLab