update linuxdeployqt

cipig · Dec 20, 2024 · f9dc2c9 · f9dc2c9
1 parent de252b2
commit f9dc2c9
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -88,4 +88,9 @@ atomic_legacy_imgui
 .vscode/settings.json
 .vscode/tasks.json
 bundled
-build.log
+build.log
+.venv/*
+ci_tools_atomic_dex/cmake-3.19.0-rc3-Linux-x86_64/*
+ci_tools_atomic_dex/cmake-3.19.0-rc3-Linux-x86_64
+cmake-3.19.0-rc3-Linux-x86_64/*
+cmake-3.19.0-rc3-Linux-x86_64
diff --git a/Dockerfile b/Dockerfile
@@ -37,6 +37,7 @@ RUN apt-get update -y && \
     libtool \
     autoconf \
     unzip \
+    fuse \
     libfuse2 \
     libssl-dev \
     libxkbcommon-x11-0 \
@@ -73,6 +74,8 @@ RUN apt-get update -y && \
     libnss3-dev \
     libnspr4-dev \
     libgstreamer-plugins-base1.0-dev \
+    libqt5charts5-dev \
+    libqt5webchannel5-dev \
     libasound2-dev
 
 RUN git config --global --add safe.directory /build/komodo-wallet-desktop
@@ -86,9 +89,10 @@ ENV CC=clang-12
 
 # Install Qt
 RUN python3 -m venv /build/.venv && \
-    /build/.venv/bin/pip install aqtinstall==3.1.1 && \
+    /build/.venv/bin/pip install aqtinstall && \
     /build/.venv/bin/python -m aqt install-qt linux desktop 5.15.2 -O $HOME/Qt -b https://qt-mirror.dannhauer.de/ -m qtcharts debug_info qtwebengine
 
+
 ENV DEBIAN_FRONTEND=noninteractive
 ENV SHELL=/bin/bash
 ENV QT_INSTALL_CMAKE_PATH=/root/Qt/5.15.2/gcc_64/lib/cmake

diff --git a/ci_tools_atomic_dex/linux_misc/linuxdeployqt-continuous-x86_64.AppImage b/ci_tools_atomic_dex/linux_misc/linuxdeployqt-continuous-x86_64.AppImage
diff --git a/cmake/install/linux/linux_post_install.cmake b/cmake/install/linux/linux_post_install.cmake
@@ -34,7 +34,7 @@ else ()
     message(FATAL_ERROR "Didn't find ${PROJECT_APP_PATH}")
 endif ()
 
-set(LINUX_DEPLOY_PATH ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/linux_misc/linuxdeployqt-7-x86_64.AppImage)
+set(LINUX_DEPLOY_PATH ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/linux_misc/linuxdeployqt-continuous-x86_64.AppImage)
 if (EXISTS ${LINUX_DEPLOY_PATH})
     message(STATUS "linuxdeployqt path is -> ${LINUX_DEPLOY_PATH}")
 else ()
@@ -62,12 +62,17 @@ foreach (current_lib ${LIST_LIBS})
 endforeach ()
 
 message(STATUS "Executing linuxdeployqt to fix dependencies")
-message(STATUS "Executing cmd: [${LINUX_DEPLOY_PATH} ${PROJECT_BIN_PATH} -qmldir=${PROJECT_QML_DIR} -bundle-non-qt-libs -exclude-libs='libnss3.so,libnssutil3.so' -unsupported-allow-new-glibc -no-copy-copyright-files -verbose=1 -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage]")
-execute_process(COMMAND ${LINUX_DEPLOY_PATH} ${PROJECT_BIN_PATH} -qmldir=${PROJECT_QML_DIR} -bundle-non-qt-libs -exclude-libs='libnss3.so,libnssutil3.so' -unsupported-allow-new-glibc -no-copy-copyright-files -verbose=1 -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage
+message(STATUS "Executing cmd: [${LINUX_DEPLOY_PATH} ${PROJECT_BIN_PATH} -qmldir=${PROJECT_QML_DIR} -bundle-non-qt-libs -exclude-libs='libnss3.so,libnssutil3.so' -unsupported-allow-new-glibc -no-copy-copyright-files -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage -verbose=2]")
+execute_process(COMMAND ${LINUX_DEPLOY_PATH} ${PROJECT_BIN_PATH} -qmldir=${PROJECT_QML_DIR} -bundle-non-qt-libs -exclude-libs='libnss3.so,libnssutil3.so' -unsupported-allow-new-glibc -no-copy-copyright-files -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage -verbose=2
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         ECHO_OUTPUT_VARIABLE
         ECHO_ERROR_VARIABLE)
 
+message(STATUS "Renaming ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-${VERSION_ID}-x86_64.AppImage to ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-linux-${VERSION_ID}-x86_64.AppImage")
+file(RENAME ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-${VERSION_ID}-x86_64.AppImage ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-linux-${VERSION_ID}-x86_64.AppImage)
+
+file(COPY ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-linux-${VERSION_ID}-x86_64.AppImage DESTINATION ${TARGET_APP_PATH})
+
 message(STATUS "Copying ${PROJECT_APP_PATH} to ${TARGET_APP_PATH}/${PROJECT_APP_DIR}")
 file(COPY ${PROJECT_APP_PATH} DESTINATION ${TARGET_APP_PATH})
 execute_process(COMMAND zip -r ${DEX_PROJECT_NAME}-linux-${VERSION_ID}.zip AntaraAtomicDexAppDir
@@ -79,8 +84,3 @@ execute_process(COMMAND tar --zstd -cf ${DEX_PROJECT_NAME}-linux-${VERSION_ID}.t
         WORKING_DIRECTORY ${TARGET_APP_PATH}
         ECHO_OUTPUT_VARIABLE
         ECHO_ERROR_VARIABLE)
-
-message(STATUS "Renaming ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-${VERSION_ID}-x86_64.AppImage to ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-linux-${VERSION_ID}-x86_64.AppImage")
-file(RENAME ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-${VERSION_ID}-x86_64.AppImage ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-linux-${VERSION_ID}-x86_64.AppImage)
-
-file(COPY ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-linux-${VERSION_ID}-x86_64.AppImage DESTINATION ${TARGET_APP_PATH})
diff --git a/docker-build-linux.sh b/docker-build-linux.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 
+sudo rm bundled
 # Define the target for the build (Debug or Release)
 TARGET="${1:-Debug}"
 
-docker run -v "$(pwd)":/build/komodo-wallet-desktop \
+docker run -v "$(pwd)":/build/komodo-wallet-desktop --privileged -v /dev/fuse:/dev/fuse \
     kw-build-container \
     bash -c  "cd /build/komodo-wallet-desktop/ci_tools_atomic_dex && \
         nimble build -y && \