From 799cf1bcbddf9282d1b27c4cfe06d0e9b8eebf0a Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sun, 18 Feb 2024 10:25:28 +0100 Subject: [PATCH] Remove appveyor config; move windows-only patches into dist/windows/patches --- .appveyor.yml | 174 ------------------ .github/workflows/build_windows.yml | 4 +- .../windows/patches/enchant.patch | 0 .../windows/patches/perl.txt | 0 4 files changed, 2 insertions(+), 176 deletions(-) delete mode 100644 .appveyor.yml rename .appveyor.ench => dist/windows/patches/enchant.patch (100%) rename .appveyor.perl => dist/windows/patches/perl.txt (100%) diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index d2cdf61bb3..0000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,174 +0,0 @@ -version: 5.2.0-branch-{branch}-build-{build} -image: Visual Studio 2019 -skip_branch_with_pr: true -cache: - - c:\spellcheck-dicts -> .appveyor.yml - - c:\Tools\vcpkg\installed -> .appveyor.yml -environment: - matrix: - - cmake_build_type: Release - arch: x64 - target_arch: x86_64 - vc_arch: amd64 - qt_ver: 6.5\msvc2019_64 - MSYSTEM: MINGW64 - mingw_fourple: mingw64/mingw-w64-x86_64 - mingw_root: c:/msys64/mingw64 - mingw_libgcc: libgcc_s_seh-1.dll - perl_enabled: YES - - - cmake_build_type: Release - arch: x86 - target_arch: x86 - vc_arch: amd64_x86 # cross-compile from amd64 to x86 - qt_ver: 6.5\msvc2019 - MSYSTEM: MINGW32 - mingw_fourple: mingw32/mingw-w64-i686 - mingw_root: c:/msys64/mingw32 - mingw_libgcc: libgcc_s_dw2-1.dll - perl_enabled: NO - -# - cmake_build_type: Debug -# arch: x64 -# target_arch: x86_64 -# vc_arch: amd64 -# qt_ver: 6.5\msvc2019_64 -# MSYSTEM: MINGW64 -# mingw_fourple: mingw64/mingw-w64-x86_64 -# mingw_root: c:/msys64/mingw64 -# mingw_libgcc: libgcc_s_seh-1.dll -# perl_enabled: YES - -# - cmake_build_type: Debug -# arch: x86 -# target_arch: x86 -# vc_arch: amd64_x86 # cross-compile from amd64 to x86 -# qt_ver: 6.5\msvc2019_64 -# MSYSTEM: MINGW32 -# mingw_fourple: mingw32/mingw-w64-i686 -# mingw_root: c:/msys64/mingw32 -# mingw_libgcc: libgcc_s_dw2-1.dll -# perl_enabled: NO -matrix: - fast_finish: true -install: - # - systeminfo - - ps: | - # Strawberry perl doesn't support MSVC, but we force the support. - c:\cygwin64\bin\bash -c "/bin/cat .appveyor.perl >> /cygdrive/c/Strawberry/perl/lib/core/config.h" - - ps: | - c:\msys64\usr\bin\pacman -Q - c:\msys64\usr\bin\pacman -S --noconfirm $env:mingw_fourple-enchant - c:\cygwin64\bin\sh -lc 'mkdir -p /cygdrive/c/enchant-headers; cp -vp $mingw_root/lib/glib-2.0/include/glibconfig.h $mingw_root/include/enchant-2/enchant.h /cygdrive/c/enchant-headers/' - c:\cygwin64\bin\sh -lc 'cd /cygdrive/c/enchant-headers; patch -p2 < $APPVEYOR_BUILD_FOLDER/.appveyor.ench' - - c:\cygwin64\bin\sh -lc "mkdir -p /cygdrive/c/spellcheck-dicts; cd /cygdrive/c/spellcheck-dicts; mkdir -p zip unzip ru" - - ps: | - if (Test-Path "c:/spellcheck-dicts/zip/ru.zip") { # LGPL - echo "using ru dict from cache" - } else { - Invoke-WebRequest https://extensions.libreoffice.org/assets/downloads/48/dict_pack_ru-aot-0.4.5.oxt -OutFile c:\spellcheck-dicts\zip\ru.zip - c:\cygwin64\bin\bash -lc "cd /cygdrive/c/spellcheck-dicts/ru; 7z x -y ../zip/ru.zip" - } - - ps: | - if (Test-Path "c:/spellcheck-dicts/zip/en_US.zip") { - echo "using en dict from cache" - } else { - (New-Object Net.WebClient).DownloadFile('https://sourceforge.net/projects/wordlist/files/speller/2020.12.07/hunspell-en_US-2020.12.07.zip', 'c:\spellcheck-dicts\zip\en_US.zip') - (New-Object Net.WebClient).DownloadFile('https://sourceforge.net/projects/wordlist/files/speller/2020.12.07/hunspell-en_GB-ize-2020.12.07.zip', 'c:\spellcheck-dicts\zip\en_GB-ize.zip') - (New-Object Net.WebClient).DownloadFile('https://sourceforge.net/projects/wordlist/files/speller/2020.12.07/hunspell-en_GB-ise-2020.12.07.zip', 'c:\spellcheck-dicts\zip\en_GB-ise.zip') - c:\cygwin64\bin\bash -lc "cd /cygdrive/c/spellcheck-dicts/unzip; 7z x -y ../zip/en_US.zip; 7z x -y ../zip/en_GB-ize.zip; 7z x -y ../zip/en_GB-ise.zip" - } - - ps: | - (New-Object Net.WebClient).DownloadFile('https://github.com/lordmulder/stdutils/releases/download/1.14/StdUtils.2018-10-27.zip', 'c:\StdUtils.2018-10-27.zip') - 7z e -o"C:\Program Files (x86)\NSIS\Plugins\x86-unicode" c:\StdUtils.2018-10-27.zip Plugins\Unicode\*.dll - 7z e -o"C:\Program Files (x86)\NSIS\Include" c:\StdUtils.2018-10-27.zip Include\*.nsh - # - c:\cygwin64\bin\find "/cygdrive/c/Program Files (x86)/NSIS" "-type" f -build_script: - - mkdir build - - cd build - - '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %vc_arch%' - - path - - vcpkg remove --outdated --recurse - - vcpkg install gettext:%arch%-windows - - vcpkg install zlib:%arch%-windows - - vcpkg install openssl:%arch%-windows - - ps: | - $args = ( - "-GNMake Makefiles", - "-DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake", - "-DCMAKE_BUILD_TYPE=$env:cmake_build_type", - "-DCMAKE_PREFIX_PATH=c:/Qt/$env:qt_ver", - "-DWANT_OPENSSL=YES", - "-DWANT_PERL=$env:perl_enabled", - "-DPERL_EXECUTABLE=c:/Strawberry/perl/bin/perl.exe", - "-DWANT_PHONON=NO", - "-DCMAKE_START_TEMP_FILE=", - "-DCMAKE_END_TEMP_FILE=", - "-DCMAKE_VERBOSE_MAKEFILE=1", - "-DEnchant_FOUND=1", - "-DEnchant_INCLUDE_DIRS=c:/enchant-headers;$env:mingw_root/include/enchant-2;$env:mingw_root/include/glib-2.0", - "-DEnchant_LDFLAGS=$env:mingw_root/lib/libenchant-2.dll.a", - "-DWANT_KDE=NO", - "-DWANT_PYTHON=YES", - "-DWANT_QTWEBENGINE=NO" - ) - cmake .. $args - - ps: Push-AppveyorArtifact CMakeCache.txt - - nmake install VERBOSE=1 - - c:\cygwin64\bin\ls -l release/ - - ps: | - $env:Path += ";c:/Qt/$env:qt_ver/bin" - if ($env:cmake_build_type -eq "Debug") { - windeployqt "--pdb" "--dir" "release/qt-plugins" "--libdir" "release/" "release/kvirc.exe" "release/modules/"; if (!$?) { exit 1 } - } else { - windeployqt "--dir" "release/qt-plugins" "--libdir" "release/" "release/kvirc.exe" "release/modules/"; if (!$?) { exit 1 } - } - - ps: | - if ($env:cmake_build_type -eq "Debug") { - c:\cygwin64\bin\cp -pv "c:/Tools/vcpkg/installed/$env:arch-windows/debug/bin/zlibd.pdb" "c:/Tools/vcpkg/installed/$env:arch-windows/debug/bin/zlibd1.dll" "c:/Tools/vcpkg/installed/$env:arch-windows/debug/bin/libcrypto*.*" "c:/Tools/vcpkg/installed/$env:arch-windows/debug/bin/libssl*.*" "c:/Program Files (x86)/Windows Kits/10/bin/$env:arch/ucrt/ucrtbased.dll" release/; if (!$?) { exit 1 } - } else { - c:\cygwin64\bin\cp -pv "c:/Tools/vcpkg/installed/$env:arch-windows/bin/zlib1.dll" "c:/Tools/vcpkg/installed/$env:arch-windows/bin/libcrypto*.dll" "c:/Tools/vcpkg/installed/$env:arch-windows/bin/libssl*.dll" release/; if (!$?) { exit 1 } - } - c:\cygwin64\bin\cp -pv $env:mingw_root/bin/libenchant-2.dll release/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv $env:mingw_root/bin/libpcre2-*.dll release/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv $env:mingw_root/bin/libglib-2.0-0.dll release/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv $env:mingw_root/bin/libgmodule-2.0-0.dll release/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv $env:mingw_root/bin/libintl-8.dll release/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv $env:mingw_root/bin/libwinpthread-1.dll release/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv $env:mingw_root/bin/libiconv-2.dll release/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv $env:mingw_root/bin/$env:mingw_libgcc release/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv $env:mingw_root/bin/libstdc++-6.dll release/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv $env:mingw_root/bin/libhunspell-1.7-0.dll release/; if (!$?) { exit 1 } - c:\cygwin64\bin\mkdir -p release/lib/enchant-2/ release/share/enchant/ release/share/hunspell/; if (!$?) { exit 1 } - c:\cygwin64\bin\touch release/share/locale; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv $env:mingw_root/share/enchant/enchant.ordering release/share/enchant/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv $env:mingw_root/lib/enchant-2/enchant_hunspell.dll release/lib/enchant-2/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv /cygdrive/c/spellcheck-dicts/ru/russian-aot.aff release/share/hunspell/ru_RU_yo.aff; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv /cygdrive/c/spellcheck-dicts/ru/russian-aot.dic release/share/hunspell/ru_RU_yo.dic; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv /cygdrive/c/spellcheck-dicts/unzip/en_US.aff release/share/hunspell/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv /cygdrive/c/spellcheck-dicts/unzip/en_US.dic release/share/hunspell/; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv /cygdrive/c/spellcheck-dicts/unzip/en_GB-ise.dic release/share/hunspell/en_GB_ise.dic; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv /cygdrive/c/spellcheck-dicts/unzip/en_GB-ise.aff release/share/hunspell/en_GB_ise.aff; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv /cygdrive/c/spellcheck-dicts/unzip/en_GB-ize.dic release/share/hunspell/en_GB_ize.dic; if (!$?) { exit 1 } - c:\cygwin64\bin\cp -pv /cygdrive/c/spellcheck-dicts/unzip/en_GB-ize.aff release/share/hunspell/en_GB_ize.aff; if (!$?) { exit 1 } - - '"c:\Program Files (x86)\NSIS\makensis.exe" KVIrc.nsi' - - ps: | - $exe = dir -name *.exe - if ($env:cmake_build_type -eq "Debug") { - $new_name = $exe.Replace(".exe", "-$env:target_arch-$env:cmake_build_type.exe") - } else { - $new_name = $exe.Replace(".exe", "-$env:target_arch.exe") - } - Push-AppveyorArtifact $exe -FileName $new_name - $cmake_name = $exe.Replace(".exe", "-$env:target_arch.cmake.txt") - #Push-AppveyorArtifact CMakeCache.txt -FileName $cmake_name - (New-Object PSObject | - Add-Member -PassThru NoteProperty bin $new_name | - Add-Member -PassThru NoteProperty commit $env:APPVEYOR_REPO_COMMIT | - Add-Member -PassThru NoteProperty size (Get-Item $exe).length) | - ConvertTo-JSON | Out-File -FilePath "latest-$env:target_arch-$env:cmake_build_type" -Encoding ASCII - Push-AppveyorArtifact "latest-$env:target_arch-$env:cmake_build_type" -test: off -deploy: - - provider: Environment - name: kvirc diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 8e99563a9b..85351754d4 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -72,13 +72,13 @@ jobs: run: | c:\msys64\usr\bin\pacman -S --noconfirm patch cd c:\enchant-headers - c:\msys64\usr\bin\patch -p2 -i ${{github.workspace}}\.appveyor.ench + c:\msys64\usr\bin\patch -p2 -i ${{github.workspace}}\dist\windows\patches\enchant.patch - name: Patch Perl for MSVC support run: | # Strawberry perl doesn't support MSVC, but we force the support. cd '${{github.workspace}}' - type .appveyor.perl >> c:\Strawberry\perl\lib\core\config.h + type dist\windows\patches\perl.txt >> c:\Strawberry\perl\lib\core\config.h # To debug add -DCMAKE_VERBOSE_MAKEFILE=1 ` - name: Configure CMake diff --git a/.appveyor.ench b/dist/windows/patches/enchant.patch similarity index 100% rename from .appveyor.ench rename to dist/windows/patches/enchant.patch diff --git a/.appveyor.perl b/dist/windows/patches/perl.txt similarity index 100% rename from .appveyor.perl rename to dist/windows/patches/perl.txt