aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/testing-nightly.yml56
-rw-r--r--CMakeLists.txt5
-rw-r--r--src/CMakeLists.txt6
3 files changed, 15 insertions, 52 deletions
diff --git a/.github/workflows/testing-nightly.yml b/.github/workflows/testing-nightly.yml
index 9192fe7e..9829d745 100644
--- a/.github/workflows/testing-nightly.yml
+++ b/.github/workflows/testing-nightly.yml
@@ -187,45 +187,9 @@ jobs:
sudo ninja install
if: runner.os == 'Linux'
- - name: Build & Install Full SDK
- run: |
- 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
- sudo cmake --install ${{github.workspace}}/build-full-sdk --config {{$env.BUILD_TYPE}}
- if: runner.os == 'Linux' || runner.os == 'macOS'
-
- - name: Build & Install Full SDK (Windows)
- shell: msys2 {0}
- run: |
- cd $(cygpath -u "${{github.workspace}}")
- mkdir build-full-sdk && cd build-full-sdk
- cmake -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_FULL_SDK=ON -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX ..
- cmake --build . --config ${{env.BUILD_TYPE}} -- -j 4
- cmake --install . --config {{$env.BUILD_TYPE}}
- if: runner.os == 'Windows'
-
- - name: Build Integrated Modules
- run: |
- cmake -S ${{github.workspace}}/modules -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}}
- if: runner.os == 'Linux' || runner.os == 'macOS'
-
- - name: Build Integrated Modules (Windows)
- shell: msys2 {0}
- run: |
- cd $(cygpath -u "${{github.workspace}}")
- cd modules
- mkdir build && cd build
- cmake -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_STABLE=ON -DCMAKE_INSTALL_PREFIX=./artifacts ..
- cmake --build . --config ${{env.BUILD_TYPE}} -- -j 4
- cmake --install . --config {{$env.BUILD_TYPE}}
- if: runner.os == 'Windows'
-
- - name: Build & Export GpgFrontend (macOS)
+ - name: Build GpgFrontend (macOS)
run: |
cmake -B ${{github.workspace}}/build -G Xcode \
- -DGPGFRONTEND_CONFIGURE_FOR_XCODE_BUILD=On \
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
-DGPGFRONTEND_XCODE_CODE_SIGN_IDENTITY="${{secrets.GPGFRONTEND_XCODE_CODE_SIGN_IDENTITY}}" \
-DGPGFRONTEND_XCODE_TEAM_ID="${{secrets.GPGFRONTEND_XCODE_TEAM_ID}}" \
@@ -241,10 +205,8 @@ jobs:
-exportPath ${{github.workspace}}/build/package/
if: runner.os == 'macOS'
- - name: Copy Modules into Bundle & Deploy Qt & Code Sign (macOS)
+ - name: Deploy Qt & Code Sign (macOS)
run: |
- codesign -s "${{secrets.GPGFRONTEND_XCODE_CODE_SIGN_IDENTITY}}" -f --deep --options=runtime --timestamp ${{github.workspace}}/modules/build/artifacts/modules/*
- 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_XCODE_CODE_SIGN_IDENTITY}}" -f --deep --options=runtime --timestamp ${{github.workspace}}/build/package/GpgFrontend.app
if: runner.os == 'macOS'
@@ -277,13 +239,12 @@ jobs:
- 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}} -DGPGFRONTEND_BUILD_TYPE_ONLY_APPLICATION=ON
+ cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_APP_IMAGE=ON
cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v
if: runner.os == 'Linux'
- - name: Copy Modules & Package App Image (Linux)
+ - name: 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/upload-artifact
cd ${{github.workspace}}/build/upload-artifact
wget -c -nv https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
@@ -294,12 +255,12 @@ jobs:
echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> ${GITHUB_ENV}
if: runner.os == 'Linux'
- - name: Configure CMake & Build Application (Windows)
+ - name: Build GpgFrontend (Windows)
shell: msys2 {0}
run: |
cd $(cygpath -u "${{github.workspace}}")
mkdir build && cd build
- cmake -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_ONLY_APPLICATION=ON ..
+ cmake -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} ..
cmake --build . --config ${{env.BUILD_TYPE}} -- -j 4
if: runner.os == 'Windows'
@@ -350,8 +311,9 @@ jobs:
mkdir -p build/artifacts/modules
cp -r modules/build/artifacts/bin/* build/artifacts/modules
cd build
- windeployqt-qt6 --no-translations --force ./artifacts/bin/libgpgfrontend_core.dll
- windeployqt-qt6 --no-translations --force ./artifacts/bin/libgpgfrontend_ui.dll
+ windeployqt-qt6 --no-translations --force ./artifacts/bin/libgf_core.dll
+ windeployqt-qt6 --no-translations --force ./artifacts/bin/libgf_ui.dll
+ windeployqt-qt6 --no-translations --force ./artifacts/bin/libgf_test.dll
windeployqt-qt6 --no-translations --force ./artifacts/bin/GpgFrontend.exe
mkdir upload-artifact
cd artifacts
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16a745ab..0664e51e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,7 +228,7 @@ message(STATUS "GpgFrontend Git Repo Version ${GIT_VERSION}")
include(GenerateExportHeader)
# Windows
-IF(MINGW)
+if(MINGW)
message(STATUS "GpgFrontend Configuration For OS Platform Microsoft Windows")
message(STATUS "Build Environment MINGW")
@@ -405,7 +405,8 @@ else()
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
endif()
-if(BUILD_MODULES)
+# modules are only for qt6
+if(BUILD_MODULES AND NOT GPGFRONTEND_QT5_BUILD)
include(${CMAKE_SOURCE_DIR}/cmake/ModuleRegistry.cmake)
add_subdirectory(modules)
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 26db1fee..828f5f9f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -77,9 +77,7 @@ else()
set(RESOURCE_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
endif()
-if(MINGW)
- add_executable(${APP_NAME} WIN32 ${APP_SOURCE} ${RESOURCE_FILES})
-elseif(XCODE_BUILD)
+if(XCODE_BUILD)
# macOS bundle icon
set(GPGFRONTEND_MACOS_ICON ${CMAKE_SOURCE_DIR}/gpgfrontend.icns)
set_source_files_properties(${GPGFRONTEND_MACOS_ICON} PROPERTIES
@@ -122,6 +120,8 @@ elseif(XCODE_BUILD)
XCODE_ATTRIBUTE_ENABLE_APP_SANDBOX "${CUSTOM_ATTRIBUTE_ENABLE_APP_SANDBOX}"
XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME "Yes"
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${GPGFRONTEND_XCODE_CODE_SIGN_IDENTITY}")
+elseif(MINGW)
+ add_executable(${APP_NAME} WIN32 ${APP_SOURCE} ${RESOURCE_FILES})
else()
add_executable(${APP_NAME} ${APP_SOURCE} ${RESOURCE_FILES})
endif()
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-13 10:50:38 +0000