Fix broken Qt version check to compile linux extplane-transformer in ci

vranki · Sep 19, 2019 · 1ece4f1 · 1ece4f1
1 parent 1bc9d01
commit 1ece4f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/ExtPlane.pro b/ExtPlane.pro
@@ -1,6 +1,8 @@
 TEMPLATE = subdirs
 SUBDIRS = extplane-server \
-    clients/extplane-client-qt
+    clients/extplane-client-qt \
+    extplane-transformer
+
 CONFIG += ordered
 
 include(common.pri)
@@ -12,10 +14,4 @@ defined(XPLANE_SDK_PATH, var) {
     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 Dockerfile scripts/*
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
@@ -19,15 +19,16 @@ else
   echo "X-Plane SDK already exists"
 fi
 
+rm extplane-plugin.zip
+
 # 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
+zip -r 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 -r extplane-plugin.zip extplane-plugin/extplane/64/*.xpl
-zip extplane-transformer.zip extplane-transformer/extplane-transformer.exe
-
+zip -r extplane-transformer.zip extplane-transformer/extplane-transformer.exe