[appimage] other way to make an appimage

Author: Fabien-B

.github/workflows/appimage.yml

@@ -32,20 +32,16 @@ jobs:
 
       - name: build
         run: |
-          cmake -S pprzgcs -B build.appimage/pprzgcs -DCMAKE_INSTALL_PREFIX="AppDir/usr"
-          cmake --build build.appimage/pprzgcs -j$(nproc)
-          cmake --install build.appimage/pprzgcs
-
-      - name: Build AppImage
-        uses: paparazzi/build-appimage@master
-        env:
-          UPDATE_INFO: gh-releases-zsync|Fabien-B|PprzGCS|latest|*x86_64.AppImage.zsync
-        with:
-          recipe: pprzgcs/appimage-amd64.yml
+          ./pprzgcs/make_appimage.sh $(pwd)/build_appimage $(pwd)/pprzgcs
       - uses: actions/upload-artifact@v4
         with:
           name: AppImage_${{ env.PPRZGCS_VERSION }}
-          path: './*.AppImage*'
+          path: 'build_appimage/PprzGCS*.AppImage*'
+
+      - name: rename AppImage
+        run: |
+          find . -iname "*appimage*"
+          mv ./build_appimage/PprzGCS-x86_64.AppImage PprzGCS_${{ env.PPRZGCS_VERSION }}-x86_64.AppImage
 
 
       - name: make release
@@ -54,6 +50,6 @@ jobs:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
           files: |
-            *.AppImage
+            'PprzGCS_${{ env.PPRZGCS_VERSION }}-x86_64.AppImage'
 
 

CMakeLists.txt

@@ -26,12 +26,6 @@ endif()
 
 find_package(LibXml2 REQUIRED)
 
