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 217efa8 commit ebb5a87
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 7 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 [email protected])"
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
make dmg
PACKAGE="$(ls lmms-*.dmg)"
else
make -j4 install
make appimage
PACKAGE="$(ls lmms-*.AppImage)"
fi

echo "Uploading $PACKAGE to file.io..."
response=$(curl --upload-file "$PACKAGE" "https://transfer.sh/$PACKAGE")
# 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
2 changes: 1 addition & 1 deletion plugins/LadspaEffect/calf/veal
Submodule veal updated 1 files
+1 −0 src/calf/primitives.h
5 changes: 4 additions & 1 deletion plugins/LadspaEffect/swh/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ ENDIF()

# Additional compile flags
SET(COMPILE_FLAGS "${COMPILE_FLAGS} -O3 -Wall")
SET(COMPILE_FLAGS "${COMPILE_FLAGS} -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -c -fno-strict-aliasing")
SET(COMPILE_FLAGS "${COMPILE_FLAGS} -fomit-frame-pointer -funroll-loops -ffast-math -c -fno-strict-aliasing")
SET(COMPILE_FLAGS "${COMPILE_FLAGS} ${PIC_FLAGS}")
IF(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
SET(COMPILE_FLAGS "${COMPILE_FLAGS} -fstrength-reduce")
ENDIF()

# Loop over every XML file
FILE(GLOB XML_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ladspa/*.xml")
Expand Down
5 changes: 4 additions & 1 deletion plugins/LadspaEffect/tap/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
FILE(GLOB PLUGIN_SOURCES tap-plugins/*.c)
LIST(SORT PLUGIN_SOURCES)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wno-write-strings -fomit-frame-pointer -fno-strict-aliasing -fstrength-reduce -funroll-loops -ffast-math")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wno-write-strings -fomit-frame-pointer -fno-strict-aliasing -funroll-loops -ffast-math")
IF(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstrength-reduce")
ENDIF()
FOREACH(_item ${PLUGIN_SOURCES})
GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE)
ADD_LIBRARY("${_plugin}" MODULE "${_item}")
Expand Down

0 comments on commit ebb5a87

Please sign in to comment.