From 3b3e9d227fc16aed1a458150eba57c8178e29913 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 7 Oct 2020 18:22:14 +0200 Subject: [PATCH 1/2] Compile on VS studio 2019 --- appveyor.yml | 6 +++--- appveyor/package_kiwix-desktop.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 36d2bf7..520ea53 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -image: Visual Studio 2017 +image: Visual Studio 2019 version: '0.1.{build}' environment: EXTRA_DIR: 'C:\extra' @@ -16,8 +16,8 @@ environment: init: - cmd: | echo %TEST_VAR% - REM Set VC 2017 - "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" + REM Set VC 2019 + "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" mkdir C:\extra\bin install: diff --git a/appveyor/package_kiwix-desktop.sh b/appveyor/package_kiwix-desktop.sh index 4e56719..620b8e8 100644 --- a/appveyor/package_kiwix-desktop.sh +++ b/appveyor/package_kiwix-desktop.sh @@ -28,7 +28,7 @@ then cp $MINGW64_EXTRA_DIR/bin/*.dll $KIWIX_DIR cp $MINGW64_EXTRA_DIR/bin/kiwix-serve.exe $KIWIX_DIR - /c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/x64/signtool.exe sign -f appveyor/kiwix.pfx -p $win_certificate_password -t http://timestamp.verisign.com/scripts/timestamp.dll -d "Kiwix-desktop application" $KIWIX_DIR/kiwix-desktop.exe + signtool.exe sign -f appveyor/kiwix.pfx -p $win_certificate_password -t http://timestamp.verisign.com/scripts/timestamp.dll -d "Kiwix-desktop application" $KIWIX_DIR/kiwix-desktop.exe 7z a -tzip $KIWIX_ARCHIVES_DIR/$KIWIX_ARCH_NAME $KIWIX_DIR fi From c7baa60896a103bad34c4a91a172843a667cb887 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 7 Oct 2020 16:44:23 +0200 Subject: [PATCH 2/2] fix install_libmicrohttpd --- appveyor/install_libmicrohttpd.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor/install_libmicrohttpd.cmd b/appveyor/install_libmicrohttpd.cmd index 70a798e..4e4d6a5 100644 --- a/appveyor/install_libmicrohttpd.cmd +++ b/appveyor/install_libmicrohttpd.cmd @@ -5,6 +5,7 @@ curl -fsSL -O https://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-latest-w32-b 7z e libmicrohttpd-latest-w32-bin.zip -o%EXTRA_DIR%/lib libmicrohttpd-*-w32-bin/x86_64/VS2019/Release-static/libmicrohttpd.lib || exit /b 1 7z e libmicrohttpd-latest-w32-bin.zip -o%EXTRA_DIR%/lib/pkgconfig libmicrohttpd-*-w32-bin/x86_64/MinGW/static/mingw64/lib/pkgconfig/* || exit /b 1 +rename %EXTRA_DIR%\lib\libmicrohttpd.lib microhttpd.lib dir %EXTRA_DIR% dir %EXTRA_DIR%\lib dir %EXTRA_DIR%\lib\pkgconfig