Parcourir la source

Merge pull request #498 from libtom/appveyor

Add AppVeyor MSVC builds
Steffen Jaeckel il y a 6 ans
Parent
commit
1e67d81f7b
3 fichiers modifiés avec 41 ajouts et 0 suppressions
  1. 12 0
      README.md
  2. 25 0
      appveyor.yml
  3. 4 0
      tests/der_test.c

+ 12 - 0
README.md

@@ -6,12 +6,24 @@ or from the page https://github.com/libtom/libtomcrypt/releases .
 
 ## Project Status
 
+### Travis CI
+
 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)
 
 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)
 
+### AppVeyor
+
+master: [![Build status](https://ci.appveyor.com/api/projects/status/xyl2nbdsyp1tj9ye/branch/master?svg=true)](https://ci.appveyor.com/project/libtom/libtomcrypt/branch/master)
+
+develop: [![Build status](https://ci.appveyor.com/api/projects/status/xyl2nbdsyp1tj9ye/branch/develop?svg=true)](https://ci.appveyor.com/project/libtom/libtomcrypt/branch/develop)
+
+### Coverity
+
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/487/badge.svg)](https://scan.coverity.com/projects/487)
 
+### ABI Laboratory
+
 API/ABI changes: [check here](https://abi-laboratory.pro/tracker/timeline/libtomcrypt/)
 
 ## Submitting patches

+ 25 - 0
appveyor.yml

@@ -0,0 +1,25 @@
+version: 1.18.2-develop+{build}
+branches:
+  only:
+  - master
+  - develop
+  - /^release/
+  - /^appveyor/
+  - /^build-ci/
+image:
+- Visual Studio 2017
+- Visual Studio 2015
+build_script:
+- cmd: >-
+    if "Visual Studio 2017"=="%APPVEYOR_BUILD_WORKER_IMAGE%" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+      if "Visual Studio 2015"=="%APPVEYOR_BUILD_WORKER_IMAGE%" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
+      if "Visual Studio 2015"=="%APPVEYOR_BUILD_WORKER_IMAGE%" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
+      cd..
+      git clone https://github.com/libtom/libtommath.git --branch=master
+      cd libtommath
+      nmake -f makefile.msvc
+      cd..
+      cd libtomcrypt
+      nmake -f makefile.msvc all
+test_script:
+- cmd: test.exe

+ 4 - 0
tests/der_test.c

@@ -1261,6 +1261,10 @@ static void der_Xcode_run(const der_Xcode_t* x)
    XFREE(d1);
 }
 
+#if defined(_MSC_VER)
+#define typeof(x) x
+#endif
+
 #define DER_XCODE_X(n, b, x) {  \
       (_der_Xcode)der_encode_ ## n,    \
       (_der_Xcode)der_decode_ ## n,    \