FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

work on qt5 compat binaries for windows

Browse Source
This commit is contained in:
Martin Rotter 2022-09-16 06:29:48 +02:00
parent 9ee3960f4d
commit 0cd015987e
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/rssguard.yml vendored
View File

@ -24,9 +24,9 @@ jobs:
script_name: ./resources/scripts/github-actions/build-linux-mac.sh script_name: ./resources/scripts/github-actions/build-linux-mac.sh
exclude: exclude:
- os: ubuntu-20.04 - os: ubuntu-20.04
use_qt5: "OFF" use_qt5: "ON"
- os: macos-10.15 - os: macos-10.15
use_qt5: "OFF" use_qt5: "ON"
steps: steps:
- name: Checkout source code - name: Checkout source code
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -57,7 +57,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Prepare environment and compile application - name: Prepare environment and compile application
run: ${{ matrix.script_name }} "${{ matrix.os }}" "${{ matrix.use_webengine }}" run: ${{ matrix.script_name }} "${{ matrix.os }}" "${{ matrix.use_webengine }}" "${{ matrix.use_qt5 }}"
env: env:
GMAIL_CLIENT_ID: ${{ secrets.GMAIL_CLIENT_ID }} GMAIL_CLIENT_ID: ${{ secrets.GMAIL_CLIENT_ID }}
GMAIL_CLIENT_SECRET: ${{ secrets.GMAIL_CLIENT_SECRET }} GMAIL_CLIENT_SECRET: ${{ secrets.GMAIL_CLIENT_SECRET }}
@ -73,8 +73,8 @@ jobs:
name: "Development builds" name: "Development builds"
tag_name: "devbuild" tag_name: "devbuild"
files: | files: |
.\rssguard-build\rssguard-*win64.exe .\rssguard-build\rssguard-*win*.exe
.\rssguard-build\rssguard-*win64.7z .\rssguard-build\rssguard-*win*.7z
./rssguard-build/rssguard-*mac64.dmg ./rssguard-build/rssguard-*mac64.dmg
./rssguard-build/rssguard-*linux64.AppImage ./rssguard-build/rssguard-*linux64.AppImage
env: env:
@ -86,8 +86,8 @@ jobs:
with: with:
prerelease: false prerelease: false
files: | files: |
.\rssguard-build\rssguard-*win64.exe .\rssguard-build\rssguard-*win*.exe
.\rssguard-build\rssguard-*win64.7z .\rssguard-build\rssguard-*win*.7z
./rssguard-build/rssguard-*mac64.dmg ./rssguard-build/rssguard-*mac64.dmg
./rssguard-build/rssguard-*linux64.AppImage ./rssguard-build/rssguard-*linux64.AppImage
env: env:

31
resources/scripts/github-actions/build-windows.ps1
View File

@ -1,8 +1,9 @@
$os = $args[0] $os = $args[0]
$webengine = $args[1] $use_webengine = $args[1]
$use_qt5 = $args[1]
echo "We are building for MS Windows." echo "We are building for MS Windows."
echo "OS: $os; WebEngine: $webengine" echo "OS: $os; WebEngine: $use_webengine"
$git_revlist = git rev-list --tags --max-count=1 $git_revlist = git rev-list --tags --max-count=1
$git_tag = git describe --tags $git_revlist $git_tag = git describe --tags $git_revlist
@ -19,11 +20,18 @@ $AllProtocols = [System.Net.SecurityProtocolType]'Tls11,Tls12'
$ProgressPreference = 'SilentlyContinue' $ProgressPreference = 'SilentlyContinue'
# Get and prepare needed dependencies. # Get and prepare needed dependencies.
$qt_version = "6.3.1"
if ($use_qt5 -eq "ON") {
$qt_version = "5.15.2"
}
else {
$qt_version = "6.3.1"
}
$maria_version = "10.6.9" $maria_version = "10.6.9"
$maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip" $maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip"
$maria_output = "maria.zip" $maria_output = "maria.zip"
$cmake_version = "3.24.1" $cmake_version = "3.24.2"
$cmake_link = "https://github.com/Kitware/CMake/releases/download/v$cmake_version/cmake-$cmake_version-windows-x86_64.zip" $cmake_link = "https://github.com/Kitware/CMake/releases/download/v$cmake_version/cmake-$cmake_version-windows-x86_64.zip"
$cmake_output = "cmake.zip" $cmake_output = "cmake.zip"
@ -80,7 +88,7 @@ cd "$old_pwd"
# Build application. # Build application.
mkdir "rssguard-build" mkdir "rssguard-build"
cd "rssguard-build" cd "rssguard-build"
& "$cmake_path" ".." -G Ninja -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_WITH_QT6="$with_qt6" -DREVISION_FROM_GIT=ON -DUSE_WEBENGINE="$webengine" -DFEEDLY_CLIENT_ID="$env:FEEDLY_CLIENT_ID" -DFEEDLY_CLIENT_SECRET="$env:FEEDLY_CLIENT_SECRET" -DGMAIL_CLIENT_ID="$env:GMAIL_CLIENT_ID" -DGMAIL_CLIENT_SECRET="$env:GMAIL_CLIENT_SECRET" -DINOREADER_CLIENT_ID="$env:INOREADER_CLIENT_ID" -DINOREADER_CLIENT_SECRET="$env:INOREADER_CLIENT_SECRET" & "$cmake_path" ".." -G Ninja -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_WITH_QT6="$with_qt6" -DREVISION_FROM_GIT=ON -DUSE_WEBENGINE="$use_webengine" -DFEEDLY_CLIENT_ID="$env:FEEDLY_CLIENT_ID" -DFEEDLY_CLIENT_SECRET="$env:FEEDLY_CLIENT_SECRET" -DGMAIL_CLIENT_ID="$env:GMAIL_CLIENT_ID" -DGMAIL_CLIENT_SECRET="$env:GMAIL_CLIENT_SECRET" -DINOREADER_CLIENT_ID="$env:INOREADER_CLIENT_ID" -DINOREADER_CLIENT_SECRET="$env:INOREADER_CLIENT_SECRET"
& "$cmake_path" --build . & "$cmake_path" --build .
& "$cmake_path" --install . --prefix app & "$cmake_path" --install . --prefix app
@ -96,11 +104,18 @@ Copy-Item -Path "$openssl_base_path\bin\libssl*.dll" -Destination ".\app\"
Copy-Item -Path "$maria_path\lib\libmariadb.dll" -Destination ".\app\" Copy-Item -Path "$maria_path\lib\libmariadb.dll" -Destination ".\app\"
Copy-Item -Path "$qt_sqldrivers_path\plugins\sqldrivers\qsqlmysql.dll" -Destination ".\app\sqldrivers\" -Force Copy-Item -Path "$qt_sqldrivers_path\plugins\sqldrivers\qsqlmysql.dll" -Destination ".\app\sqldrivers\" -Force
if ($webengine -eq "ON") { if ($use_webengine -eq "ON") {
$packagebase = "rssguard-${git_tag}-${git_revision}-win64" $packagebase = "rssguard-${git_tag}-${git_revision}-win"
} }
else { else {
$packagebase = "rssguard-${git_tag}-${git_revision}-nowebengine-win64" $packagebase = "rssguard-${git_tag}-${git_revision}-nowebengine-win"
}
if ($use_qt5 -eq "ON") {
$packagebase += "7"
}
else {
$packagebase += "10"
} }
# Create 7zip package. # Create 7zip package.