Docker / ci fixes

Dockerfile

@@ -1,11 +1,15 @@
-from ubuntu:latest
-
+from ubuntu:xenial
+# Update to newer ubuntu release when MXE supports..
 RUN apt update -qq
-RUN apt -yq install gnupg ca-certificates
-RUN echo "deb https://mirror.mxe.cc/repos/apt xenial main" | tee /etc/apt/sources.list.d/mxeapt.list
+RUN apt -yq install gnupg ca-certificates apt-transport-https
+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 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
+RUN wget http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK300.zip
+RUN unzip *.zip
+RUN rm XPSDK300.zip
+RUN mv SDK /XPlaneSDK
 

ExtPlane.pro

@@ -7,10 +7,10 @@ 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")
 }
 
 OTHER_FILES += README.md clients/extplane-client-qt/README

extplane-plugin/extplane-plugin.pro

@@ -46,7 +46,7 @@ QMAKE_LFLAGS += -shared
 
 
 # Link to static library
-QMAKE_LFLAGS += ../extplane-server/libextplane-server.a ../clients/extplane-client-qt/libextplane-client-qt.a
+QMAKE_LFLAGS += ../extplane-server/libextplane-server.a
 
 #  -static-libgcc  <- fails on mac
 

scripts/ci-build.sh

@@ -16,8 +16,7 @@ if [ ! -d ../XPlaneSDK/CHeaders ] ; then
   rm XPSDK300.zip
   mv SDK ../XPlaneSDK
 else
-  echo "X-Plane SDK already exists and contains:"
-  ls -lh ../XPlaneSDK
+  echo "X-Plane SDK already exists"
 fi
 
 # Build for linux first..