diff --git a/.travis.yml b/.travis.yml
index d8273a1..a74d894 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,12 +70,11 @@ deploy:
provider: releases
api_key:
secure: kIX221nPUe3OM5CNeEJ1iyRg2FFpmlL7c+uxJS11+HBRcFTGCIArHoxMIUb1u289+Co0jp42BVxhpo9PaKhHhzy3iVsKM1xOty3GAr9/1KzVnvJY0dOWqO2cYks4w24WF50ii3kUtYGVKpJrsHPT8UeI2z+taYr1jBmKkoYuoWDG+3CAZytLAsOVDRPylhzSD8B+OrCHIbN1npcitEpFUMJWgvDVi6ZKsz8o6obs/NhwFEc9TBDhS7CeIoAcNt7S0WdDM4ZyHyOeYShWxL0DlZBuhvS7SVZbxy/DS/cTAyoaWqgFLQokmhsKkVIytnq40kC9kGUZvoSpfwtfnA55eElFP5sNbnjQEUaDgq8Doi+aTTc7WRmhBCJbmz6RlqPAECQzx67JuTukV7F6Ds6B34+9naV3dAhj7dnMAoIvY1UK4NhvT+w3aQNR3B93TLZfYHvAmVoZcMGEY/EqLbHdMdJ7E9YGEQQUXW/753EmulCu9/O/gEs+8DlNc1ejFUGJhQmTyJBOLupJpFanC+6mTcbSGlJLwAHxL5yuJ0x5xLzZvJ9jTJI1QFu8ZztFw6gPCBpxPVle6E/Ht3CIByoK5RtKzhJBxgYDG+k0Yaqgbp1wh1ET56xEj8GxQlTKW43Mwbt4aXAarZ11C3erab5lCQyubIUXuq0TWxJLDTfOC6I=
- file:
- - packages/OpenHantekProject-Linux.sh
- - packages/OpenHantekProject-Linux.zip
- - packages/OpenHantekProject-Linux.deb
+ file_glob: true
+ file: "packages/OpenHantekProject-*"
on:
repo: OpenHantek/openhantek
branch: master
condition: "$CMAKE_CXX_COMPILER = clang++-3.6"
-# tags: true
\ No newline at end of file
+ tags: true
+
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..607689b
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,48 @@
+branches:
+ only:
+ - master
+
+platform:
+ - Win32
+ - x64
+
+configuration:
+ - Release
+
+matrix:
+ fast_finish: true
+
+clone_folder: C:\projects\openhantek
+
+install:
+ - cinst qt-sdk-windows-x64-msvc2012_opengl cmake
+
+os: Windows Server 2012
+
+shallow_clone: true
+
+before_build:
+ - cmd: md build
+ - cmd: cd build
+ - cmd: if "%platform%"=="Win32" set "CMAKE_GENERATOR_NAME=Visual Studio 12 2013"
+ - cmd: if "%platform%"=="x64" set "CMAKE_GENERATOR_NAME=Visual Studio 12 2013 Win64"
+ - cmd: cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% .
+
+build:
+ project: C:\projects\openhantek\build\OpenHantekProject.sln
+ parallel: true
+ # MSBuild verbosity level (quiet|minimal|normal|detailed)
+ verbosity: normal
+
+deploy:
+ - provider: GitHub
+ artifact: /packages\\*\.exe/ # upload all NuGet packages to release assets
+ draft: false
+ prerelease: false
+ on:
+ branch: master # release from master branch only
+ appveyor_repo_tag: true # deploy on tag push only
+
+notifications:
+ - provider: Email
+ on_build_status_changed: true
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 7ec8524..fd91fba 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-# OpenHantek [](https://travis-ci.org/OpenHantek/openhantek)
+# OpenHantek [](https://travis-ci.org/OpenHantek/openhantek) [](https://ci.appveyor.com/project/davidgraeff/openhantek/branch/master)
OpenHantek is a free software for Hantek (Voltcraft/Darkwire/Protek/Acetech) USB digital storage oscilloscopes based on HantekDSO and has started as an alternative to the official Hantek DSO software.
Supported operating systems:
@@ -9,13 +9,15 @@ Supported operating systems:
+## Install prebuild binariy
+Navigate to the [Releases](https://github.com/OpenHantek/openhantek/releases) page
+
## Building OpenHantek from source
You need the following packages, to build OpenHantek from source:
* CMake 3.0+
* Qt 5.3+
* FFTW 3+ (prebuild files will be downloaded on windows)
* libusb 1.x (prebuild files will be downloaded on windows)
-* binutils-dev
For debian based systems (Ubuntu, Mint) install named requirements like this:
> apt-get install cmake qttools5-dev-tools libfftw3-dev binutils-dev libusb-1.0-0-dev
@@ -30,8 +32,8 @@ For MacOSX use homebrew
After you've installed the requirements either run **cmake-gui** or run the following commands inside the directory of this package:
> mkdir build
> cd build
-> cmake ../
-> make -j4 (for 4 concurrent compile jobs)
+> cmake ../
+> make -j4 (for 4 concurrent compile jobs)
> make install (optional, for installing only)
You can specify an install prefix when running cmake:
@@ -40,6 +42,7 @@ You can specify an install prefix when running cmake:
## Firmware
Your DSO does not store its firmware permanently -- the firmware has to be sent to the device each time it is connected. The `firmware` directory of this project contains the binary firmware extracted from Hantek's Windows drivers, and a udev rule to upload the firmware to the device automatically each time it is plugged in.
+* You need binutils-dev autoconf automake fxload
* Install the `firmware/*.hex` files into `/usr/local/share/hantek/`.
* Install the `firmware/90-hantek.rules` file into `/etc/udev/rules.d/`.
* install fxload (fxload is a program which downloads firmware to USB devices based on