Skip to content

Commit b6a8640

Browse files
committed
Move authors, changelog, readme, doc files to the repository root. Add .gitignore, add .editorconfig. Add macosx and clang compiler to travis-ci.
1 parent f15390c commit b6a8640

10 files changed

+61
-1527
lines changed

.editorconfig

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
11+
# Tab indentation (no size specified)
12+
[*.cpp,*.h]
13+
indent_style = tab

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.bak
2+
.o
3+
.so
4+
.*~
5+
build/

.travis.yml

+36-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
language: cpp
2-
compiler: gcc
2+
3+
compiler:
4+
- clang
5+
- gcc
6+
37
sudo: required
8+
49
services:
510
- docker
611

12+
os:
13+
- linux
14+
- osx
15+
16+
matrix:
17+
allow_failures:
18+
- os: osx
19+
720
addons:
821
apt:
922
packages:
@@ -15,14 +28,30 @@ addons:
1528
- doxygen
1629

1730
before_install:
18-
- sudo apt-get install -qq qt5-default qttools5-dev-tools libqt5opengl5-dev
31+
- sudo apt-get install -qq qt5-default qttools5-dev-tools libqt5opengl5-dev
1932

2033
before_script:
21-
- cd openhantek
22-
- qmake
34+
- mkdir build
35+
- cd build
36+
- cmake ../
37+
38+
script:
39+
- if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$CC" = "gcc" ]; then export CC=gcc-4.8; fi
40+
- make
2341

24-
script: make
42+
before_deploy:
43+
- make package
2544

2645
notifications:
27-
on_success: change
28-
on_failure: always
46+
on_success: change
47+
on_failure: always
48+
49+
deploy:
50+
provider: releases
51+
api_key:
52+
secure: kIX221nPUe3OM5CNeEJ1iyRg2FFpmlL7c+uxJS11+HBRcFTGCIArHoxMIUb1u289+Co0jp42BVxhpo9PaKhHhzy3iVsKM1xOty3GAr9/1KzVnvJY0dOWqO2cYks4w24WF50ii3kUtYGVKpJrsHPT8UeI2z+taYr1jBmKkoYuoWDG+3CAZytLAsOVDRPylhzSD8B+OrCHIbN1npcitEpFUMJWgvDVi6ZKsz8o6obs/NhwFEc9TBDhS7CeIoAcNt7S0WdDM4ZyHyOeYShWxL0DlZBuhvS7SVZbxy/DS/cTAyoaWqgFLQokmhsKkVIytnq40kC9kGUZvoSpfwtfnA55eElFP5sNbnjQEUaDgq8Doi+aTTc7WRmhBCJbmz6RlqPAECQzx67JuTukV7F6Ds6B34+9naV3dAhj7dnMAoIvY1UK4NhvT+w3aQNR3B93TLZfYHvAmVoZcMGEY/EqLbHdMdJ7E9YGEQQUXW/753EmulCu9/O/gEs+8DlNc1ejFUGJhQmTyJBOLupJpFanC+6mTcbSGlJLwAHxL5yuJ0x5xLzZvJ9jTJI1QFu8ZztFw6gPCBpxPVle6E/Ht3CIByoK5RtKzhJBxgYDG+k0Yaqgbp1wh1ET56xEj8GxQlTKW43Mwbt4aXAarZ11C3erab5lCQyubIUXuq0TWxJLDTfOC6I=
53+
file:
54+
- packages/OpenHantek-Release.sh
55+
- packages/OpenHantek-Release.zip
56+
on:
57+
repo: OpenHantek/openhantek

openhantek/AUTHORS AUTHORS

File renamed without changes.

openhantek/COPYING COPYING

File renamed without changes.

openhantek/ChangeLog ChangeLog

File renamed without changes.

openhantek/Doxyfile Doxyfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ PROJECT_LOGO =
5858
# entered, it will be relative to the location where doxygen was started. If
5959
# left blank the current directory will be used.
6060

61-
OUTPUT_DIRECTORY = ./doc/
61+
OUTPUT_DIRECTORY = ./build/doc
6262

6363
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
6464
# directories (in 2 levels) under the output directory of each output format and
@@ -152,7 +152,7 @@ FULL_PATH_NAMES = YES
152152
# will be relative from the directory where doxygen is started.
153153
# This tag requires that the tag FULL_PATH_NAMES is set to YES.
154154

155-
STRIP_FROM_PATH = src/
155+
STRIP_FROM_PATH = openhantek/src/
156156

157157
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
158158
# path mentioned in the documentation of a class, which tells the reader which
@@ -758,7 +758,7 @@ WARN_LOGFILE =
758758
# spaces.
759759
# Note: If this tag is empty the current directory is searched.
760760

761-
INPUT = src/ \
761+
INPUT = openhantek/src/ \
762762
readme.md
763763

764764
# This tag can be used to specify the character encoding of the source files
File renamed without changes.

0 commit comments

Comments
 (0)