From 2d1a4341d73f182f1b682702f342e5d94c6b295b Mon Sep 17 00:00:00 2001 From: redtide Date: Wed, 18 Sep 2019 09:13:36 +0200 Subject: [PATCH 01/10] Added Travis CI configuration. --- .travis.yml | 40 +++++++++++++++++++++++++++++++++++++++ .travis/after_success.sh | 19 +++++++++++++++++++ .travis/before_install.sh | 12 ++++++++++++ .travis/install.sh | 7 +++++++ .travis/script.sh | 16 ++++++++++++++++ README.md | 5 ++++- 6 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 .travis.yml create mode 100755 .travis/after_success.sh create mode 100755 .travis/before_install.sh create mode 100755 .travis/install.sh create mode 100755 .travis/script.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..c039afda --- /dev/null +++ b/.travis.yml @@ -0,0 +1,40 @@ +language: cpp + +matrix: + include: + - os: linux + dist: xenial + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-8 + - g++-8 + env: + - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + + - os: osx + osx_image: xcode10.1 + +before_install: +- sh ${TRAVIS_BUILD_DIR}/.travis/before_install.sh + +install: +- sh ${TRAVIS_BUILD_DIR}/.travis/install.sh + +script: +- sh ${TRAVIS_BUILD_DIR}/.travis/script.sh + +after_success: +- sh ${TRAVIS_BUILD_DIR}/.travis/after_success.sh + +deploy: + provider: releases + skip_cleanup: true + api_key: + secure: cc6IkdalZRb+lOWzPkubCUvTcP9lBwiNBBPkXWVmeX7YXkdQlsoVQ11bZThd1Go+5Lt+jGFtEqEjJ0L7GxpdatEeBMEK5HXl0QtHAybl9J4Ax7hKba8FSX5RqPFOuKixCob6eCqJRchT26qRsQE/WYMY8DmproEFGMBHk0K4HXDWEq0HP8dbWVx3KudvellCYszUrVQYb2s49sDiF8OwSog5TiqdBqO5PRcqyt2ySmHgqwBYq7XV0pb+DxcKJcc7/gCBpBN7nyEhl8gmKELypLF81l8xUDBUjRy1jjf0r33ISHpX1MWeWIN9YzSNL0aLPQvwynAQ7OeckFAIMABah2UuYcxdd4ioXduPTbprVYpSwIyyxkeafK2jxgxwoKWi9GJZ3yAUHNS/V7Gh5DsFb7C6QDqr5gOxOMtjHwjmHnxmD44SsugjSosVzirvQR+JbrSsPsmZThQjCvwG+7hO3JatX4BXA7bp9WtgsoMrCH61gCp2GogQVLvYpgRpVErKK8PMTkt71OouewTDqD5iwc3N/2pNWP3cXxpPegerjl4R2sY0sZ57WRfW8ts7akPyqJZa2uKpzpM0eXy35fZl6WoJSlIv3akCnzdtLtaWAptzfXhgRSlF/33+gZ3jRcSP7ca2YpUviuZ+KYk+uGfMh092CMRMjPv1Et5h7zYGD+o= + file: "$DEPLOYFILE" + on: + repo: sfztools/sfizz + tags: true diff --git a/.travis/after_success.sh b/.travis/after_success.sh new file mode 100755 index 00000000..8acde8a9 --- /dev/null +++ b/.travis/after_success.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +set -e + +export VERSION=$(git describe --tags) +if [ "$TRAVIS_OS_NAME" = "linux" ]; then + export DEPLOYFILE=Sfizz-$VERSION-x86_64.AppImage + wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" + chmod +x linuxdeploy-x86_64.AppImage + for size in 16 32 48 128 256; do dirname="sfizz/usr/share/icons/hicolor/${size}x${size}/apps"; mkdir -p $dirname; cp ./resources/icons/icon_${size}px.png ./${dirname}/sfizz.png; done + ./linuxdeploy-x86_64.AppImage --appdir=sfizz --desktop-file=./resources/linux/sfizz.desktop --executable=./build/clients/sfizz_jack --output=appimage +elif [ "$TRAVIS_OS_NAME" = "osx" ]; then + export DEPLOYFILE=sfizz-$VERSION.dmg + mkdir ./output + cp -r /build/* ./output/ + cp ./resources/icons/icon.icns ./output/sfizz.app/Contents/Resources/ + hdiutil create /tmp/tmp.dmg -ov -volname "sfizz-$VERSION" -fs HFS+ -srcfolder "./output/" + hdiutil convert /tmp/tmp.dmg -format UDZO -o ./$DEPLOYFILE; +fi diff --git a/.travis/before_install.sh b/.travis/before_install.sh new file mode 100755 index 00000000..d806bf92 --- /dev/null +++ b/.travis/before_install.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -e + +if [ "$TRAVIS_OS_NAME" = "linux" ]; then + wget https://cmake.org/files/v3.13/cmake-3.13.0-Linux-x86_64.sh + sudo sh cmake-3.13.0-Linux-x86_64.sh --skip-license --prefix=/usr/local + export PATH="/usr/local/bin:$PATH" # FIXME +elif [ "$TRAVIS_OS_NAME" = "osx" ]; then + brew update + brew upgrade cmake +fi diff --git a/.travis/install.sh b/.travis/install.sh new file mode 100755 index 00000000..fff4aa8a --- /dev/null +++ b/.travis/install.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -e + +if [ "$TRAVIS_OS_NAME" = "linux" ]; then + sudo apt-get install libasound2-dev libjack-jackd2-dev libsndfile1-dev +fi diff --git a/.travis/script.sh b/.travis/script.sh new file mode 100755 index 00000000..fa98dd09 --- /dev/null +++ b/.travis/script.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e + +if [ "$TRAVIS_OS_NAME" = "linux" ]; then + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 100 + gcc -v && g++ -v && cmake --version && /usr/local/bin/cmake --version && $SHELL --version + + mkdir build && cd build + /usr/local/bin/cmake -D CMAKE_BUILD_TYPE=Release -D SFIZZ_CLIENTS=ON .. + make -j$(nproc) +elif [ "$TRAVIS_OS_NAME" = "osx" ]; then + mkdir build && cd build + cmake -D CMAKE_BUILD_TYPE=Release -D SFIZZ_CLIENTS=ON -G Xcode .. + xcodebuild -project sfizz.xcodeproj -alltargets -configuration Release build +fi diff --git a/README.md b/README.md index 5db5060a..5c6fc71a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # sfizz +[![Travis](https://img.shields.io/travis/com/sfztools/sfizz.svg?label=Linux-macOS&style=popout&logo=travis)](https://travis-ci.com/sfztools/sfizz) +[![AppVeyor](https://img.shields.io/appveyor/ci/sfztools/sfizz.svg?label=Windows&style=popout&logo=appveyor)](https://ci.appveyor.com/project/sfztools/sfizz) + ## Building Sfizz depends on the `sndfile` library. @@ -37,4 +40,4 @@ If you already cloned the repository without the `--recursive` option, update th git submodule update --init --recursive ``` -You can build with `clang`, although in that case the CMakeFile defaults to using `libc++` instead of `libstdc++`. \ No newline at end of file +You can build with `clang`, although in that case the CMakeFile defaults to using `libc++` instead of `libstdc++`. From 72c34b657878f79d2a0e5a711b07af0582cd58e1 Mon Sep 17 00:00:00 2001 From: redtide Date: Wed, 18 Sep 2019 09:15:37 +0200 Subject: [PATCH 02/10] Added QtCreator CMake project files to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e9bc5de1..7feb15e6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ CMakeFiles/ cmake_install.cmake compile_commands.json *.a +*.txt.user clients/sfizz_jack clients/sfzprint From 080bdf45098b4218bf2d4fca59671472782f80ef Mon Sep 17 00:00:00 2001 From: redtide Date: Wed, 18 Sep 2019 09:23:29 +0200 Subject: [PATCH 03/10] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 5c6fc71a..b1cf4f58 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # sfizz [![Travis](https://img.shields.io/travis/com/sfztools/sfizz.svg?label=Linux-macOS&style=popout&logo=travis)](https://travis-ci.com/sfztools/sfizz) -[![AppVeyor](https://img.shields.io/appveyor/ci/sfztools/sfizz.svg?label=Windows&style=popout&logo=appveyor)](https://ci.appveyor.com/project/sfztools/sfizz) ## Building From 77e8694dd076e28be36b3af3b279c866eb9128c7 Mon Sep 17 00:00:00 2001 From: redtide Date: Wed, 18 Sep 2019 10:12:32 +0200 Subject: [PATCH 04/10] Trying Travis badge hack. --- .travis.yml | 12 ++++++++++++ README.md | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c039afda..5bf359a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: cpp +env: +- BADGE=linux +- BADGE=macos + matrix: include: - os: linux @@ -17,6 +21,14 @@ matrix: - os: osx osx_image: xcode10.1 + # Hack to get some OS-specific badges + exclude: + - os: osx + env: BADGE=linux + + - os: linux + env: BADGE=macos + before_install: - sh ${TRAVIS_BUILD_DIR}/.travis/before_install.sh diff --git a/README.md b/README.md index b1cf4f58..19d86b7a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # sfizz -[![Travis](https://img.shields.io/travis/com/sfztools/sfizz.svg?label=Linux-macOS&style=popout&logo=travis)](https://travis-ci.com/sfztools/sfizz) +[![Travis Linux Build Status](https://img.shields.io/travis/com/sfztools/sfizz.svg?env=BADGE=linux&label=Linux&style=popout&logo=travis)](https://travis-ci.com/sfztools/sfizz) +[![Travis macOS Build Status](https://img.shields.io/travis/com/sfztools/sfizz.svg?env=BADGE=macos&label=macOS&style=popout&logo=travis)](https://travis-ci.com/sfztools/sfizz) ## Building From b9980906e267e1ba3b63b78c171837d8070a89d6 Mon Sep 17 00:00:00 2001 From: redtide Date: Wed, 18 Sep 2019 10:18:24 +0200 Subject: [PATCH 05/10] Trying Travis badge hack. --- .travis.yml | 8 ++++---- README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bf359a3..1831a1f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: cpp env: - BADGE=linux -- BADGE=macos +- BADGE=osx matrix: include: @@ -23,12 +23,12 @@ matrix: # Hack to get some OS-specific badges exclude: + - os: linux + env: BADGE=osx + - os: osx env: BADGE=linux - - os: linux - env: BADGE=macos - before_install: - sh ${TRAVIS_BUILD_DIR}/.travis/before_install.sh diff --git a/README.md b/README.md index 19d86b7a..18004108 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # sfizz [![Travis Linux Build Status](https://img.shields.io/travis/com/sfztools/sfizz.svg?env=BADGE=linux&label=Linux&style=popout&logo=travis)](https://travis-ci.com/sfztools/sfizz) -[![Travis macOS Build Status](https://img.shields.io/travis/com/sfztools/sfizz.svg?env=BADGE=macos&label=macOS&style=popout&logo=travis)](https://travis-ci.com/sfztools/sfizz) +[![Travis macOS Build Status](https://img.shields.io/travis/com/sfztools/sfizz.svg?env=BADGE=osx&label=macOS&style=popout&logo=travis)](https://travis-ci.com/sfztools/sfizz) ## Building From c82fac078eb34ddb48c95e07a6c9e57456c2cde8 Mon Sep 17 00:00:00 2001 From: redtide Date: Wed, 18 Sep 2019 10:24:13 +0200 Subject: [PATCH 06/10] Trying Travis badge hack. --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1831a1f1..26bb6309 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ language: cpp -env: -- BADGE=linux -- BADGE=osx - matrix: include: - os: linux @@ -17,9 +13,12 @@ matrix: - g++-8 env: - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + - BADGE=linux - os: osx osx_image: xcode10.1 + env: + - BADGE=osx # Hack to get some OS-specific badges exclude: From 1b674c7e6abeca96c4f204094613b6ece8bb1259 Mon Sep 17 00:00:00 2001 From: redtide Date: Wed, 18 Sep 2019 11:28:09 +0200 Subject: [PATCH 07/10] Revert Travis hack. --- .travis.yml | 11 ----------- README.md | 3 +-- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26bb6309..c039afda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,20 +13,9 @@ matrix: - g++-8 env: - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" - - BADGE=linux - os: osx osx_image: xcode10.1 - env: - - BADGE=osx - - # Hack to get some OS-specific badges - exclude: - - os: linux - env: BADGE=osx - - - os: osx - env: BADGE=linux before_install: - sh ${TRAVIS_BUILD_DIR}/.travis/before_install.sh diff --git a/README.md b/README.md index 18004108..fdbe3e29 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # sfizz -[![Travis Linux Build Status](https://img.shields.io/travis/com/sfztools/sfizz.svg?env=BADGE=linux&label=Linux&style=popout&logo=travis)](https://travis-ci.com/sfztools/sfizz) -[![Travis macOS Build Status](https://img.shields.io/travis/com/sfztools/sfizz.svg?env=BADGE=osx&label=macOS&style=popout&logo=travis)](https://travis-ci.com/sfztools/sfizz) +[![Travis Build Status](https://img.shields.io/travis/com/sfztools/sfizz.svg?label=Linux-macOS&style=popout&logo=travis)](https://travis-ci.com/sfztools/sfizz) ## Building From 2523ba3db09f5c2d71cb92268a957e1e6289bc6e Mon Sep 17 00:00:00 2001 From: redtide Date: Wed, 18 Sep 2019 11:35:51 +0200 Subject: [PATCH 08/10] Updated abseil submodule. --- external/abseil-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/abseil-cpp b/external/abseil-cpp index ac78ffc3..6ec13628 160000 --- a/external/abseil-cpp +++ b/external/abseil-cpp @@ -1 +1 @@ -Subproject commit ac78ffc3bc0a8b295cab9a03817760fd460df2a1 +Subproject commit 6ec136281086b71da32b5fb068bd6e46b78a5c79 From 7b79a6dfc97450ea4a56480c332e4efa80eb9b2e Mon Sep 17 00:00:00 2001 From: redtide Date: Wed, 18 Sep 2019 15:08:16 +0200 Subject: [PATCH 09/10] Moved abseil-cpp submodule to tag-20190808 (local branch). --- external/abseil-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/abseil-cpp b/external/abseil-cpp index 6ec13628..aa844899 160000 --- a/external/abseil-cpp +++ b/external/abseil-cpp @@ -1 +1 @@ -Subproject commit 6ec136281086b71da32b5fb068bd6e46b78a5c79 +Subproject commit aa844899c937bde5d2b24f276b59997e5b668bde From 6d1363a9cd88bb97c36e7d632ded7f1e02f4bb63 Mon Sep 17 00:00:00 2001 From: redtide Date: Wed, 18 Sep 2019 15:08:16 +0200 Subject: [PATCH 10/10] Moved benchmark submodule to tag-v1.5.0 (local branch). --- external/benchmark | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/benchmark b/external/benchmark index bf4f2ea0..090faecb 160000 --- a/external/benchmark +++ b/external/benchmark @@ -1 +1 @@ -Subproject commit bf4f2ea0bd1180b34718ac26eb79b170a4f6290e +Subproject commit 090faecb454fbd6e6e17a75ef8146acb037118d4