From 36e61d765a5c98c574208a337b6bbded08a9372e Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Tue, 30 Jun 2020 00:52:20 +0000 Subject: [PATCH] Test with utf8 and nostl variants of wx on Travis. Build on bionic with downloaded stow packages in /usr/local. f51e1ee4 is actually a fix for a wx with --enable-utf8 and NOT for a wx with --disable-stl, as it turns out. FreeBSD uses --enable-utf8, while Linux distributions generally don't. Tested by reverting f51e1ee4. Signed-off-by: Rafael Kitover --- .travis.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8711427d..bfcc9075 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,10 @@ matrix: include: - env: BUILD_ENV=ubuntu-bionic XVFB_RUN=1 dist: bionic + - env: BUILD_ENV=utf8 XVFB_RUN=1 + dist: bionic + - env: BUILD_ENV=nostl XVFB_RUN=1 + dist: bionic - env: BUILD_ENV=ubuntu-trusty XVFB_RUN=1 dist: trusty - env: BUILD_ENV=ubuntu-xenial XVFB_RUN=1 @@ -54,6 +58,20 @@ before_script: if [ -n "$ENABLE_SDL" ]; then CMAKE_ARGS="$CMAKE_ARGS -DENABLE_SDL=ON" fi + case "$BUILD_ENV" in + utf8|nostl) + sudo apt-get -y install stow libwxgtk3.0-gtk3-dev + ( + cd / + sudo curl -LO 'http://cachemiss.com/files/wxWidgets-gtk3-'"$BUILD_ENV"'-3.0.5.tar.gz' + sudo tar zxvf wxWidgets-gtk3-"$BUILD_ENV"-3.0.5.tar.gz + cd /usr/local/stow + sudo stow wxWidgets-gtk3-"$BUILD_ENV"-3.0.5 + ) + export LD_LIBRARY_PATH=/usr/local/lib + CMAKE_ARGS="$CMAKE_ARGS -DwxWidgets_CONFIG_EXECUTABLE=/usr/local/bin/wx-config -DWXRC=/usr/local/bin/wxrc" + ;; + esac script: - mkdir -p -- "$DIR"