Script: modify build appimage

Author: KangLin

.github/workflows/docker.yml

@@ -117,12 +117,14 @@ jobs:
           fi
           ./Script/build_linux.sh --docker --docker-image="${docker_image}" --docker-platform="${{matrix.variant.platform}}" --${{matrix.variant.PACKAGE}}
           if [ "${{matrix.variant.PACKAGE}}" = "deb" ]; then
+            echo "Copy deb package ......"
             pushd ${{github.workspace}}/build_linux/
             export ARCH=`dpkg --print-architecture`
             cp serialportassistant_*.deb serialportassistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.variant.image}}_${{matrix.variant.lable}}_${ARCH}.deb
             popd
           fi
           if [ "${{matrix.variant.PACKAGE}}" = "appimage" ]; then
+            echo "Package appimage ......"
             pushd ${{env.BUILD_DIR}}/build_linux
             mv install SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_Linux_${ARCH}_Setup
             zip SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_Linux_${ARCH}_Setup.zip SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_Linux_${ARCH}_Setup/*

Package/debian/control

@@ -0,0 +1 @@
+/home/SerialPortAssistant/Package/debian/control.ubuntu.22

Package/debian/rules

@@ -28,13 +28,14 @@ PACKAGE_DIR = "debian/serialportassistant"
 override_dh_auto_configure:
 	# See: man dh_auto_configure an debhelper
 	dh_auto_configure -B$(BUILD_DIR) -- \
-        -DCMAKE_INSTALL_PREFIX=/opt/SerialPortAssistant \
-        -DRabbitCommon_ROOT=${RabbitCommon_ROOT} \
-	    -DCMAKE_BUILD_TYPE=Release \
-		-DCMARK_SHARED=OFF \
-        -DCMARK_TESTS=OFF \
-	    -DCMARK_STATIC=ON \
-        ${PARAS}
+	-DCMAKE_INSTALL_PREFIX=/opt/SerialPortAssistant \
+	-DRabbitCommon_ROOT=${RabbitCommon_ROOT} \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMARK_SHARED=OFF \
+	-DCMARK_TESTS=OFF \
+	-DCMARK_STATIC=ON \
+	-DWITH_CMARK=OFF \
+	-DWITH_CMARK_GFM=OFF ${PARAS}
 
 override_dh_auto_build:
 	cmake --build $(BUILD_DIR) --config Release --parallel $(nproc)

Script/build_appimage.sh

@@ -187,7 +187,7 @@ cmake "$REPO_ROOT" \
   -DCMARK_TESTS=OFF \
   -DCMARK_STATIC=ON \
   -DWITH_CMARK=OFF \
-  -DWITH_CMARK_GFM=ON \
+  -DWITH_CMARK_GFM=OFF \
   -DENABLE_UPDATE_TRANSLATIONS=ON \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_POLICY_VERSION_MINIMUM=3.5

Script/build_depend.sh

@@ -346,7 +346,14 @@ if [ $BASE_LIBS -eq 1 ]; then
         # RabbitCommon dependency
         apt install -y -q libcmark-dev cmark
         # AppImage
-        apt install -y -q libfuse-dev libfuse3-dev
+        case "$DISTRO_VERSION" in
+            26.*|25.*)
+                package_install fuse3
+                ;;
+            *)
+                package_install fuse
+                ;;
+        esac
     fi
 
     if [ "$PACKAGE_TOOL" = "dnf" ]; then
@@ -360,19 +367,7 @@ if [ $DEFAULT_LIBS -eq 1 ]; then
     echo "Install default dependency libraries ......"
     if [ "$PACKAGE_TOOL" = "apt" ]; then
         if [ "${QT:-0}" -ne 1 ]; then
-            # Qt6
-            package_install qmake6 qt6-tools-dev qt6-tools-dev-tools \
-                qt6-base-dev qt6-base-dev-tools qt6-qpa-plugins \
-                qt6-svg-dev qt6-l10n-tools qt6-translations-l10n \
-                qt6-scxml-dev
-            case "${DISTRO}:${DISTRO_VERSION}" in
-                ubuntu:26.*|ubuntu:25.*)
-                    package_install qt6-serialport-dev
-                    ;;
-                *)
-                    package_install libqt6serialport6-dev
-                    ;;
-            esac
+            install_debian_depend $REPO_ROOT
         fi
     fi
     if [ "$PACKAGE_TOOL" = "dnf" ]; then

Script/build_linux.sh

@@ -491,17 +491,10 @@ if [ $APPIMAGE -eq 1 ]; then
         git config --global --add safe.directory $REPO_ROOT
     fi
 
-    export QT_ROOT=${TOOLS_DIR}/qt_`uname -m`
-    export Qt6_DIR=$QT_ROOT
-    export QMAKE=$QT_ROOT/bin/qmake
-    export PATH=$QT_ROOT/libexec:$PATH
-    export PKG_CONFIG_PATH=$QT_ROOT/lib/pkgconfig:${INSTALL_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH
-    export LD_LIBRARY_PATH=$QT_ROOT/lib:${INSTALL_DIR}/lib:$LD_LIBRARY_PATH
-    export QT_PLUGIN_PATH=$QT_ROOT/plugins
-    export CMAKE_PREFIX_PATH=$QT_ROOT:${INSTALL_DIR}:${CMAKE_PREFIX_PATH}
     export RabbitCommon_ROOT=${SOURCE_DIR}/RabbitCommon
-    export BUILD_FREERDP=ON
-    apt install -y -q fuse3
+    export PKG_CONFIG_PATH=${INSTALL_DIR}/${LIB_PATH}/pkgconfig:$PKG_CONFIG_PATH
+    export LD_LIBRARY_PATH=${INSTALL_DIR}/${LIB_PATH}:$LD_LIBRARY_PATH
+    export CMAKE_PREFIX_PATH=${INSTALL_DIR}:${CMAKE_PREFIX_PATH}
     ./build_appimage.sh --install ${INSTALL_DIR} --verbose ${BUILD_VERBOSE}
 fi
 

Script/common.sh

@@ -321,10 +321,13 @@ create_debian_folder() {
                     control_source="$repo_root/Package/debian/control.deepin.23"
                     ;;
                 *)
-                    control_source="$repo_root/Package/debian/control.default"
+                    echo_error "Don't support ${DISTRO}:${DISTRO_VERSION}"
                     ;;
             esac
             if [ -f "$control_source" ]; then
+                if [ -f $repo_root/debian/control ]; then
+                    rm $repo_root/debian/control
+                fi
                 ln -s $control_source $repo_root/debian/control
                 if [ "$BUILD_VERBOSE" = "ON" ]; then
                     echo "ln -s $control_source $repo_root/debian/control"

debian

@@ -0,0 +1 @@
+/home/SerialPortAssistant/Package/debian