From 141e8069800a3cf1dea30361242af0c45a4dc284 Mon Sep 17 00:00:00 2001
From: Ville Ranki <ville.ranki@iki.fi>
Date: Fri, 29 Mar 2019 23:10:38 +0200
Subject: [PATCH] More travis fixes. Disabled transformer build for Qt < 5.8

---
 .travis.yml         |  4 ++--
 Dockerfile          |  3 ++-
 ExtPlane.pro        | 15 ++++++++++-----
 README.md           |  4 ++++
 scripts/ci-build.sh | 12 ++++--------
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d21afef..c2ad8a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,8 @@ deploy:
   api_key:
     secure: mGPELl1Bc2nkK6JPsyorKkYC7uAwP4H5AfGev5vpIoOfC0Kp/ubRNVKE3771/tzPw4P2QpYDTvl9dL0hGJcoVEUeomRuBoNViueAzpZVJQSNo68lbse+SAMi2JHSs+p0uyDdIVY51Hu5NFQYnDWvxIgbv4RF8mztymdSS1CtDlU=
   file:
-    - "extplane-plugin/extplane.zip"
-    - "extplane-transformer/extplane-transformer.zip"
+    - "extplane-plugin.zip"
+    - "extplane-transformer.zip"
   skip_cleanup: true
   on:
     repo: vranki/ExtPlane
diff --git a/Dockerfile b/Dockerfile
index 91dfd32..0557f68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
 from ubuntu:xenial
 # Update to newer ubuntu release when MXE supports..
 RUN apt update -qq
-RUN apt -yq install gnupg ca-certificates apt-transport-https
+RUN apt -yq install gnupg ca-certificates apt-transport-https software-properties-common
 RUN echo "deb http://mirror.mxe.cc/repos/apt xenial main" | tee /etc/apt/sources.list.d/mxeapt.list
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C6BF758A33A3A276
+RUN add-apt-repository -y ppa:beineri/opt-qt-5.11.0-xenial
 RUN apt update -qq
 RUN apt install -yq mxe-x86-64-w64-mingw32.static-qtbase mxe-x86-64-w64-mingw32.static-qtdeclarative
 RUN apt install -yq qtbase5-dev qtdeclarative5-dev qt5-default build-essential
diff --git a/ExtPlane.pro b/ExtPlane.pro
index 570f88f..5373ce9 100644
--- a/ExtPlane.pro
+++ b/ExtPlane.pro
@@ -1,16 +1,21 @@
 TEMPLATE = subdirs
 SUBDIRS = extplane-server \
-    clients/extplane-client-qt \
-    extplane-transformer
+    clients/extplane-client-qt
 CONFIG += ordered
 
 include(common.pri)
 
 defined(XPLANE_SDK_PATH, var) {
-  message("Building X-Plane plugin with SDK in $$XPLANE_SDK_PATH")
-  SUBDIRS += extplane-plugin
+    message("Building X-Plane plugin with SDK in $$XPLANE_SDK_PATH")
+    SUBDIRS += extplane-plugin
 } else {
-  warning("No X-Plane SDK found in ../XPlaneSDK or ~/SDK - not building X-Plane plugin")
+    warning("No X-Plane SDK found in ../XPlaneSDK or ~/SDK - not building X-Plane plugin")
+}
+
+versionAtLeast(QT_VERSION, 5.8.0) {
+    SUBDIRS += extplane-transformer
+} else {
+    warning(Qt 5.8.0 needed to build extplane-transformer - skipping $$QT_VERSION)
 }
 
 OTHER_FILES += README.md clients/extplane-client-qt/README
diff --git a/README.md b/README.md
index e0420f9..d39b784 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,10 @@ external programs through an easy-to-use TCP protocol.
 * Condor soaring simulator 1 and 2
 * FlightGear - basic support via Transformer (see later)
 
+NOTE: ExtPlane-transformer (support for other sims except X-Plane) is not available in
+github releases, as building it requires Qt 5.8 and the ci container has older one..
+This will eventually be fixed.
+
 ## Features ##
 
 * Multiple concurrent connections
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index 5e290eb..7aea53f 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -22,16 +22,12 @@ fi
 # Build for linux first..
 qmake -r
 make
+zip -r extplane-plugin.zip extplane-plugin/extplane/64/*.xpl
+zip extplane-transformer.zip extplane-transformer/extplane-transformer-linux extplane-transformer.exe
 make clean distclean
 
 # Build for windows..
 ./scripts/cross-compile-win64-from-lin.sh
-
-# Zip the results for release
-pushd extplane-plugin
-zip -r extplane.zip extplane
-popd
-pushd extplane-transformer
-zip extplane-transformer.zip extplane-transformer-linux extplane-transformer.exe
-popd
+zip -r extplane-plugin.zip extplane-plugin/extplane/64/*.xpl
+zip extplane-transformer.zip extplane-transformer/extplane-transformer.exe