From af74d9853c02674b75e3947f713afd579f7b8653 Mon Sep 17 00:00:00 2001
From: Pentarctagon <pentarctagon@tutamail.com>
Date: Wed, 19 Feb 2020 20:34:32 -0600
Subject: [PATCH] Remove code for no longer used scons/cmake travis builds.

---
 utils/travis/steps/install.sh |  9 ++------
 utils/travis/steps/script.sh  | 40 ++++++++++-------------------------
 2 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/utils/travis/steps/install.sh b/utils/travis/steps/install.sh
index 8ab643304c3..f7b2b47bc62 100755
--- a/utils/travis/steps/install.sh
+++ b/utils/travis/steps/install.sh
@@ -19,13 +19,8 @@ if [ "$LTO" == "" ]; then
 fi
 
 if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    if [ "$TOOL" = "xcodebuild" ]; then
-        HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache
-        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
+    HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache
+    travis_wait ./projectfiles/Xcode/Fix_Xcode_Dependencies
 elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
     start=`pwd`
     choco install sqlite
diff --git a/utils/travis/steps/script.sh b/utils/travis/steps/script.sh
index e55ab76bf83..74bd06c7e82 100755
--- a/utils/travis/steps/script.sh
+++ b/utils/travis/steps/script.sh
@@ -1,41 +1,23 @@
 #!/bin/bash
 
 if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    if [ "$TOOL" = "xcodebuild" ]; then
-        export PATH="/usr/local/opt/ccache/libexec:$PWD/utils/travis:$PATH"
-        export CC=ccache-clang
-        export CXX=ccache-clang++
+    export PATH="/usr/local/opt/ccache/libexec:$PWD/utils/travis:$PATH"
+    export CC=ccache-clang
+    export CXX=ccache-clang++
 
-        cd ./projectfiles/Xcode
+    cd ./projectfiles/Xcode
 
-        export CCACHE_MAXSIZE=500M
-        export CCACHE_COMPILERCHECK=content
+    export CCACHE_MAXSIZE=500M
+    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 -z
+    ccache -s
+    ccache -z
 
-        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
+    exit $BUILD_RET
 elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
     powershell "MSBuild.exe projectfiles/VC14/wesnoth.sln -p:PlatformToolset=v141 -p:Configuration=$OPT"
     BUILD_RET=$?