From b8b43adab0ee783e2c9d5b9ff02d64f7b60f09a9 Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Sun, 30 Sep 2018 11:17:16 +0200
Subject: [PATCH] update travis.yml (#268)

---
 .travis.yml  | 35 ++++++-----------------------------
 appveyor.yml | 27 ++++++++++-----------------
 readme.md    |  3 ++-
 3 files changed, 18 insertions(+), 47 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e9b4a4d..fc68e5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: cpp
-
 sudo: required
-dist: trusty
+dist: xenial
 
 env:
   global:  
@@ -9,42 +8,26 @@ env:
 
 addons:
   apt:
-    sources:
-    - ubuntu-toolchain-r-test
-#    - llvm-toolchain-trusty-3.9
     packages: &native_deps
-    - cmake
     - libusb-1.0-0-dev
     - libfftw3-dev
-#    - libqt5qml5
     - libgtest-dev
-#    - libqt5opengl5-dev
-#    - qtbase5-dev
-#    - qttools5-dev
-#    - qttools5-dev-tools
-    - gcc-5
-    - g++-5
-#    - doxygen
-#    - clang-3.6
+    - binutils-dev
+    - qtbase5-dev
+    - libqt5opengl5-dev
 
-# We are testing
-# * linux with g++5 (and clang 3.6)
-# * osx with clang 3.6
 matrix:
   include:
     - compiler: gcc
       env: CMAKE_CXX_COMPILER=g++-5
       os: linux
-#    - compiler: clang
-#      env: CMAKE_CXX_COMPILER=clang++-3.6
-#      os: linux
     - compiler: clang
       env: CMAKE_CXX_COMPILER=/usr/bin/clang++
       os: osx
   
 before_install:
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install libusb fftw qt5; export CMAKE_PREFIX_PATH=$(brew --prefix qt5); fi
-    - 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
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install fftw qt5; export CMAKE_PREFIX_PATH=$(brew --prefix qt5); fi
+    - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then pip install cmake --user; fi
 
 before_script:
     - mkdir build
@@ -57,11 +40,6 @@ script:
 before_deploy:
     - sudo make package
 
-notifications:
-  on_success: change
-  on_failure: always
-
-# User "ci-openhantek". Uses a travis encrypted github access token for that user.
 deploy:
   skip_cleanup: true
   provider: releases
@@ -70,4 +48,3 @@ deploy:
   file: "packages/*"
   on:
     repo: OpenHantek/openhantek
-    tags: true
diff --git a/appveyor.yml b/appveyor.yml
index be227c4..ee1e759 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,30 +1,23 @@
-platform:
-  - x64
-
 configuration:
   - Release
 
-matrix:
-  fast_finish: true
-
 image:
   - Visual Studio 2015
 
 shallow_clone: true
 
 before_build:
-  - set QT5=C:\Qt\5.11\msvc2015_64
-  - set "CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64"
-  - set Path=%QT5%\bin;%Path%
-  - md build
-  - cd build
-  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %platform%
-  - cmake.exe -G "%CMAKE_GENERATOR_NAME%" "-DCMAKE_PREFIX_PATH=%QT5%" -DCMAKE_BUILD_TYPE=%configuration% ..
+  - set qtpath="C:\Qt\5.11\msvc2015_64"
+  - set arch64=x64
+  - set dir64=build_x64
+
+  - md %dir64%
+  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch64%
+  - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_PREFIX_PATH=%qtpath% -DCMAKE_BUILD_TYPE=%configuration% -B%dir64% -H.
 
 build_script:
-  - cmake --build . --config %configuration% --target package
+  - cmake --build %dir64% --config %configuration% --target package
 
 artifacts:
-  - path: build\openhantek\$(configuration)
-    name: OpenHantek-$(platform)-$(configuration)-b$(APPVEYOR_BUILD_NUMBER)
-    type: zip
+  - path: $(dir64)\openhantek\$(configuration)
+    name: OpenHantek-$(arch64)-$(configuration)-b$(APPVEYOR_BUILD_NUMBER)
diff --git a/readme.md b/readme.md
index fb8b6b4..dd77815 100644
--- a/readme.md
+++ b/readme.md
@@ -25,7 +25,8 @@ OpenHantek is a free software for Hantek and compatible (Voltcraft/Darkwire/Prot
   This allows a minimum window size of 640*480 for old workstation computers.
 
 ## Install prebuilt binary
-Navigate to the [Releases](https://github.com/OpenHantek/openhantek/releases) page 
+Navigate to the [Releases](https://github.com/OpenHantek/openhantek/releases) page.
+* [Download Windows build](https://ci.appveyor.com/project/openhantek/openhantek/branch/master/artifacts)
 
 ## Building OpenHantek from source
 You need the following software, to build OpenHantek from source:
--
libgit2 0.21.4