Peter M. Groen / openhantek

Commit b8b43adab0ee783e2c9d5b9ff02d64f7b60f09a9

Authored by viktorxda
Committed by David Gräff
1 parent c7e56b4c

update travis.yml (#268) 

* update travis.yml

Signed-off-by: Viktor <viktorxda@users.noreply.github.com>

* readme: add link for windows build

Signed-off-by: Viktor <viktorxda@users.noreply.github.com>

* update appveyor.yml

Signed-off-by: Viktor <viktorxda@users.noreply.github.com>
Inline Side-by-side
Showing 3 changed files with 18 additions and 47 deletions
.travis.yml
  View file @b8b43ad
1 language: cpp 1 language: cpp
2 -  
3 sudo: required 2 sudo: required
4 -dist: trusty 3 +dist: xenial
5 4
6 env: 5 env:
7 global: 6 global:
@@ -9,42 +8,26 @@ env: @@ -9,42 +8,26 @@ env:
9 8
10 addons: 9 addons:
11 apt: 10 apt:
12 - sources:  
13 - - ubuntu-toolchain-r-test  
14 -# - llvm-toolchain-trusty-3.9  
15 packages: &native_deps 11 packages: &native_deps
16 - - cmake  
17 - libusb-1.0-0-dev 12 - libusb-1.0-0-dev
18 - libfftw3-dev 13 - libfftw3-dev
19 -# - libqt5qml5  
20 - libgtest-dev 14 - libgtest-dev
21 -# - libqt5opengl5-dev  
22 -# - qtbase5-dev  
23 -# - qttools5-dev  
24 -# - qttools5-dev-tools  
25 - - gcc-5  
26 - - g++-5  
27 -# - doxygen  
28 -# - clang-3.6 15 + - binutils-dev
  16 + - qtbase5-dev
  17 + - libqt5opengl5-dev
29 18
30 -# We are testing  
31 -# * linux with g++5 (and clang 3.6)  
32 -# * osx with clang 3.6  
33 matrix: 19 matrix:
34 include: 20 include:
35 - compiler: gcc 21 - compiler: gcc
36 env: CMAKE_CXX_COMPILER=g++-5 22 env: CMAKE_CXX_COMPILER=g++-5
37 os: linux 23 os: linux
38 -# - compiler: clang  
39 -# env: CMAKE_CXX_COMPILER=clang++-3.6  
40 -# os: linux  
41 - compiler: clang 24 - compiler: clang
42 env: CMAKE_CXX_COMPILER=/usr/bin/clang++ 25 env: CMAKE_CXX_COMPILER=/usr/bin/clang++
43 os: osx 26 os: osx
44 27
45 before_install: 28 before_install:
46 - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install libusb fftw qt5; export CMAKE_PREFIX_PATH=$(brew --prefix qt5); fi  
47 - - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then sudo add-apt-repository -y ppa:beineri/opt-qt542-trusty;sudo apt-get -qq update; sudo apt-get --yes install -qq qt54base; QTDIR="/opt/qt55"; PATH="$QTDIR/bin:$PATH"; source /opt/qt54/bin/qt54-env.sh; fi 29 + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install fftw qt5; export CMAKE_PREFIX_PATH=$(brew --prefix qt5); fi
  30 + - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then pip install cmake --user; fi
48 31
49 before_script: 32 before_script:
50 - mkdir build 33 - mkdir build
@@ -57,11 +40,6 @@ script: @@ -57,11 +40,6 @@ script:
57 before_deploy: 40 before_deploy:
58 - sudo make package 41 - sudo make package
59 42
60 -notifications:  
61 - on_success: change  
62 - on_failure: always  
63 -  
64 -# User "ci-openhantek". Uses a travis encrypted github access token for that user.  
65 deploy: 43 deploy:
66 skip_cleanup: true 44 skip_cleanup: true
67 provider: releases 45 provider: releases
@@ -70,4 +48,3 @@ deploy: @@ -70,4 +48,3 @@ deploy:
70 file: "packages/*" 48 file: "packages/*"
71 on: 49 on:
72 repo: OpenHantek/openhantek 50 repo: OpenHantek/openhantek
73 - tags: true  
appveyor.yml
  View file @b8b43ad
1 -platform:  
2 - - x64  
3 -  
4 configuration: 1 configuration:
5 - Release 2 - Release
6 3
7 -matrix:  
8 - fast_finish: true  
9 -  
10 image: 4 image:
11 - Visual Studio 2015 5 - Visual Studio 2015
12 6
13 shallow_clone: true 7 shallow_clone: true
14 8
15 before_build: 9 before_build:
16 - - set QT5=C:\Qt\5.11\msvc2015_64  
17 - - set "CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64"  
18 - - set Path=%QT5%\bin;%Path%  
19 - - md build  
20 - - cd build  
21 - - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %platform%  
22 - - cmake.exe -G "%CMAKE_GENERATOR_NAME%" "-DCMAKE_PREFIX_PATH=%QT5%" -DCMAKE_BUILD_TYPE=%configuration% .. 10 + - set qtpath="C:\Qt\5.11\msvc2015_64"
  11 + - set arch64=x64
  12 + - set dir64=build_x64
  13 +
  14 + - md %dir64%
  15 + - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch64%
  16 + - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_PREFIX_PATH=%qtpath% -DCMAKE_BUILD_TYPE=%configuration% -B%dir64% -H.
23 17
24 build_script: 18 build_script:
25 - - cmake --build . --config %configuration% --target package 19 + - cmake --build %dir64% --config %configuration% --target package
26 20
27 artifacts: 21 artifacts:
28 - - path: build\openhantek\$(configuration)  
29 - name: OpenHantek-$(platform)-$(configuration)-b$(APPVEYOR_BUILD_NUMBER)  
30 - type: zip 22 + - path: $(dir64)\openhantek\$(configuration)
  23 + name: OpenHantek-$(arch64)-$(configuration)-b$(APPVEYOR_BUILD_NUMBER)
readme.md
  View file @b8b43ad
@@ -25,7 +25,8 @@ OpenHantek is a free software for Hantek and compatible (Voltcraft/Darkwire/Prot @@ -25,7 +25,8 @@ OpenHantek is a free software for Hantek and compatible (Voltcraft/Darkwire/Prot
25 This allows a minimum window size of 640*480 for old workstation computers. 25 This allows a minimum window size of 640*480 for old workstation computers.
26 26
27 ## Install prebuilt binary 27 ## Install prebuilt binary
28 -Navigate to the [Releases](https://github.com/OpenHantek/openhantek/releases) page 28 +Navigate to the [Releases](https://github.com/OpenHantek/openhantek/releases) page.
  29 +* [Download Windows build](https://ci.appveyor.com/project/openhantek/openhantek/branch/master/artifacts)
29 30
30 ## Building OpenHantek from source 31 ## Building OpenHantek from source
31 You need the following software, to build OpenHantek from source: 32 You need the following software, to build OpenHantek from source: