chore: Update travis build scripts

.travis.yml

@@ -10,20 +10,24 @@ cache:
 
 matrix:
   include:
+    - os: linux
+      env:
+        - VM=ubuntu
+        - TAG=16.04
     - os: linux
       env:
         - VM=ubuntu
         - TAG=18.04
     - os: linux
       env: 
-        - VM=mxe-w32-ubuntu
-        - TAG=18.04
+        - VM=mxe
+        - TAG=qt-5.12
     - os: osx
       compiler: clang
 
 install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew install qt5 qbs net-snmp ;
+      brew install qt cmake openssl net-snmp ;
     fi
 
 before_script:
@@ -33,10 +37,14 @@ before_script:
 
 script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      docker run -v $(pwd):/root -it fwbuilder/$VM:$TAG "docker/travis.${VM}_${TAG}.sh" ;
+      docker run -v $(pwd):/fwbuilder -it fwbuilder/$VM:$TAG "docker/travis.${VM}_${TAG}.sh" ;
     fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       export PATH="/usr/local/opt/qt/bin:/usr/local/opt/net-snmp/bin:$PATH" ;
-      ./build_mac.sh all ;
+      export OPENSSL_ROOT_DIR="/usr/local/opt/openssl" ;
+      mkdir build ;
+      cd build ;
+      cmake .. ;
+      make -j$(sysctl -n hw.ncpu) install ;
     fi
 

docker/Dockerfile.mxe-w32-ubuntu_18.04

@@ -1,52 +0,0 @@
-FROM ubuntu:18.04
-
-# We need this to use apt-key
-RUN apt-get update && apt-get install -y \
-    dirmngr
-
-# Add mxe repos
-RUN echo "deb http://pkg.mxe.cc/repos/apt/debian wheezy main" > \
-    /etc/apt/sources.list.d/mxeapt.list && \
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB
-
-RUN apt-get update && apt-get install -y \
-    autoconf \
-    automake \
-    autopoint \
-    bash \
-    bison \
-    bzip2 \
-    flex \
-    gettext \
-    git \
-    g++ \
-    g++-multilib \
-    gperf \
-    intltool \
-    libc6-dev-i386 \
-    libffi-dev \
-    libgdk-pixbuf2.0-dev \
-    libtool \
-    libltdl-dev \
-    libssl-dev \
-    libxml-parser-perl \
-    make \
-    openssl \
-    p7zip-full \
-    patch \
-    perl \
-    pkg-config \
-    python \
-    ruby \
-    scons \
-    sed \
-    unzip \
-    wget \
-    xz-utils \
-    nsis \
-    qbs \
-    mxe-i686-w64-mingw32.shared-qtbase \
-    mxe-i686-w64-mingw32.shared-libxml2 \
-    mxe-i686-w64-mingw32.shared-libxslt
-
-WORKDIR /root

docker/Dockerfile.mxe_qt-5.12

@@ -0,0 +1,37 @@
+FROM debian:stretch AS builder
+RUN apt-get update && apt-get install -y \
+    autoconf \
+    automake \
+    autopoint \
+    binutils \
+    bison \
+    build-essential \
+    bzip2 \
+    cmake \
+    fakeroot \
+    flex \
+    git \
+    make \
+    gperf \
+    intltool \
+    libgdk-pixbuf2.0-dev \
+    libtool \
+    libtool-bin \
+    lzip \
+    python \
+    p7zip-full \
+    ruby \
+    unzip \
+    wget
+WORKDIR /opt
+RUN git clone https://github.com/mxe/mxe.git
+# Use Qt 5.12.4
+RUN cd mxe && git checkout 0567f17d34463abda1790957812c54e8c0cf59fe -- src/qtbase.mk
+RUN cd mxe && make MXE_TARGETS='i686-w64-mingw32.shared' -j$(nproc) qtbase libxml2 libxslt
+RUN rm -rf /opt/mxe/.ccache
+
+FROM debian:stretch
+RUN apt-get update && apt-get install -y nsis make git
+WORKDIR /
+COPY --from=builder /opt/mxe /opt/mxe
+CMD ["bash"]

docker/Dockerfile.ubuntu_16.04

@@ -11,7 +11,9 @@ RUN apt-get update && apt-get install -y \
     libxslt1-dev \
     make \
     nsis \
-    qbs \
+    cmake \
+    git \
     qt5-default
 
-WORKDIR /root
+WORKDIR /
+CMD ["bash"]

docker/Dockerfile.ubuntu_18.04

@@ -11,7 +11,9 @@ RUN apt-get update && apt-get install -y \
     libxslt1-dev \
     make \
     nsis \
-    qbs \
+    cmake \
+    git \
     qt5-default
 
-WORKDIR /root
+WORKDIR /
+CMD ["bash"]

docker/travis.mxe-w32-ubuntu_18.04.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e -x
-
-./build_mxe-w32.sh configure compile

docker/travis.mxe_qt-5.12.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e -x
+
+export PATH=$PATH:/opt/mxe/usr/bin
+
+mkdir -p /fwbuilder/build
+cd /fwbuilder/build
+i686-w64-mingw32.shared-cmake ..
+make -j$(nproc)

docker/travis.ubuntu_16.04.sh

@@ -2,6 +2,7 @@
 
 set -e -x
 
-qbs setup-toolchains --detect
-qbs setup-qt $(which qmake) qt
-qbs debug profile:qt
+mkdir -p /fwbuilder/build
+cd /fwbuilder/build
+cmake ..
+make -j$(nproc)

docker/travis.ubuntu_18.04.sh

@@ -2,6 +2,7 @@
 
 set -e -x
 
-qbs setup-toolchains --detect
-qbs setup-qt $(which qmake) qt
-qbs debug profile:qt
+mkdir -p /fwbuilder/build
+cd /fwbuilder/build
+cmake ..
+make -j$(nproc)