fix: try to fix build process of git actionsdev/2.1.3/main

4 files changed, 25 insertions, 24 deletions

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index da425e81..52208ab5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -173,19 +173,19 @@ jobs:
           cd ${{github.workspace}}
         if: matrix.os == 'windows-2019'
 
-      - name: Build GpgFrontend (Linux)
+      - name: Build & Install Full SDK 
         # Build your GpgFrontend with the given configuration
         run: |
-          cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-          cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v
-        if: matrix.os == 'ubuntu-20.04'
+          cmake -B ${{github.workspace}}/build-full-sdk -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_FULL_SDK=ON
+          cmake --build ${{github.workspace}}/build-full-sdk --config {{$env.BUILD_TYPE}} -- -v
+          cmake --install ${{github.workspace}}/build-full-sdk --config {{$env.BUILD_TYPE}}
 
-      - name: Build Integrated Modules (macOS)
+      - name: Build Integrated Modules
         # Build your GpgFrontend with the given configuration
         run: |
-          cmake -B ${{github.workspace}}/build-mods -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_MODS_ONLY=On
-          cmake --build ${{github.workspace}}/build-mods --config {{$env.BUILD_TYPE}} -- -v
-        if: matrix.os == 'macos-13' || matrix.os == 'macos-12' || matrix.os == 'macos-14'
+          cmake -B ${{github.workspace}}/modules/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/modules/build/artifacts
+          cmake --build ${{github.workspace}}/modules/build --config {{$env.BUILD_TYPE}} -- -v
+          cmake --install ${{github.workspace}}/modules/build --config {{$env.BUILD_TYPE}}
 
       - name: Build & Export GpgFrontend (macOS)
         # Build your GpgFrontend with the given configuration
@@ -209,7 +209,7 @@ jobs:
 
       - name: Copy Modules into Bundle & Deploy Qt & Code Sign (macOS)
         run: |
-          cmake -E copy_directory ${{github.workspace}}/build-mods/artifacts/mods ${{github.workspace}}/build/package/GpgFrontend.app/Contents/PlugIns/mods
+          cmake -E copy_directory ${{github.workspace}}/modules/build/artifacts/modules ${{github.workspace}}/build/package/GpgFrontend.app/Contents/modules
           macdeployqt ${{github.workspace}}/build/package/GpgFrontend.app -verbose=2 -appstore-compliant -always-overwrite
           codesign -s "${{secrets.GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}}" -f --deep --options=runtime  ${{github.workspace}}/build/package/GpgFrontend.app
         if:  matrix.os == 'macos-13' || matrix.os == 'macos-12' || matrix.os == 'macos-14'
@@ -237,14 +237,22 @@ jobs:
           --password ${{secrets.APPLE_DEVELOPER_ID_SECRET}} \
           ${{github.workspace}}/build/GpgFrontend-${{env.sha_short}}-x86_64.zip
         if:  matrix.os == 'macos-13' || matrix.os == 'macos-12' || matrix.os == 'macos-14'
+    
+      - name: Build GpgFrontend (Linux)
+        # Build your GpgFrontend with the given configuration
+        run: |
+          cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DDGPGFRONTEND_BUILD_TYPE_ONLY_APPLICATION=ON
+          cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v
+        if: matrix.os == 'ubuntu-20.04'
 
-      - name: Package App Image (Linux)
+      - name: Copy Modules & Package App Image (Linux)
         run: |
+          cmake -E copy_directory ${{github.workspace}}/modules/build/artifacts/modules ${{github.workspace}}/build/artifacts/AppDir/usr/modules
           mkdir ${{github.workspace}}/build/final-artifact
           cd ${{github.workspace}}/build/final-artifact
           wget -c -nv https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
           chmod u+x linuxdeployqt-continuous-x86_64.AppImage
-          ./linuxdeployqt-continuous-x86_64.AppImage ${{github.workspace}}/build/artifacts/AppDir/usr/share/applications/*.desktop -no-translations -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage -executable-dir=${{github.workspace}}/build/artifacts/AppDir/usr/plugins/mods/
+          ./linuxdeployqt-continuous-x86_64.AppImage ${{github.workspace}}/build/artifacts/AppDir/usr/share/applications/*.desktop -no-translations -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage -executable-dir=${{github.workspace}}/build/artifacts/AppDir/usr/modules/
         if: matrix.os == 'ubuntu-20.04'
 
       - name: Configure CMake & Build Binary(Windows)
diff --git a/.gitmodules b/.gitmodules
index 389b56f2..884e10f7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "third_party/qttranslations"]
 	path = third_party/qttranslations
 	url = https://github.com/qt/qttranslations.git
+[submodule "modules"]
+	path = modules
+	url = https://github.com/saturneric/GpgFrontend-Modules.git
diff --git a/modules b/modules
new file mode 160000
+Subproject f813e3b71ee9563223f3d628374788c1d18b850
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c63724a9..b6702191 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -313,11 +313,11 @@ if (BUILD_APPLICATION)
             add_executable(${AppName} WIN32 ${BASE_SOURCE} ${RESOURCE_FILES})
             # include qt dependencies
             if(NOT Qt6_DIR)
-                add_custom_command(TARGET ${AppName} POST_BUILD
-                        COMMAND windeployqt --force ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${AppName}.exe)
+              add_custom_command(TARGET ${AppName} POST_BUILD
+                        COMMAND windeployqt --force --libdir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} --release ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${AppName}.exe)
             else()
                 add_custom_command(TARGET ${AppName} POST_BUILD
-                        COMMAND windeployqt-qt6.exe --force ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${AppName}.exe)
+                        COMMAND windeployqt-qt6.exe --force --libdir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} --release ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${AppName}.exe)
             endif()
         elseif (LINUX AND NOT LINUX_INSTALL_SOFTWARE)
             add_executable(${AppName} ${BASE_SOURCE} ${RESOURCE_FILES})
@@ -328,16 +328,6 @@ if (BUILD_APPLICATION)
                 COMMENT "Copying Binary into App Image"
             )
 
-            add_custom_command(TARGET ${AppName} POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/AppDir/usr/modules"
-                COMMENT "Complement to build the required architecture"
-            )
-
-            add_custom_command(TARGET ${AppName} POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E rename "${CMAKE_SOURCE_DIR}/modules" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/AppDir/usr/modules"
-                COMMENT "Copying Mods into App Image"
-            )
-
         # app bundle packing using xcode
         elseif (APPLE AND XCODE_BUILD)
             # standard app bundle packing