duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

I hate this so much

Browse source 
Some console output would be nice, but Travis's Windows support is
trash and MSYS2 isn't treated as standard at all
This commit is contained in:
Clownacy 2020-01-23 19:51:59 +00:00
parent 52e2b1da34
commit f1c59e466d
1 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
.travis.yml
View file

@ -156,15 +156,7 @@ install:
before_script: before_script:
# Make build directory and generate CMake build files # Make build directory and generate CMake build files
- | - |
if [ "${TRAVIS_OS_NAME}" == "windows" ]; then if [ "${TRAVIS_OS_NAME}" != "windows" ]; then
mkdir -p ${CMAKE_BUILD_DIR} && cd ${CMAKE_BUILD_DIR}
$mingw32 cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DWARNINGS_ALL=ON -G"Unix Makefiles"
cd ..
mkdir -p ${CMAKE_BUILD_DIR2} && cd ${CMAKE_BUILD_DIR2}
$mingw64 cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DWARNINGS_ALL=ON -G"MSYS Makefiles"
cd ..
else
mkdir -p ${CMAKE_BUILD_DIR} && cd ${CMAKE_BUILD_DIR} mkdir -p ${CMAKE_BUILD_DIR} && cd ${CMAKE_BUILD_DIR}
cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DWARNINGS_ALL=ON cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DWARNINGS_ALL=ON
cd .. cd ..
@ -172,24 +164,17 @@ before_script:
script: script:
# CMake build # CMake build
- ls - if [ "${TRAVIS_OS_NAME}" != "windows" ]; then
- ls ${CMAKE_BUILD_DIR} cd ${CMAKE_BUILD_DIR}
- ls ${CMAKE_BUILD_DIR2} $mingw32 cmake --build . --config $CMAKE_BUILD_TYPE --parallel $JOBS
- cd ${CMAKE_BUILD_DIR} cd ..
- $mingw32 cmake --build . --config $CMAKE_BUILD_TYPE --parallel $JOBS fi
- cd ..
# Make build # Make build
- $mingw32 make -j $JOBS FIX_BUGS=1 $MAKE_BUILD_TYPE WARNINGS=1 WARNINGS_ALL=1 - $mingw32 make -j $JOBS FIX_BUGS=1 $MAKE_BUILD_TYPE WARNINGS=1 WARNINGS_ALL=1
- | - |
if [ "${TRAVIS_OS_NAME}" == "windows" ]; then if [ "${TRAVIS_OS_NAME}" == "windows" ]; then
# CMake build
cd ${CMAKE_BUILD_DIR2}
$mingw64 cmake --build . --config $CMAKE_BUILD_TYPE --parallel $JOBS
cd ..
# Make build
$mingw64 make -j $JOBS FIX_BUGS=1 $MAKE_BUILD_TYPE WARNINGS=1 WARNINGS_ALL=1 $mingw64 make -j $JOBS FIX_BUGS=1 $MAKE_BUILD_TYPE WARNINGS=1 WARNINGS_ALL=1
fi fi