Skip to content

Commit

Permalink
Add transfer.sh support
Browse files Browse the repository at this point in the history
  • Loading branch information
tresf committed Dec 8, 2017
1 parent 4cc56c8 commit 89d2a45
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis/linux..script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ source /opt/qt58/bin/qt58-env.sh
set -e

# shellcheck disable=SC2086
cmake -DUSE_WERROR=ON $CMAKE_FLAGS ..
cmake -DUSE_WERROR=ON -DCMAKE_INSTALL_PREFIX=../target $CMAKE_FLAGS ..
2 changes: 1 addition & 1 deletion .travis/osx..script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ CMAKE_PREFIX_PATH="$(brew --prefix qt@5.5)"
export CMAKE_PREFIX_PATH

# shellcheck disable=SC2086
cmake $CMAKE_FLAGS -DUSE_WERROR=OFF ..
cmake -DUSE_WERROR=OFF -DCMAKE_INSTALL_PREFIX=../target $CMAKE_FLAGS ..
28 changes: 28 additions & 0 deletions .travis/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,32 @@ else
tests/tests

fi

# Package and upload non-tagged builds
if [ ! -z "$TRAVIS_TAG" ]; then
# Skip, handled by travis deploy instead
exit 0
elif [[ $TARGET_OS == win* ]]; then
make -j4 package
PACKAGE="$(ls lmms-*win*.exe)"
elif [[ $TRAVIS_OS_NAME == osx ]]; then
make -j4 install > /dev/null
make dmg
PACKAGE="$(ls lmms-*.dmg)"
else
make -j4 install > /dev/null
make appimage
PACKAGE="$(ls lmms-*.AppImage)"
fi

echo "Uploading $PACKAGE to file.io..."
response=$(curl --upload-file "$PACKAGE" "https://transfer.sh/$PACKAGE" || true)
# We need stdout, disable SC2181
# shellcheck disable=SC2181
if [ $? -eq 0 ]; then
status="Success:\n$response"
else
status="Sorry, $PACKAGE didn't upload properly"
fi
echo -e "\n\n$status\n\n"
fi
9 changes: 7 additions & 2 deletions plugins/LadspaEffect/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@ BUILD_PLUGIN(ladspaeffect LadspaEffect.cpp LadspaControls.cpp LadspaControlDialo

SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ladspa")

# Disable C++11
SET(CMAKE_CXX_STANDARD 98)
# Enable C++11 for all except mingw builds
# TODO: Validate against modern mingw compiler
IF(NOT MINGW_PREFIX)
SET(CMAKE_CXX_STANDARD 11)
ELSE()
SET(CMAKE_CXX_STANDARD 98)
ENDIF()

IF(WANT_CAPS)
ADD_SUBDIRECTORY(caps)
Expand Down

0 comments on commit 89d2a45

Please sign in to comment.