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 <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2020-06-30 00:52:20 +00:00
parent 306f92f5d7
commit 36e61d765a
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 18 additions and 0 deletions

View File

@ -10,6 +10,10 @@ matrix:
include: include:
- env: BUILD_ENV=ubuntu-bionic XVFB_RUN=1 - env: BUILD_ENV=ubuntu-bionic XVFB_RUN=1
dist: bionic 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 - env: BUILD_ENV=ubuntu-trusty XVFB_RUN=1
dist: trusty dist: trusty
- env: BUILD_ENV=ubuntu-xenial XVFB_RUN=1 - env: BUILD_ENV=ubuntu-xenial XVFB_RUN=1
@ -54,6 +58,20 @@ before_script:
if [ -n "$ENABLE_SDL" ]; then if [ -n "$ENABLE_SDL" ]; then
CMAKE_ARGS="$CMAKE_ARGS -DENABLE_SDL=ON" CMAKE_ARGS="$CMAKE_ARGS -DENABLE_SDL=ON"
fi 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: script:
- mkdir -p -- "$DIR" - mkdir -p -- "$DIR"