From b862b34a9a9eaf68c8e3b65d44ec4b45a29f0cf9 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 15 Jan 2015 20:38:53 +0100 Subject: [PATCH 01/12] Travis: Enable OSX --- .travis.yml | 52 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b25b0f60..86d9e43df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,28 +1,46 @@ language: cpp compiler: gcc -env: - - TARGET_OS=linux - - TARGET_OS=win32 - - TARGET_OS=win64 +matrix: + include: + - os: linux + env: TARGET_OS=linux + - os: linux + env: TARGET_OS=win32 + - os: linux + env: TARGET_OS=win64 + - os: osx before_install: - - if [ $TARGET_OS != linux ]; then sudo add-apt-repository ppa:tobydox/mingw -y; fi - # Travis only has CMake 2.8.7, we need >=2.8.8: - - if [ $TARGET_OS == linux ]; then sudo add-apt-repository ppa:kalakris/cmake -y; fi - - sudo apt-get update -qq - - if [ $TARGET_OS == linux ]; then sudo apt-get install -y cmake; fi + - if [ $TRAVIS_OS_NAME == linux ]; then + if [ $TARGET_OS != linux ]; then sudo add-apt-repository ppa:tobydox/mingw -y; fi + if [ $TARGET_OS == linux ]; then sudo add-apt-repository ppa:kalakris/cmake -y; fi + sudo apt-get update -qq; + fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew update; fi install: - - if [ $TARGET_OS != linux ]; then sudo apt-get install -y nsis cloog-isl libmpc2 mingw32; fi - - if [ $TARGET_OS != linux ]; then sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate mingw32-x-pkgconfig mingw32-x-binutils mingw32-x-gcc mingw32-x-runtime mingw32-x-libgig; fi - - if [ $TARGET_OS == win64 ]; then sudo apt-get install -y mingw64-x-qt mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x-stk mingw64-x-glib2 mingw64-x-portaudio mingw64-x-libsndfile mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime mingw64-x-libgig; fi - - if [ $TARGET_OS == linux ]; then sudo apt-get install -y libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev libgig-dev; fi + - if [ $TRAVIS_OS_NAME == linux ]; then + if [ $TARGET_OS == linux ]; then + sudo apt-get install -y cmake libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev libgig-dev; + fi + if [ $TARGET_OS != linux ]; then sudo apt-get install -y nsis cloog-isl libmpc2 mingw32; fi + if [ $TARGET_OS != linux ]; then sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate mingw32-x-pkgconfig mingw32-x-binutils mingw32-x-gcc mingw32-x-runtime mingw32-x-libgig; fi + if [ $TARGET_OS == win64 ]; then sudo apt-get install -y mingw64-x-qt mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x-stk mingw64-x-glib2 mingw64-x-portaudio mingw64-x-libsndfile mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime mingw64-x-libgig; fi; + fi + - if [ $TRAVIS_OS_NAME == osx ]; then + brew upgrade qt libsndfile fftw libvorbis libogg jack sdl libsamplerate stk fluid-synth portaudio fltk + fi before_script: - mkdir build && cd build script: - - if [ $TARGET_OS == win32 ]; then ../build_mingw32 || ../build_mingw32; fi - - if [ $TARGET_OS == win64 ]; then ../build_mingw64 || ../build_mingw64; fi - - if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..; fi + - if [ $TRAVIS_OS_NAME == linux ]; then + if [ $TARGET_OS == win32 ]; then ../build_mingw32 || ../build_mingw32; fi + if [ $TARGET_OS == win64 ]; then ../build_mingw64 || ../build_mingw64; fi + if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..; fi + fi + - if [ $TRAVIS_OS_NAME == osx ]; then + cmake .. + fi - make -j4 VERBOSE=1 - - if [ $TARGET_OS == linux ]; then make tests && ./tests/tests; fi + - if [ $TARGET_OS == linux ]; then make tests && ./tests/tests; fi; before_deploy: make package deploy: provider: releases From bb24f610428889d75ff6b93c5e9407e6dc80609a Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 15 Jan 2015 20:44:56 +0100 Subject: [PATCH 02/12] Travis: Fix yml syntax errors --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86d9e43df..3c3a71ae8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ matrix: - os: osx before_install: - if [ $TRAVIS_OS_NAME == linux ]; then - if [ $TARGET_OS != linux ]; then sudo add-apt-repository ppa:tobydox/mingw -y; fi - if [ $TARGET_OS == linux ]; then sudo add-apt-repository ppa:kalakris/cmake -y; fi + if [ $TARGET_OS != linux ]; then sudo add-apt-repository ppa:tobydox/mingw -y; fi; + if [ $TARGET_OS == linux ]; then sudo add-apt-repository ppa:kalakris/cmake -y; fi; sudo apt-get update -qq; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew update; fi @@ -20,24 +20,24 @@ install: - if [ $TRAVIS_OS_NAME == linux ]; then if [ $TARGET_OS == linux ]; then sudo apt-get install -y cmake libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev libgig-dev; - fi - if [ $TARGET_OS != linux ]; then sudo apt-get install -y nsis cloog-isl libmpc2 mingw32; fi - if [ $TARGET_OS != linux ]; then sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate mingw32-x-pkgconfig mingw32-x-binutils mingw32-x-gcc mingw32-x-runtime mingw32-x-libgig; fi + fi; + if [ $TARGET_OS != linux ]; then sudo apt-get install -y nsis cloog-isl libmpc2 mingw32; fi; + if [ $TARGET_OS != linux ]; then sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate mingw32-x-pkgconfig mingw32-x-binutils mingw32-x-gcc mingw32-x-runtime mingw32-x-libgig; fi; if [ $TARGET_OS == win64 ]; then sudo apt-get install -y mingw64-x-qt mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x-stk mingw64-x-glib2 mingw64-x-portaudio mingw64-x-libsndfile mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime mingw64-x-libgig; fi; fi - if [ $TRAVIS_OS_NAME == osx ]; then - brew upgrade qt libsndfile fftw libvorbis libogg jack sdl libsamplerate stk fluid-synth portaudio fltk + brew upgrade qt libsndfile fftw libvorbis libogg jack sdl libsamplerate stk fluid-synth portaudio fltk; fi before_script: - mkdir build && cd build script: - if [ $TRAVIS_OS_NAME == linux ]; then - if [ $TARGET_OS == win32 ]; then ../build_mingw32 || ../build_mingw32; fi - if [ $TARGET_OS == win64 ]; then ../build_mingw64 || ../build_mingw64; fi + if [ $TARGET_OS == win32 ]; then ../build_mingw32 || ../build_mingw32; fi; + if [ $TARGET_OS == win64 ]; then ../build_mingw64 || ../build_mingw64; fi; if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..; fi fi - if [ $TRAVIS_OS_NAME == osx ]; then - cmake .. + cmake ..; fi - make -j4 VERBOSE=1 - if [ $TARGET_OS == linux ]; then make tests && ./tests/tests; fi; From f15f8ce3df7939d6088b2fb4f54c5a0c497d0345 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 15 Jan 2015 20:51:15 +0100 Subject: [PATCH 03/12] Travis: Fix brew --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3c3a71ae8..5fb64b32f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: cpp compiler: gcc matrix: + exclude: + - os: linux include: - os: linux env: TARGET_OS=linux @@ -26,7 +28,7 @@ install: if [ $TARGET_OS == win64 ]; then sudo apt-get install -y mingw64-x-qt mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x-stk mingw64-x-glib2 mingw64-x-portaudio mingw64-x-libsndfile mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime mingw64-x-libgig; fi; fi - if [ $TRAVIS_OS_NAME == osx ]; then - brew upgrade qt libsndfile fftw libvorbis libogg jack sdl libsamplerate stk fluid-synth portaudio fltk; + brew install qt libsndfile fftw libvorbis libogg jack sdl libsamplerate stk fluid-synth portaudio fltk; fi before_script: - mkdir build && cd build From 4cfba53f71ca90347d5b72cf5ea3ddedd2a93d2e Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 15 Jan 2015 21:22:33 +0100 Subject: [PATCH 04/12] Travis update Try removing that unnecessary linux job --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5fb64b32f..9f74a9087 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,9 @@ matrix: exclude: - os: linux include: - - os: linux - env: TARGET_OS=linux - - os: linux - env: TARGET_OS=win32 - - os: linux - env: TARGET_OS=win64 + - env: TARGET_OS=linux + - env: TARGET_OS=win32 + - env: TARGET_OS=win64 - os: osx before_install: - if [ $TRAVIS_OS_NAME == linux ]; then From d4d26a61384505bd54ef7bcbe61ee4397f1d7337 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 15 Jan 2015 21:35:46 +0100 Subject: [PATCH 05/12] OSX fix --- cmake/modules/BuildPlugin.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake index 0fba9e829..bd3a0f411 100644 --- a/cmake/modules/BuildPlugin.cmake +++ b/cmake/modules/BuildPlugin.cmake @@ -52,7 +52,7 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME) INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "${PLUGIN_DIR}") IF(LMMS_BUILD_APPLE) - SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-bundle_loader ${CMAKE_BINARY_DIR}/lmms") + SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-bundle_loader $") ENDIF(LMMS_BUILD_APPLE) IF(LMMS_BUILD_WIN32) SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES PREFIX "") From bd4a93c1d7436b10dedac47d5977501445e56775 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 15 Jan 2015 22:05:10 +0100 Subject: [PATCH 06/12] Travis: Outsource build scripts --- .travis.yml | 33 ++++----------------------- .travis/linux..before_install.sh | 2 ++ .travis/linux..install.sh | 4 ++++ .travis/linux..script.sh | 1 + .travis/linux.win32.before_install.sh | 2 ++ .travis/linux.win32.install.sh | 7 ++++++ .travis/linux.win32.script.sh | 1 + .travis/linux.win64.before_install.sh | 1 + .travis/linux.win64.install.sh | 7 ++++++ .travis/linux.win64.script.sh | 1 + .travis/osx..before_install.sh | 1 + .travis/osx..install.sh | 1 + .travis/osx..script.sh | 1 + 13 files changed, 33 insertions(+), 29 deletions(-) create mode 100644 .travis/linux..before_install.sh create mode 100644 .travis/linux..install.sh create mode 100644 .travis/linux..script.sh create mode 100644 .travis/linux.win32.before_install.sh create mode 100644 .travis/linux.win32.install.sh create mode 100644 .travis/linux.win32.script.sh create mode 100644 .travis/linux.win64.before_install.sh create mode 100644 .travis/linux.win64.install.sh create mode 100644 .travis/linux.win64.script.sh create mode 100644 .travis/osx..before_install.sh create mode 100644 .travis/osx..install.sh create mode 100644 .travis/osx..script.sh diff --git a/.travis.yml b/.travis.yml index 9f74a9087..52e6cc645 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,45 +1,20 @@ language: cpp compiler: gcc matrix: - exclude: - - os: linux include: - - env: TARGET_OS=linux - env: TARGET_OS=win32 - env: TARGET_OS=win64 - os: osx before_install: - - if [ $TRAVIS_OS_NAME == linux ]; then - if [ $TARGET_OS != linux ]; then sudo add-apt-repository ppa:tobydox/mingw -y; fi; - if [ $TARGET_OS == linux ]; then sudo add-apt-repository ppa:kalakris/cmake -y; fi; - sudo apt-get update -qq; - fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew update; fi + - sh ./travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh install: - - if [ $TRAVIS_OS_NAME == linux ]; then - if [ $TARGET_OS == linux ]; then - sudo apt-get install -y cmake libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev libgig-dev; - fi; - if [ $TARGET_OS != linux ]; then sudo apt-get install -y nsis cloog-isl libmpc2 mingw32; fi; - if [ $TARGET_OS != linux ]; then sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate mingw32-x-pkgconfig mingw32-x-binutils mingw32-x-gcc mingw32-x-runtime mingw32-x-libgig; fi; - if [ $TARGET_OS == win64 ]; then sudo apt-get install -y mingw64-x-qt mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x-stk mingw64-x-glib2 mingw64-x-portaudio mingw64-x-libsndfile mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime mingw64-x-libgig; fi; - fi - - if [ $TRAVIS_OS_NAME == osx ]; then - brew install qt libsndfile fftw libvorbis libogg jack sdl libsamplerate stk fluid-synth portaudio fltk; - fi + - sh ./travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install.sh before_script: - mkdir build && cd build script: - - if [ $TRAVIS_OS_NAME == linux ]; then - if [ $TARGET_OS == win32 ]; then ../build_mingw32 || ../build_mingw32; fi; - if [ $TARGET_OS == win64 ]; then ../build_mingw64 || ../build_mingw64; fi; - if [ $TARGET_OS == linux ]; then cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..; fi - fi - - if [ $TRAVIS_OS_NAME == osx ]; then - cmake ..; - fi + - sh ./travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh - make -j4 VERBOSE=1 - - if [ $TARGET_OS == linux ]; then make tests && ./tests/tests; fi; + - if [[ $TARGET_OS != win* ]]; then make tests && ./tests/tests; fi; before_deploy: make package deploy: provider: releases diff --git a/.travis/linux..before_install.sh b/.travis/linux..before_install.sh new file mode 100644 index 000000000..233bd784f --- /dev/null +++ b/.travis/linux..before_install.sh @@ -0,0 +1,2 @@ +sudo add-apt-repository ppa:kalakris/cmake -y; +sudo apt-get update -qq diff --git a/.travis/linux..install.sh b/.travis/linux..install.sh new file mode 100644 index 000000000..49a6ea466 --- /dev/null +++ b/.travis/linux..install.sh @@ -0,0 +1,4 @@ +sudo apt-get install -y cmake libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev \ + libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev \ + libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib \ + libfltk1.3-dev libgig-dev diff --git a/.travis/linux..script.sh b/.travis/linux..script.sh new file mode 100644 index 000000000..d89b130db --- /dev/null +++ b/.travis/linux..script.sh @@ -0,0 +1 @@ +cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. diff --git a/.travis/linux.win32.before_install.sh b/.travis/linux.win32.before_install.sh new file mode 100644 index 000000000..02a9be79d --- /dev/null +++ b/.travis/linux.win32.before_install.sh @@ -0,0 +1,2 @@ +sudo add-apt-repository ppa:tobydox/mingw -y +sudo apt-get update -qq diff --git a/.travis/linux.win32.install.sh b/.travis/linux.win32.install.sh new file mode 100644 index 000000000..86babb1b7 --- /dev/null +++ b/.travis/linux.win32.install.sh @@ -0,0 +1,7 @@ +sudo apt-get install -y nsis cloog-isl libmpc2 mingw32 + +sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis \ + mingw32-x-fluidsynth mingw32-x-stk mingw32-x-glib2 mingw32-x-portaudio \ + mingw32-x-libsndfile mingw32-x-fftw mingw32-x-flac mingw32-x-fltk \ + mingw32-x-libsamplerate mingw32-x-pkgconfig mingw32-x-binutils \ + mingw32-x-gcc mingw32-x-runtime mingw32-x-libgig diff --git a/.travis/linux.win32.script.sh b/.travis/linux.win32.script.sh new file mode 100644 index 000000000..3831a842f --- /dev/null +++ b/.travis/linux.win32.script.sh @@ -0,0 +1 @@ +../build_mingw32 || ../build_mingw32 diff --git a/.travis/linux.win64.before_install.sh b/.travis/linux.win64.before_install.sh new file mode 100644 index 000000000..a598ff1ca --- /dev/null +++ b/.travis/linux.win64.before_install.sh @@ -0,0 +1 @@ +sh .travis/linux.win32.before_install.sh diff --git a/.travis/linux.win64.install.sh b/.travis/linux.win64.install.sh new file mode 100644 index 000000000..75cc3bcf1 --- /dev/null +++ b/.travis/linux.win64.install.sh @@ -0,0 +1,7 @@ +sh .travis/linux.win32.install.sh + +sudo apt-get install -y mingw64-x-qt mingw64-x-sdl mingw64-x-libvorbis \ + mingw64-x-fluidsynth mingw64-x-stk mingw64-x-glib2 mingw64-x-portaudio \ + mingw64-x-libsndfile mingw64-x-fftw mingw64-x-flac mingw64-x-fltk \ + mingw64-x-libsamplerate mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc\ + mingw64-x-runtime mingw64-x-libgig diff --git a/.travis/linux.win64.script.sh b/.travis/linux.win64.script.sh new file mode 100644 index 000000000..7c6c4f96a --- /dev/null +++ b/.travis/linux.win64.script.sh @@ -0,0 +1 @@ +../build_mingw64 || ../build_mingw64 diff --git a/.travis/osx..before_install.sh b/.travis/osx..before_install.sh new file mode 100644 index 000000000..3387d7dcf --- /dev/null +++ b/.travis/osx..before_install.sh @@ -0,0 +1 @@ +brew update diff --git a/.travis/osx..install.sh b/.travis/osx..install.sh new file mode 100644 index 000000000..af530b225 --- /dev/null +++ b/.travis/osx..install.sh @@ -0,0 +1 @@ +brew install qt libsndfile fftw libvorbis libogg jack sdl libsamplerate stk fluid-synth portaudio fltk diff --git a/.travis/osx..script.sh b/.travis/osx..script.sh new file mode 100644 index 000000000..d89b130db --- /dev/null +++ b/.travis/osx..script.sh @@ -0,0 +1 @@ +cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. From 4c0705359ab7e9b25498ba1eb8ab3ab7005eb00d Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 15 Jan 2015 22:23:26 +0100 Subject: [PATCH 07/12] OSX fix try #2 --- cmake/modules/BuildPlugin.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake index bd3a0f411..3add78661 100644 --- a/cmake/modules/BuildPlugin.cmake +++ b/cmake/modules/BuildPlugin.cmake @@ -52,7 +52,8 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME) INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "${PLUGIN_DIR}") IF(LMMS_BUILD_APPLE) - SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-bundle_loader $") + SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-bundle_loader ${CMAKE_BINARY_DIR}/lmms") + ADD_DEPENDENCIES(${PLUGIN_NAME} lmms) ENDIF(LMMS_BUILD_APPLE) IF(LMMS_BUILD_WIN32) SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES PREFIX "") From eea616f08059d96104f44dea9638b1b5cca196cc Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 15 Jan 2015 22:26:04 +0100 Subject: [PATCH 08/12] Travis: Disable linux builds (temporarily) --- .travis.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 52e6cc645..b796e97c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,19 @@ language: cpp compiler: gcc -matrix: - include: - - env: TARGET_OS=win32 - - env: TARGET_OS=win64 - - os: osx +os: osx +#matrix: +# include: +# - env: TARGET_OS=win32 +# - env: TARGET_OS=win64 +# - os: osx before_install: - - sh ./travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh + - sh ./.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh install: - - sh ./travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install.sh + - sh ./.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install.sh before_script: - mkdir build && cd build script: - - sh ./travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh + - sh ./.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh - make -j4 VERBOSE=1 - if [[ $TARGET_OS != win* ]]; then make tests && ./tests/tests; fi; before_deploy: make package From 7e43541fe58548fdf509f943a8f19dd5de6d7c18 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 15 Jan 2015 22:34:51 +0100 Subject: [PATCH 09/12] Travis: Fix script path error --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b796e97c1..8be09df37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,13 @@ os: osx # - env: TARGET_OS=win64 # - os: osx before_install: - - sh ./.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh + - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh install: - - sh ./.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install.sh + - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install.sh before_script: - mkdir build && cd build script: - - sh ./.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh + - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh - make -j4 VERBOSE=1 - if [[ $TARGET_OS != win* ]]; then make tests && ./tests/tests; fi; before_deploy: make package From 85d7843c9888a14b9cbd8990e9212a05260668d5 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 15 Jan 2015 23:10:28 +0100 Subject: [PATCH 10/12] Tests: Fix CMake version check --- tests/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 56520dd89..9b77a02f9 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,5 @@ -IF(CMAKE_MAJOR_VERSION LESS 2 OR - CMAKE_MINOR_VERSION LESS 8 OR +IF(CMAKE_MAJOR_VERSION LESS 2 AND + CMAKE_MINOR_VERSION LESS 8 AND CMAKE_PATCH_VERSION LESS 8) MESSAGE("-- Unit tests are only available in CMake >=2.8.8. You have ${CMAKE_VERSION}") RETURN() From b5019e53d185d6891ff93a1549a6c6e66e88d2ed Mon Sep 17 00:00:00 2001 From: Lukas W Date: Fri, 16 Jan 2015 00:04:09 +0100 Subject: [PATCH 11/12] Travis: Re-enable linux builds --- .travis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8be09df37..390f7f0b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,10 @@ language: cpp compiler: gcc -os: osx -#matrix: -# include: -# - env: TARGET_OS=win32 -# - env: TARGET_OS=win64 -# - os: osx +matrix: + include: + - env: TARGET_OS=win32 + - env: TARGET_OS=win64 + - os: osx before_install: - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh install: From 59513f9a49af89fb9a9b47e19f121773a9b115fb Mon Sep 17 00:00:00 2001 From: Lukas W Date: Fri, 16 Jan 2015 00:25:10 +0100 Subject: [PATCH 12/12] Fix that CMake version check again --- tests/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9b77a02f9..0a2df0256 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,6 +1,6 @@ -IF(CMAKE_MAJOR_VERSION LESS 2 AND - CMAKE_MINOR_VERSION LESS 8 AND - CMAKE_PATCH_VERSION LESS 8) +IF(NOT (CMAKE_MAJOR_VERSION GREATER 2 OR + CMAKE_MINOR_VERSION GREATER 8 OR + CMAKE_PATCH_VERSION GREATER 7)) MESSAGE("-- Unit tests are only available in CMake >=2.8.8. You have ${CMAKE_VERSION}") RETURN() ENDIF()