Merge pull request #2719 from NaterGator/winversion

Better versioning info and auto RC generation for Windows

QGCCommon.pri

@@ -89,12 +89,19 @@ MobileBuild {
 
 exists ($$PWD/.git) {
   GIT_DESCRIBE = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)
-  message(QGroundControl version $${GIT_DESCRIBE})
+  GIT_HASH     = $$system(git rev-parse HEAD)
+  VERSION      = $$replace(GIT_DESCRIBE, "v", "")
+  VERSION      = $$replace(VERSION, "-", ".")
+  VERSION      = $$section(VERSION, ".", 0, 3)
+  message(QGroundControl version $${GIT_DESCRIBE} hash $${GIT_HASH})
 } else {
   GIT_DESCRIBE = None
+  GIT_HASH = None
+  VERSION = 0.0.0   # Marker to indicate out-of-tree build
 }
 
-DEFINES += GIT_VERSION=\"\\\"$$GIT_DESCRIBE\\\"\"
+DEFINES += GIT_TAG=\"\\\"$$GIT_DESCRIBE\\\"\"
+DEFINES += GIT_HASH=\"\\\"$$GIT_HASH\\\"\"
 
 # Installer configuration
 

qgroundcontrol.pro

@@ -130,9 +130,11 @@ LinuxBuild {
     CONFIG += qesp_linux_udev
 }
 
-WindowsBuild {
-    RC_FILE = $${BASEDIR}/qgroundcontrol.rc
-}
+RC_ICONS = resources/icons/qgroundcontrol.ico
+QMAKE_TARGET_COMPANY = "qgroundcontrol.org"
+QMAKE_TARGET_DESCRIPTION = "Open source ground control app provided by QGroundControl dev team"
+QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2016 QGroundControl Development Team. All rights reserved."
+QMAKE_TARGET_PRODUCT = "qgroundcontrol"
 
 #
 # Build-specific settings

qgroundcontrol.rc

-IDI_ICON1               ICON    DISCARDABLE     "resources/icons/qgroundcontrol.ico"
-
-1 VERSIONINFO
-FILEVERSION    	2,0,0,227
-PRODUCTVERSION 	2,0,0,0
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "CompanyName",      "qgroundcontrol.org"
-            VALUE "FileDescription",  "Open source ground control app provided by QGroundControl dev team"
-            VALUE "FileVersion",      "2.0.0.227"
-            VALUE "LegalCopyright",   "Copyright (C) 2013 QGroundControl Development Team. All rights reserved."
-            VALUE "ProductName",      "qgroundcontrol"
-            VALUE "ProductVersion",   "2.0"
-            VALUE "InternalName",     "qgroundcontrol"
-            VALUE "OriginalFilename", "qgroundcontrol.exe"
-        END
-    END
-END

src/QGCApplication.cc

@@ -337,7 +337,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
     setOrganizationName(QGC_ORG_NAME);
     setOrganizationDomain(QGC_ORG_DOMAIN);
 
-    QString versionString(GIT_VERSION);
+    QString versionString(GIT_TAG);
     // stable versions are on tags (v1.2.3)
     // development versions are full git describe versions (v1.2.3-18-g879e8b3)
     if (versionString.length() > 8) {