Fixed connection issue & docker / ci build

vranki · Sep 9, 2019 · 717c244 · 717c244
1 parent b695ff2
commit 717c244
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/ExtPlane.pro b/ExtPlane.pro
@@ -18,4 +18,4 @@ versionAtLeast(QT_VERSION, 5.8.0) {
     warning(Qt 5.8.0 needed to build extplane-transformer - skipping $$QT_VERSION)
 }
 
-OTHER_FILES += README.md clients/extplane-client-qt/README
+OTHER_FILES += README.md clients/extplane-client-qt/README Dockerfile scripts/*
diff --git a/README.md b/README.md
@@ -94,6 +94,7 @@ binaries.
 docker build -t extplane .
 docker run -it -v $PWD:/ExtPlane -w /ExtPlane extplane ./scripts/ci-build.sh
 ```
+You should end up with extplane-transformer.zip and extplane-plugin.zip with both linux & windows versions inside.
 
 ### Debian/Ubuntu Linux ###
 ```bash

diff --git a/clients/extplane-client-qt/simulatedextplaneconnection.cpp b/clients/extplane-client-qt/simulatedextplaneconnection.cpp
@@ -27,6 +27,9 @@ void SimulatedExtPlaneConnection::stopConnection() {
     emit connectionMessage("Stopped simulated");
 }
 
+void SimulatedExtPlaneConnection::connectionChangedSlot() { // Host or port changed -reconnect
+}
+
 void SimulatedExtPlaneConnection::keyPress(int id) {
     emit connectionMessage(QString("Simulated key press id %1").arg(id));
 }

diff --git a/clients/extplane-client-qt/simulatedextplaneconnection.h b/clients/extplane-client-qt/simulatedextplaneconnection.h
@@ -29,6 +29,8 @@ public slots:
 
 private slots:
     void tickTime();
+    virtual void connectionChangedSlot();
+
 private:
     virtual void writeLine(QString line);
     virtual ClientDataRef *createDataRef(QString name, double accuracy=0);

diff --git a/scripts/cross-compile-win64-from-lin.sh b/scripts/cross-compile-win64-from-lin.sh
@@ -21,8 +21,8 @@
 # Good luck!
 #
 
-if [ ! -d ../ExtPlane-Panel ] ; then
-   echo "Run this from ExtPlane-Panel subdirectory is. Read the comments in script."
+if [ ! -d ../ExtPlane ] ; then
+   echo "Run this from ExtPlane subdirectory is. Read the comments in script."
    exit -1
 fi
 echo "Cleaning up build dir"
@@ -33,7 +33,7 @@ if [ -d ../mxe ] ; then
   MXEDIR=`pwd`/../mxe
 else
   if [ -d /usr/lib/mxe ] ; then
-     MXEDIR = /usr/lib/mxe
+     MXEDIR=/usr/lib/mxe
   fi
 fi
 
@@ -54,8 +54,7 @@ popd
 PATH=$MXEDIR/usr/bin/:$PATH
 
 echo
-echo Starting ExtPlane-Panel build
+echo Starting ExtPlane build
 echo $PATH
 $MXEDIR/usr/$TARGET/qt5/bin/qmake  "CONFIG+=release" -recursive
 make
-