0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove code for no longer used scons/cmake travis builds.

Browse source
This commit is contained in:
Pentarctagon 2020-02-19 20:34:32 -06:00 • committed by Pentarctagon
parent abd7aed0f9
commit af74d9853c
2 changed files with 13 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
utils/travis/steps/install.sh
View file

@ -19,13 +19,8 @@ if [ "$LTO" == "" ]; then
fi fi
if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$TRAVIS_OS_NAME" = "osx" ]; then
if [ "$TOOL" = "xcodebuild" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache
HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache travis_wait ./projectfiles/Xcode/Fix_Xcode_Dependencies
travis_wait ./projectfiles/Xcode/Fix_Xcode_Dependencies
else
HOMEBREW_NO_AUTO_UPDATE=1 brew install scons cairo pango moreutils sdl2_image sdl2_ttf sdl2_mixer glew ccache
HOMEBREW_NO_AUTO_UPDATE=1 brew reinstall libffi
fi
elif [ "$TRAVIS_OS_NAME" = "windows" ]; then elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
start=`pwd` start=`pwd`
choco install sqlite choco install sqlite

40
utils/travis/steps/script.sh
View file

@ -1,41 +1,23 @@
#!/bin/bash #!/bin/bash
if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$TRAVIS_OS_NAME" = "osx" ]; then
if [ "$TOOL" = "xcodebuild" ]; then export PATH="/usr/local/opt/ccache/libexec:$PWD/utils/travis:$PATH"
export PATH="/usr/local/opt/ccache/libexec:$PWD/utils/travis:$PATH" export CC=ccache-clang
export CC=ccache-clang export CXX=ccache-clang++
export CXX=ccache-clang++
cd ./projectfiles/Xcode cd ./projectfiles/Xcode
export CCACHE_MAXSIZE=500M export CCACHE_MAXSIZE=500M
export CCACHE_COMPILERCHECK=content export CCACHE_COMPILERCHECK=content
xcodebuild GCC_GENERATE_DEBUGGING_SYMBOLS=NO -project "The Battle for Wesnoth.xcodeproj" -target "The Battle for Wesnoth" -configuration "$OPT" xcodebuild GCC_GENERATE_DEBUGGING_SYMBOLS=NO -project "The Battle for Wesnoth.xcodeproj" -target "The Battle for Wesnoth" -configuration "$OPT"
BUILD_RET=$? BUILD_RET=$?
ccache -s ccache -s
ccache -z ccache -z
exit $BUILD_RET exit $BUILD_RET
else
"$CXX" --version
if [ "$TOOL" = "scons" ]; then
ln -s $HOME/build-cache/ build
export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig"
scons wesnoth wesnothd campaignd boost_unit_tests build=release \
ctool="$CC" cxxtool="$CXX" cxx_std="$CXXSTD" \
extra_flags_config="-pipe" opt="$OPT" strict=true \
nls="$NLS" enable_lto="$LTO" jobs=2 --debug=time
else
cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_GAME=true -DENABLE_SERVER=true -DENABLE_CAMPAIGN_SERVER=true -DENABLE_TESTS=true -DENABLE_NLS=false \
-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCXX_STD="$CXXSTD"\
-DEXTRA_FLAGS_CONFIG="-pipe" -DOPT="$OPT" -DENABLE_STRICT_COMPILATION="$STRICT" && \
make VERBOSE=1 -j2
fi
fi
elif [ "$TRAVIS_OS_NAME" = "windows" ]; then elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
powershell "MSBuild.exe projectfiles/VC14/wesnoth.sln -p:PlatformToolset=v141 -p:Configuration=$OPT" powershell "MSBuild.exe projectfiles/VC14/wesnoth.sln -p:PlatformToolset=v141 -p:Configuration=$OPT"
BUILD_RET=$? BUILD_RET=$?