-if(NOT DEFAULT_APP_DATA_PATH)
-    set(DEFAULT_APP_DATA_PATH "/usr/${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}")
-endif()
-message("DEFAULT_APP_DATA_PATH set to ${DEFAULT_APP_DATA_PATH}")
-add_definitions(-DDEFAULT_APP_DATA_PATH="${DEFAULT_APP_DATA_PATH}")
-
 # Get current version
 execute_process(
     COMMAND ${CMAKE_SOURCE_DIR}/pprzgcs_version.sh

assets/org.paparazzi.pprzgcs.appdata.xml.in

@@ -5,7 +5,6 @@
   <name>PprzGCS</name>
   <summary>Paparazzi UAV GCS</summary>
   <launchable type="desktop-id">org.paparazzi.pprzgcs.desktop</launchable>
-  <screenshots/>
   <project_group>Paparazzi UAV</project_group>
   <provides>
     <binary>pprzgcs</binary>

assets/org.paparazzi.pprzgcs.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=PprzGCS
 Comment=GCS for PaparazziUAV
-Exec=/usr/bin/pprzgcs
+Exec=pprzgcs
 Terminal=false
 Type=Application
 Icon=pprzgcs

make_appimage.sh

@@ -0,0 +1,34 @@
+#! /bin/bash
+set -x
+set -e
+
+BUILD_DIR=$1
+REPO_ROOT=$2
+
+mkdir -p "$BUILD_DIR"
+rm -rf "$BUILD_DIR/*"
+
+# switch to build dir
+pushd "$BUILD_DIR"
+
+# configure build files with CMake
+# we need to explicitly set the install prefix, as CMake's default is /usr/local for some reason...
+cmake "$REPO_ROOT" -DCMAKE_INSTALL_PREFIX=/usr
+
+# build project and install files into AppDir
+cmake --build . -j $(nproc)
+make install DESTDIR=AppDir
+
+# now, build AppImage using linuxdeploy and linuxdeploy-plugin-qt
+# download linuxdeploy and its Qt plugin
+wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+
+ln -s $(which qmake6) qmake
+export PATH="$(pwd):$PATH"
+
+# make them executable
+chmod +x linuxdeploy*.AppImage
+
+# initialize AppDir, bundle shared libraries for QtQuickApp, use Qt plugin to bundle additional resources, and build AppImage, all in one single command
+./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt --output appimage

src/main.cpp

@@ -18,10 +18,6 @@
 #include "speaker.h"
 #endif
 
-#ifndef DEFAULT_APP_DATA_PATH
-#error "you need to define DEFAULT_APP_DATA_PATH!"
-#endif
-
 #ifndef PPRZGCS_VERSION
 #error "you need to define PPRZGCS_VERSION!"
 #endif
@@ -130,8 +126,9 @@ int main(int argc, char *argv[])
 
         auto data_path = QString(qgetenv("PPRZGCS_DATA_PATH"));
         if(data_path == "") {
-            data_path = DEFAULT_APP_DATA_PATH;
+            data_path = QCoreApplication::applicationDirPath() + "/../share/pprzgcs";
         }
+        qDebug() << "DATA_PATH: " << data_path;
         gconfig->setValue("APP_DATA_PATH", data_path);
 
         set_app_settings();

src/widgets/map/mapwidget.cpp

@@ -679,12 +679,12 @@ bool MapWidget::viewportEvent(QEvent *event) {
         QList<QTouchEvent::TouchPoint> touchPoints = touchEvent->touchPoints();
 
         for(auto &touchPoint: touchPoints) {
-            if(touchPoint.state() == Qt::TouchPointPressed) {
-                auto scenePos = mapToScene(touchPoint.pos().toPoint());
+            if(touchPoint.state() == QEventPoint::State::Pressed) {
+                auto scenePos = mapToScene(touchPoint.position().toPoint());
                 auto tp = tilePoint(scenePos, zoomLevel(zoom()), tileSize());
                 pms[touchPoint.id()] = Point2DPseudoMercator(tp);
             }
-            else if(touchPoint.state() == Qt::TouchPointReleased && pms.contains(touchPoint.id())) {
+            else if(touchPoint.state() == QEventPoint::State::Released && pms.contains(touchPoint.id())) {
                 pms.remove(touchPoint.id());
             }
         }
@@ -703,7 +703,7 @@ bool MapWidget::viewportEvent(QEvent *event) {
                 return true;
             }
 
-            auto px_dist = QVector2D(tp1->pos() - tp0->pos()).length();
+            auto px_dist = QVector2D(tp1->position() - tp0->position()).length();
 
             for(int zo=0; zo<25; zo++) {
                 auto pt1 = scenePoint(pms[id0], zo, tileSize());
@@ -714,18 +714,18 @@ bool MapWidget::viewportEvent(QEvent *event) {
                     double s = px_dist/dist;
                     double new_zoom = zo + log2(s);
 
-                    auto center = (tp1->pos() + tp0->pos())/2;
+                    auto center = (tp1->position() + tp0->position())/2;
                     auto pmc = (pms[id0] + pms[id1])/2;
                     zoomCenteredScene(new_zoom, center.toPoint(), pmc);
                     updateGraphics(UpdateEvent::MAP_ZOOMED|UpdateEvent::MAP_MOVED|UpdateEvent::MAP_ROTATED);
                     break;
                 }
             }
             return true;
-        } else if(touchPoints.count() == 1 && touchPoints.first().state() == Qt::TouchPointMoved) {
+        } else if(touchPoints.count() == 1 && touchPoints.first().state() == QEventPoint::State::Updated) {
             //Pan only
             auto pm = pms[touchPoints.first().id()];
-            auto pos = touchPoints.first().pos().toPoint();
+            auto pos = touchPoints.first().position().toPoint();
             zoomCenteredScene(zoom(), pos, pm);
             return true;
         }
@@ -807,7 +807,7 @@ void MapWidget::dropEvent(QDropEvent *event) {
             scale,
         };
 
-        Papget* papget = new Papget(datadef, event->pos());
+        Papget* papget = new Papget(datadef, event->position().toPoint());
         scene()->addItem(papget);
         papget->setZValue(1000);
         papgets.append(papget);