Make a Mana AppImage

3 files changed, 35 insertions, 11 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d95a96..ef5681b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ stages:
   - build
   - deploy
 
-# x86_64 AppImage buid
+# x86_64 AppImage build
 x86_64-AppImage:
   image: ubuntu:trusty
   stage: build
@@ -88,8 +88,8 @@ deb_pkg:
 
 
 # Mana Client 64bits AppImage build (unfinished)
-.mana64-AppImage:
-  image: ubuntu:trusty
+mana64-AppImage:
+  image: ubuntu:18.04
   stage: build
   tags:
     - gtmw
@@ -131,13 +131,17 @@ deploy-appImages:
     - md5sum ManaPlus-x86_64.AppImage | awk '{print $1}' > ManaPlus-x86_64.AppImage.md5
     - scp -P65001 -o StrictHostKeyChecking=no ManaPlus-x86_64.AppImage $MYHOST:$FILE_LOCATION
 #    - scp -P65001 -o StrictHostKeyChecking=no ManaPlus-i386.AppImage $MYHOST:$FILE_LOCATION
+    - scp -P65001 -o StrictHostKeyChecking=no Mana-x86_64.AppImage $MYHOST:$FILE_LOCATION
     # debs
     - scp -P65001 -o StrictHostKeyChecking=no manaplus_latest_amd64.deb $MYHOST:$FILE_LOCATION
     - scp -P65001 -o StrictHostKeyChecking=no manaplus-data_latest_all.deb $MYHOST:$FILE_LOCATION
     - scp -P65001 -o StrictHostKeyChecking=no manaplus-dbg_latest_amd64.deb $MYHOST:$FILE_LOCATION
     # checksums
     - scp -P65001 -o StrictHostKeyChecking=no x86_64-sha256checksum.txt $MYHOST:$FILE_LOCATION
+    - scp -P65001 -o StrictHostKeyChecking=no x86_64-mana-sha256checksum.txt $MYHOST:$FILE_LOCATION
 #    - scp -P65001 -o StrictHostKeyChecking=no i386-sha256checksum.txt $MYHOST:$FILE_LOCATION
     - scp -P65001 -o StrictHostKeyChecking=no deb-sha256checksum.txt $MYHOST:$FILE_LOCATION
     - scp -P65001 -o StrictHostKeyChecking=no ManaPlus-x86_64.AppImage.md5 $MYHOST:$FILE_LOCATION
+  only:
+    - master
 
diff --git a/build_appimg_mana.sh b/build_appimg_mana.sh
index 4cc4c13..4291d9a 100644
--- a/build_appimg_mana.sh
+++ b/build_appimg_mana.sh
@@ -34,11 +34,12 @@ make install
 # package
 mkdir AppDir
 
-cp -r $dir/run/share/games/mana/data AppDir/data
+cp -r $dir/run/share/mana/data AppDir/data
 cp ../../AppRun AppDir/AppRun
+sed -i 's/manaplus/mana/g' AppDir/AppRun
 
 ../../squashfs-root/AppRun --appdir AppDir \
--d ../../mana.desktop \
+-d ./run/share/applications/mana.desktop \
 -i ./data/icons/mana.svg \
 -e ./run/bin/mana \
 --output appimage
diff --git a/install_dependencies_mana.sh b/install_dependencies_mana.sh
index 9ad58ce..19d5eab 100644
--- a/install_dependencies_mana.sh
+++ b/install_dependencies_mana.sh
@@ -6,15 +6,34 @@ apt-get install -y wget
 
 # mana
 
+# TODO: Maybe xenial instead of trusty?
 sh -c 'echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> /etc/apt/sources.list'
 apt-get update -y -q
-apt-get -y -q build-dep manaplus
+#apt-get -y -q build-dep manaplus
 
-apt-get install -y -q g++ gcc git xsel make autoconf automake \
-    appstream-index libappstream0 libappstream-dev autopoint \
-    gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev \
-    libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev \
-    libsdl-ttf2.0-dev gdb valgrind netcat-openbsd procps zlibc fakeroot cmake dpkg-dev
+# apt install   
+apt-get install -y -q g++ gcc git xsel make cmake autoconf automake \
+    appstream-index libappstream-dev autopoint \
+    libegl1-mesa-dev libsdl1.2debian libsdl1.2-dev libgl1-mesa-dev libglu1-mesa-dev \
+    libegl1-mesa libgl1-mesa-glx libglu1-mesa libwayland-egl1-mesa \
+    gettext libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev \
+    libsdl2-net-dev libsdl2-ttf-dev libsdl2-gfx-dev libcurl4-openssl-dev \
+    libphysfs-dev libxml2-dev libguichan-dev gdb valgrind netcat-openbsd \
+    libsdl2-2.0 libgles2-mesa-dev libsdl2-gfx-1.0 libsdl2-ttf-2.0-0 libsdl2-net-2.0-0 \
+    libsdl2-image-2.0-0 libsdl2-mixer-2.0-0 libglapi-mesa \
+    procps zlibc fakeroot dpkg-dev
+
+## Code for Ubuntu 14.04 (cmake version error)
+#apt-get install -y -q g++ gcc git xsel make cmake autoconf automake \
+#    appstream-index libappstream0 libappstream-dev autopoint \
+#    libegl1-mesa-dev libsdl1.2debian libsdl1.2-dev libgl1-mesa-dev libglu1-mesa-dev \
+#    libegl1-mesa libegl1-mesa-drivers libgl1-mesa-glx libglu1-mesa libwayland-egl1-mesa \
+#    gettext libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev \
+#    libsdl2-net-dev libsdl2-ttf-dev libsdl2-gfx-dev libcurl4-openssl-dev \
+#    libphysfs-dev libxml2-dev libguichan-dev gdb valgrind netcat-openbsd \
+#    libsdl2-2.0 libgles2-mesa-dev libsdl2-gfx-1.0 libsdl2-ttf-2.0-0 libsdl2-net-2.0-0 \
+#    libsdl2-image-2.0-0 libsdl2-mixer-2.0-0 libglapi-mesa \
+#    procps zlibc fakeroot dpkg-dev
 
 # AppImage - linuxdeploy
 # seems to be not possible on docker because security restrictions