Merge pull request #1805 from dagar/git_version

set QGC version from git

.gitignore

@@ -68,7 +68,8 @@ ui_*
 *.so*
 *.moc
 *.prl
+git_version.cpp
+git_version.obj
 
 # android
-android/local.properties
-android/gradle.properties
+android/local.properties
\ No newline at end of file

QGCApplication.pro

@@ -18,9 +18,10 @@
 # -------------------------------------------------
 
 include(QGCCommon.pri)
+include(git_version.pri)
 
 TARGET = qgroundcontrol
-TEMPLATE =  app
+TEMPLATE = app
 
 # Load additional config flags from user_config.pri
 exists(user_config.pri):infile(user_config.pri, CONFIG) {

deploy/ubuntu_ppa

 #! /bin/bash
 
-version="2.4"
-rsync -av --delete --exclude=.git ~/git/qgroundcontrol/ ~/tmp/qgroundcontrol-${version}/
+tmpdir=`mktemp -d`
+long_version=`git describe --always --tags`
+short_version=`git describe --always --tags | cut -d "-" -f 1,2`
 
-cd ~/tmp
-tar pczf qgroundcontrol_${version}.orig.tar.gz qgroundcontrol-${version}
+version=${long_version:1}
+dir_version=${short_version:1}
+echo $version
 
-cd ~/tmp/qgroundcontrol-${version}/
-debuild -S
+debchange -v ${version} --distribution trusty
+
+qmake -r qgroundcontrol.pro
+make git_ver
+
+rsync -av --delete --exclude={.git,build-release,release,Makefile\*} . ${tmpdir}/qgroundcontrol-${dir_version}/
 
-dput ppa:qgroundcontrol/ppa qgroundcontrol_${version}-0ubuntu1_source.changes
+cd ${tmpdir}
+tar pczf qgroundcontrol_${dir_version}.orig.tar.gz qgroundcontrol-${dir_version}
+
+cd ${tmpdir}/qgroundcontrol-${dir_version}/
+debuild -S
 
+dput ppa:qgroundcontrol/ppa ${tmpdir}/qgroundcontrol_${version}_source.changes
 
 
 # test building the source deb locally
-debuild --prepend-path=/usr/lib/ccache -sa
+#debuild --prepend-path=/usr/lib/ccache -sa

git_version.pri

+# set the QGC version from git
+
+exists ($$PWD/.git) {
+  GIT_DESCRIBE = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)
+  WindowsBuild {
+    QGC_GIT_VER = echo extern \"C\" { const char *git_version() { return \"$$GIT_DESCRIBE\"; } } > git_version.cpp
+    LIBS += git_version.obj
+  } else {
+    QGC_GIT_VER = echo \"extern \\\"C\\\" { const char *git_version() { return \\\"$$GIT_DESCRIBE\\\"; } }\" > git_version.cpp
+    LIBS += git_version.o
+  }
+}
+
+WindowsBuild {
+  LIBS += git_version.obj
+} else {
+  LIBS += git_version.o
+}
+
+CONFIG(debug) {
+  GIT_VERSION_CXXFLAGS = $$QMAKE_CXXFLAGS_DEBUG
+} else {
+  GIT_VERSION_CXXFLAGS = $$QMAKE_CXXFLAGS_RELEASE
+}
+
+QMAKE_PRE_LINK += $$QGC_GIT_VER && $$QMAKE_CXX -c $$GIT_VERSION_CXXFLAGS git_version.cpp

qgroundcontrol.pro

@@ -22,6 +22,8 @@ CONFIG  +=  ordered
 SUBDIRS  =  ./QGCLocationPlugin.pro
 SUBDIRS +=  ./QGCApplication.pro
 
+include(git_version.pri)
+
 QGCApplication.depends = QGCLocationPlugin
 
 message(Qt version $$[QT_VERSION])
@@ -30,3 +32,6 @@ message(Qt version $$[QT_VERSION])
     error("Unsupported Qt version, 5.4+ is required")
 }
 
+message(QGroundControl version $${GIT_DESCRIBE})
+git_ver.commands = $$QGC_GIT_VER
+QMAKE_EXTRA_TARGETS += git_ver

src/QGCApplication.cc

@@ -42,6 +42,7 @@
 
 #include "VideoStreaming.h"
 
+#include "git_version.h"
 #include "QGC.h"
 #include "QGCApplication.h"
 #include "MainWindow.h"
@@ -283,10 +284,12 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
     setOrganizationName(QGC_ORG_NAME);
     setOrganizationDomain(QGC_ORG_DOMAIN);
 
-    // Version string is build from component parts. Format is:
-    //  vMajor.Minor.BuildNumber BuildType
-    QString versionString("v%1.%2.%3 %4");
-    versionString = versionString.arg(QGC_APPLICATION_VERSION_MAJOR).arg(QGC_APPLICATION_VERSION_MINOR).arg(QGC_APPLICATION_VERSION_BUILDNUMBER).arg(QGC_APPLICATION_VERSION_BUILDTYPE);
+    QString versionString(git_version());
+    // stable versions are on tags (v1.2.3)
+    // development versions are full git describe versions (v1.2.3-18-g879e8b3)
+    if (versionString.length() > 8) {
+        versionString.append(" (Development)");
+    }
     this->setApplicationVersion(versionString);
 
     // Set settings format

src/QGCConfig.h

@@ -18,21 +18,4 @@
 #define QGC_ORG_NAME "QGroundControl.org"
 #define QGC_ORG_DOMAIN "org.qgroundcontrol"
 
-#define QGC_APPLICATION_VERSION_MAJOR 2
-#define QGC_APPLICATION_VERSION_MINOR 8
-
-// The following #definess can be overriden from the command line so that automated build systems can
-// add additional build identification.
-
-// Only comes from command line
-//#define QGC_APPLICATION_VERSION_COMMIT "..."
-
-#ifndef QGC_APPLICATION_VERSION_BUILDNUMBER
-#define QGC_APPLICATION_VERSION_BUILDNUMBER 0
-#endif
-
-#ifndef QGC_APPLICATION_VERSION_BUILDTYPE
-#define QGC_APPLICATION_VERSION_BUILDTYPE "(Development)"
-#endif
-
 #endif // QGC_CONFIGURATION_H

src/comm/MAVLinkProtocol.cc

@@ -197,7 +197,7 @@ void MAVLinkProtocol::_linkStatusChanged(LinkInterface* link, bool connected)
         // Send command to start MAVLink
         // XXX hacky but safe
         // Start NSH
-        const char init[] = {0x0d, 0x0d, 0x0d};
+        const char init[] = {0x0d, 0x0d, 0x0d, 0x0d};
         link->writeBytes(init, sizeof(init));
         const char* cmd = "sh /etc/init.d/rc.usb\n";
         link->writeBytes(cmd, strlen(cmd));

src/git_version.h

+extern "C" {
+	const char *git_version();
+}