OP-1657 Removed linux bin wrapper

Makefile

@@ -954,7 +954,7 @@ install:
 	$(V1) $(MKDIR) -p $(DESTDIR)$(datadir)/applications
 	$(V1) $(MKDIR) -p $(DESTDIR)$(datadir)/pixmaps
 	$(V1) $(MKDIR) -p $(DESTDIR)$(udevdir)
-	$(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/bin/openpilotgcs.bin $(DESTDIR)$(bindir)/openpilot-gcs
+	$(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/bin/openpilotgcs $(DESTDIR)$(bindir)/openpilot-gcs
 	$(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/bin/udp_test $(DESTDIR)$(bindir)
 	$(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/lib/openpilotgcs $(DESTDIR)$(libdir)
 	$(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/share/openpilotgcs $(DESTDIR)$(datadir)

ground/openpilotgcs/bin/bin.pro

@@ -1,14 +0,0 @@
-include(../openpilotgcs.pri)
-
-TEMPLATE = app
-TARGET = $$GCS_APP_WRAPPER
-OBJECTS_DIR =
-
-PRE_TARGETDEPS = $$PWD/openpilotgcs
-
-QMAKE_LINK = cp $$PWD/openpilotgcs $@ && : IGNORE REST
-
-QMAKE_CLEAN = $$GCS_APP_WRAPPER
-
-target.path  = /bin
-INSTALLS    += target

ground/openpilotgcs/bin/openpilotgcs

@@ -1,36 +0,0 @@
-#!/bin/sh
-
-makeAbsolute() {
-    case "$1" in
-	/*)
-	    # already absolute, return it
-	    echo "$1"
-	    ;;
-	*)
-	    # relative, prepend $2 made absolute
-	    echo `makeAbsolute "$2" "$PWD"`/"$1" | sed 's,/\.$,,'
-	    ;;
-    esac
-}
-
-if test -L "$0"; then
-    # Try readlink(1)
-    readlink=`type readlink 2>/dev/null` || readlink=
-    if test -n "$readlink"; then
-	# We have readlink(1), so we can use it
-	me=`readlink -nf "$0"`
-    else
-	# No readlink(1), so let's try ls -l
-	me=`ls -l "$0" | sed 's/^.*-> //'`
-	base=`dirname "$0"`
-	me=`makeAbsolute "$me" "$base"`
-    fi
-else
-    me="$0"
-fi
-
-bindir=`dirname "$me"`
-libdir=`cd "${bindir}/../lib" ; pwd`
-LD_LIBRARY_PATH="${libdir}/openpilotgcs:${LD_LIBRARY_PATH}"
-export LD_LIBRARY_PATH
-exec "${bindir}/openpilotgcs.bin" ${1+"$@"}

ground/openpilotgcs/openpilotgcs.pri

@@ -111,8 +111,7 @@ macx {
         GCS_APP_TARGET   = openpilotgcs
         copyqt = $$copydata
     } else {
-        GCS_APP_WRAPPER  = openpilotgcs
-        GCS_APP_TARGET   = openpilotgcs.bin
+        GCS_APP_TARGET   = openpilotgcs
         GCS_QT_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5
         GCS_QT_PLUGINS_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/plugins
         GCS_QT_QML_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/qml

ground/openpilotgcs/openpilotgcs.pro

@@ -32,6 +32,5 @@ CONFIG   += ordered
 DEFINES += USE_PATHPLANNER
 
 SUBDIRS = src share copydata
-unix:!macx:!isEmpty(copydata):SUBDIRS += bin
 
 copydata.file = copydata.pro

package/linux/deb_common/rules

@@ -47,7 +47,7 @@ ifdef PACKAGE_DIR
 else
 	$(error PACKAGE_DIR not defined! $(PACKAGE_DIR))
 endif
-	ln -s /usr/local/OpenPilot/bin/openpilotgcs.bin `pwd`/debian/openpilot/usr/bin/openpilot-gcs
+	ln -s /usr/local/OpenPilot/bin/openpilotgcs `pwd`/debian/openpilot/usr/bin/openpilot-gcs
 	rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/sounds/sounds
 	rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/pfd/pfd
 	rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/models/models