smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #460 from kiwix/fix_ci_appveyor

This commit is contained in:
Matthieu Gautier 2020-10-16 17:38:44 +02:00 committed by GitHub
parent a64cd9f790 c7baa60896
commit 8bd1c36721
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
appveyor.yml
View File

@ -1,4 +1,4 @@
image: Visual Studio 2017 image: Visual Studio 2019
version: '0.1.{build}' version: '0.1.{build}'
environment: environment:
EXTRA_DIR: 'C:\extra' EXTRA_DIR: 'C:\extra'
@ -16,8 +16,8 @@ environment:
init: init:
- cmd: | - cmd: |
echo %TEST_VAR% echo %TEST_VAR%
REM Set VC 2017 REM Set VC 2019
"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
mkdir C:\extra\bin mkdir C:\extra\bin
install: install:

1
appveyor/install_libmicrohttpd.cmd
View File

@ -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 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 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%
dir %EXTRA_DIR%\lib dir %EXTRA_DIR%\lib
dir %EXTRA_DIR%\lib\pkgconfig dir %EXTRA_DIR%\lib\pkgconfig

2
appveyor/package_kiwix-desktop.sh
View File

@ -28,7 +28,7 @@ then
cp $MINGW64_EXTRA_DIR/bin/*.dll $KIWIX_DIR cp $MINGW64_EXTRA_DIR/bin/*.dll $KIWIX_DIR
cp $MINGW64_EXTRA_DIR/bin/kiwix-serve.exe $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 7z a -tzip $KIWIX_ARCHIVES_DIR/$KIWIX_ARCH_NAME $KIWIX_DIR
fi fi