diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 7d7ecd99..00000000 --- a/.editorconfig +++ /dev/null @@ -1,13 +0,0 @@ -# EditorConfig is awesome: http://EditorConfig.org - -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true - -# Tab indentation (no size specified) -[*.cpp,*.h] -indent_style = space diff --git a/.travis_inactive.yml b/.travis_inactive.yml deleted file mode 100644 index b46b6a62..00000000 --- a/.travis_inactive.yml +++ /dev/null @@ -1,70 +0,0 @@ -language: cpp -dist: bionic - -addons: - apt: - packages: - - qtbase5-dev - - qttools5-dev - - libqt5opengl5-dev - - libusb-1.0-0-dev - - libfftw3-dev - - binutils-dev - - rpm - -matrix: - include: - - compiler: gcc - env: CMAKE_CXX_COMPILER=/usr/bin/g++ - os: linux - -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - brew update; brew install qt5 fftw binutils create-dmg ; - export CMAKE_PREFIX_PATH=$(brew --prefix qt5) ; - echo "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" ; - fi - - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then pip install cmake --user; fi - -before_script: - - mkdir build - - cd build - - cmake -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} ../ - -script: - - make -j4 # create either a bin or a bundle (.app) - depending on openhantek/CMakeLists.txt - - sudo make -j4 package # simply pack the binary, otherwise populate the bundle below - - if test -d openhantek/OpenHantek.app; then - export PATH=${CMAKE_PREFIX_PATH}/bin:${PATH} ; - cd openhantek ; - macdeployqt OpenHantek.app -always-overwrite -verbose=1 ; - python ../../utils/macdeployqtfix/macdeployqtfix.py OpenHantek.app/Contents/MacOS/OpenHantek ${CMAKE_PREFIX_PATH} ; - create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/openhantek.icns --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "OpenHantek.app" 200 190 --skip-jenkins --hide-extension "OpenHantek.app" --app-drop-link 600 185 --eula ../../LICENSE OpenHantek.dmg OpenHantek.app ; - cd .. ; - else - # ls -l packages ; - true; - fi - - ls -l openhantek || true - -before_deploy: - - if test -d openhantek/OpenHantek.app; then - cd openhantek ; - sudo tar -cvzf ../packages/openhantek_*_osx_*.tar.gz OpenHantek.app ; - if test -f OpenHantek.dmg ; then - sudo mv OpenHantek.dmg ../packages/$(basename ../packages/openhantek_*_osx_*.tar.gz .tar.gz).dmg ; - fi ; - cd .. ; - else - true; - fi - - ls -l packages || true - -deploy: - provider: releases - api_key: $GITHUB_TOKEN - file_glob: true - file: packages/* - skip_cleanup: true - on: - tags: true diff --git a/appveyor_inactive.yml b/appveyor_inactive.yml deleted file mode 100644 index 9179e45f..00000000 --- a/appveyor_inactive.yml +++ /dev/null @@ -1,42 +0,0 @@ -version: 1.0.{build} - -# This file defines all the magic to test the build on every push to GitHub with the help of appveyor.com -# We use different (virtual) build environments that work sequentially and provide their artifacts. -# The artifacts of every push/build are available in appveyor for 6 months from build. -# Artifacts of tagged pushes ("unstable" or release number) are deployed into the GitHub release. - -# define the build environments -# move Ubuntu / macOS from appveyor to the faster GitHub hosted runners - -image: - - Visual Studio 2019 - - -# Build Windows packages -before_build: - - set qtpath64="C:\Qt\5.15\msvc2019_64" - - set arch64=x64 - - set dir64=build_x64 - - md build_x64 - - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - - cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH=%qtpath64% -DCMAKE_BUILD_TYPE=Release -Bbuild_x64 -H. - -build_script: - - cmake --build build_x64 --config Release --target package - -artifacts: - - path: build_x64\openhantek\Release - name: OpenHantek-Win-x64-Release-b$(APPVEYOR_BUILD_NUMBER) - - -# Upload all packages to GitHub, but only if the push was tagged -deploy: -- provider: GitHub - tag: $(APPVEYOR_REPO_TAG_NAME) - auth_token: - secure: 4TSFa7zTbxPVDkS9pGWO0BIPD9r2NnnHGe03pg5rjEuvSH5pntkmMdLM7MePJLma - artifact: /.*\.deb/, /.*\.rpm/, /.*\.tar.gz/, /.*\.zip/, /.*\.dmg/ - prerelease: true - force_update: true - on: - APPVEYOR_REPO_TAG: true