Skip to content

Commit 1e67d81

Browse files
authored
Merge pull request #498 from libtom/appveyor
Add AppVeyor MSVC builds
2 parents a1f6312 + eaf2c7b commit 1e67d81

File tree

3 files changed

+41
-0
lines changed

3 files changed

+41
-0
lines changed

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,24 @@ or from the page https://github.com/libtom/libtomcrypt/releases .
66

77
## Project Status
88

9+
### Travis CI
10+
911
master: [![Build Status](https://api.travis-ci.org/libtom/libtomcrypt.png?branch=master)](https://travis-ci.org/libtom/libtomcrypt) [![Coverage Status](https://coveralls.io/repos/libtom/libtomcrypt/badge.png?branch=master)](https://coveralls.io/r/libtom/libtomcrypt)
1012

1113
develop: [![Build Status](https://api.travis-ci.org/libtom/libtomcrypt.png?branch=develop)](https://travis-ci.org/libtom/libtomcrypt) [![Coverage Status](https://coveralls.io/repos/libtom/libtomcrypt/badge.png?branch=develop)](https://coveralls.io/r/libtom/libtomcrypt)
1214

15+
### AppVeyor
16+
17+
master: [![Build status](https://ci.appveyor.com/api/projects/status/xyl2nbdsyp1tj9ye/branch/master?svg=true)](https://ci.appveyor.com/project/libtom/libtomcrypt/branch/master)
18+
19+
develop: [![Build status](https://ci.appveyor.com/api/projects/status/xyl2nbdsyp1tj9ye/branch/develop?svg=true)](https://ci.appveyor.com/project/libtom/libtomcrypt/branch/develop)
20+
21+
### Coverity
22+
1323
[![Coverity Scan Build Status](https://scan.coverity.com/projects/487/badge.svg)](https://scan.coverity.com/projects/487)
1424

25+
### ABI Laboratory
26+
1527
API/ABI changes: [check here](https://abi-laboratory.pro/tracker/timeline/libtomcrypt/)
1628

1729
## Submitting patches

appveyor.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
version: 1.18.2-develop+{build}
2+
branches:
3+
only:
4+
- master
5+
- develop
6+
- /^release/
7+
- /^appveyor/
8+
- /^build-ci/
9+
image:
10+
- Visual Studio 2017
11+
- Visual Studio 2015
12+
build_script:
13+
- cmd: >-
14+
if "Visual Studio 2017"=="%APPVEYOR_BUILD_WORKER_IMAGE%" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
15+
if "Visual Studio 2015"=="%APPVEYOR_BUILD_WORKER_IMAGE%" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
16+
if "Visual Studio 2015"=="%APPVEYOR_BUILD_WORKER_IMAGE%" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
17+
cd..
18+
git clone https://github.com/libtom/libtommath.git --branch=master
19+
cd libtommath
20+
nmake -f makefile.msvc
21+
cd..
22+
cd libtomcrypt
23+
nmake -f makefile.msvc all
24+
test_script:
25+
- cmd: test.exe

tests/der_test.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,6 +1261,10 @@ static void der_Xcode_run(const der_Xcode_t* x)
12611261
XFREE(d1);
12621262
}
12631263

1264+
#if defined(_MSC_VER)
1265+
#define typeof(x) x
1266+
#endif
1267+
12641268
#define DER_XCODE_X(n, b, x) { \
12651269
(_der_Xcode)der_encode_ ## n, \
12661270
(_der_Xcode)der_decode_ ## n, \

0 commit comments

Comments
 (0)