Peter M. Groen / openhantek

Commit 507470734650d83a3ccc2810e1555ccaa40b299e

Authored by David Gräff
1 parent ac9e01ec

Continous integration/delivery for windows with appveyor

Inline Side-by-side
Showing 3 changed files with 59 additions and 9 deletions
.travis.yml
  View file @5074707
... ... @@ -70,12 +70,11 @@ deploy:
70 70 provider: releases
71 71 api_key:
72 72 secure: kIX221nPUe3OM5CNeEJ1iyRg2FFpmlL7c+uxJS11+HBRcFTGCIArHoxMIUb1u289+Co0jp42BVxhpo9PaKhHhzy3iVsKM1xOty3GAr9/1KzVnvJY0dOWqO2cYks4w24WF50ii3kUtYGVKpJrsHPT8UeI2z+taYr1jBmKkoYuoWDG+3CAZytLAsOVDRPylhzSD8B+OrCHIbN1npcitEpFUMJWgvDVi6ZKsz8o6obs/NhwFEc9TBDhS7CeIoAcNt7S0WdDM4ZyHyOeYShWxL0DlZBuhvS7SVZbxy/DS/cTAyoaWqgFLQokmhsKkVIytnq40kC9kGUZvoSpfwtfnA55eElFP5sNbnjQEUaDgq8Doi+aTTc7WRmhBCJbmz6RlqPAECQzx67JuTukV7F6Ds6B34+9naV3dAhj7dnMAoIvY1UK4NhvT+w3aQNR3B93TLZfYHvAmVoZcMGEY/EqLbHdMdJ7E9YGEQQUXW/753EmulCu9/O/gEs+8DlNc1ejFUGJhQmTyJBOLupJpFanC+6mTcbSGlJLwAHxL5yuJ0x5xLzZvJ9jTJI1QFu8ZztFw6gPCBpxPVle6E/Ht3CIByoK5RtKzhJBxgYDG+k0Yaqgbp1wh1ET56xEj8GxQlTKW43Mwbt4aXAarZ11C3erab5lCQyubIUXuq0TWxJLDTfOC6I=
73   - file:
74   - - packages/OpenHantekProject-Linux.sh
75   - - packages/OpenHantekProject-Linux.zip
76   - - packages/OpenHantekProject-Linux.deb
  73 + file_glob: true
  74 + file: "packages/OpenHantekProject-*"
77 75 on:
78 76 repo: OpenHantek/openhantek
79 77 branch: master
80 78 condition: "$CMAKE_CXX_COMPILER = clang++-3.6"
81   -# tags: true
82 79 \ No newline at end of file
  80 + tags: true
  81 +
83 82 \ No newline at end of file
... ...
appveyor.yml 0 → 100644
  View file @5074707
  1 +branches:
  2 + only:
  3 + - master
  4 +
  5 +platform:
  6 + - Win32
  7 + - x64
  8 +
  9 +configuration:
  10 + - Release
  11 +
  12 +matrix:
  13 + fast_finish: true
  14 +
  15 +clone_folder: C:\projects\openhantek
  16 +
  17 +install:
  18 + - cinst qt-sdk-windows-x64-msvc2012_opengl cmake
  19 +
  20 +os: Windows Server 2012
  21 +
  22 +shallow_clone: true
  23 +
  24 +before_build:
  25 + - cmd: md build
  26 + - cmd: cd build
  27 + - cmd: if "%platform%"=="Win32" set "CMAKE_GENERATOR_NAME=Visual Studio 12 2013"
  28 + - cmd: if "%platform%"=="x64" set "CMAKE_GENERATOR_NAME=Visual Studio 12 2013 Win64"
  29 + - cmd: cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% .
  30 +
  31 +build:
  32 + project: C:\projects\openhantek\build\OpenHantekProject.sln
  33 + parallel: true
  34 + # MSBuild verbosity level (quiet|minimal|normal|detailed)
  35 + verbosity: normal
  36 +
  37 +deploy:
  38 + - provider: GitHub
  39 + artifact: /packages\\*\.exe/ # upload all NuGet packages to release assets
  40 + draft: false
  41 + prerelease: false
  42 + on:
  43 + branch: master # release from master branch only
  44 + appveyor_repo_tag: true # deploy on tag push only
  45 +
  46 +notifications:
  47 + - provider: Email
  48 + on_build_status_changed: true
0 49 \ No newline at end of file
... ...
readme.md
  View file @5074707
1   -# OpenHantek [![Build Status](https://travis-ci.org/OpenHantek/openhantek.svg)](https://travis-ci.org/OpenHantek/openhantek)
  1 +# OpenHantek [![Build Status](https://travis-ci.org/OpenHantek/openhantek.svg)](https://travis-ci.org/OpenHantek/openhantek) [![Build status](https://ci.appveyor.com/api/projects/status/9w4rd5r04ufqafr4/branch/master?svg=true)](https://ci.appveyor.com/project/davidgraeff/openhantek/branch/master)
2 2 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.
3 3  
4 4 Supported operating systems:
... ... @@ -9,13 +9,15 @@ Supported operating systems:
9 9 <img alt="Image of main window" width="350" src="doc/screenshot_mainwindow.png">
10 10 <img alt="Image of main window" width="350" src="doc/screenshot_mainwindow_win.png">
11 11  
  12 +## Install prebuild binariy
  13 +Navigate to the [Releases](https://github.com/OpenHantek/openhantek/releases) page
  14 +
12 15 ## Building OpenHantek from source
13 16 You need the following packages, to build OpenHantek from source:
14 17 * CMake 3.0+
15 18 * Qt 5.3+
16 19 * FFTW 3+ (prebuild files will be downloaded on windows)
17 20 * libusb 1.x (prebuild files will be downloaded on windows)
18   -* binutils-dev
19 21  
20 22 For debian based systems (Ubuntu, Mint) install named requirements like this:
21 23 > apt-get install cmake qttools5-dev-tools libfftw3-dev binutils-dev libusb-1.0-0-dev
... ... @@ -30,8 +32,8 @@ For MacOSX use homebrew
30 32 After you've installed the requirements either run **cmake-gui** or run the following commands inside the directory of this package:
31 33 > mkdir build <br>
32 34 > cd build <br>
33   -> cmake ../
34   -> make -j4 (for 4 concurrent compile jobs)
  35 +> cmake ../ <br>
  36 +> make -j4 (for 4 concurrent compile jobs) <br>
35 37 > make install (optional, for installing only)
36 38  
37 39 You can specify an install prefix when running cmake:
... ... @@ -40,6 +42,7 @@ You can specify an install prefix when running cmake:
40 42 ## Firmware
41 43 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.
42 44  
  45 +* You need binutils-dev autoconf automake fxload
43 46 * Install the `firmware/*.hex` files into `/usr/local/share/hantek/`.
44 47 * Install the `firmware/90-hantek.rules` file into `/etc/udev/rules.d/`.
45 48 * install fxload (fxload is a program which downloads firmware to USB devices based on
... ...