Merge branch 'feature-resources' into develop

Author: riuson

classes/revisioninfo.cpp

@@ -22,39 +22,26 @@
 #include <QFile>
 #include <QTextStream>
 #include <QRegExp>
+#include "resources/revision.h"
 //-----------------------------------------------------------------------------
-// git-commit-info d693078 Sat May 26 22:30:51 2012 +0600
+// info generated by version-gen.sh to file resources/revision.h
 //-----------------------------------------------------------------------------
 bool RevisionInfo::getRevisionData(QString *hash, QString *date)
 {
-    bool result = false;
-    // load version info
-    QFile file_version(":/text/version_info");
-    if (file_version.open(QIODevice::ReadOnly))
-    {
-        QTextStream stream(&file_version);
-        QString version = stream.readAll();
-        file_version.close();
+    bool result = true;
+#ifdef GIT_REVISION_ABBR
+    *hash = QString(GIT_REVISION_ABBR);
+#else
+    *hash = QString("unknown");
+    result = false;
+#endif
 
-        // git-commit-info d693078 Sat May 26 22:30:51 2012 +0600
-
-        QString start = "git-commit-info ";
-        if (version.startsWith(start, Qt::CaseInsensitive))
-        {
-            // get hash of commit
-            QRegExp reg = QRegExp("[0-9a-f]+", Qt::CaseInsensitive);
-            int index;
-            if ((index = reg.indexIn(version, start.length())) >= 0)
-            {
-                *hash = reg.cap();
-
-                // get date
-                *date = version.mid(index + (*hash).length() + 1);
-
-                result = true;
-            }
-        }
-    }
+#ifdef GIT_COMMIT_ADATE
+    *date = QString(GIT_COMMIT_ADATE);
+#else
+    *date = QString("???");
+    result = false;
+#endif
     return result;
 }
 //-----------------------------------------------------------------------------

iconrc.rc

@@ -119,8 +119,8 @@ RESOURCES += \
     resources/resources.qrc
 
 win32 {
-    RC_FILE = iconrc.rc
-    OTHER_FILES += iconrc.rc
+    RC_FILE = win-res.rc
+    OTHER_FILES += win-res.rc
 }
 
 TRANSLATIONS = resources/lcd-image-converter-ru.ts
@@ -130,4 +130,19 @@ OTHER_FILES += \
     resources/font.tmpl \
     resources/template_keys.txt \
     resources/lcd-image-converter-ru.ts \
-    iconrc.rc
+    win-res.rc
+
+
+# generate version info file on each build, because file in other directory
+version.target = version-included.txt
+version.commands = @sh ./version-gen.sh
+version.depends = .git
+QMAKE_EXTRA_TARGETS += version
+PRE_TARGETDEPS += version-included.txt
+
+# compile translation
+translation_ru.target = ./resources/lcd-image-converter-ru.qm
+translation_ru.commands = @sh ./translation-compile.sh
+translation_ru.depends = .git
+QMAKE_EXTRA_TARGETS += translation_ru
+PRE_TARGETDEPS += ./resources/lcd-image-converter-ru.qm ./resources/lcd-image-converter-ru.ts

lcd-image-converter.pro

@@ -10,7 +10,6 @@
     </qresource>
     <qresource prefix="/text">
         <file alias="gpl3">gpl-3.0-standalone.html</file>
-        <file alias="version_info">version-included.txt</file>
     </qresource>
     <qresource prefix="/translations">
         <file alias="ru">lcd-image-converter-ru.qm</file>

resources/resources.qrc

@@ -0,0 +1,3 @@
+#/bin/sh
+lrelease ./resources/lcd-image-converter-ru.ts ./resources/lcd-image-converter-ru.qm 
+

translation-compile.sh

@@ -1,2 +1,2 @@
 #/bin/sh
-git log --pretty=format:"git-commit-info %h %ad" -1 > ./resources/version-included.txt
+git log --pretty=format:"#define GIT_REVISION \"%H\\0\" %n#define GIT_REVISION_ABBR \"%h\\0\" %n#define GIT_COMMIT_ADATE \"%ad\\0\" %n#define GIT_COMMIT_AT %at" -1 > ./resources/revision.h

version-gen.sh

@@ -0,0 +1,33 @@
+#include <windows.h>
+#include "./resources/revision.h"
+
+VS_VERSION_INFO     VERSIONINFO
+FILEVERSION         2, 1, (GIT_COMMIT_AT/65536), (GIT_COMMIT_AT%65536)
+PRODUCTVERSION      2, 1, (GIT_COMMIT_AT/65536), (GIT_COMMIT_AT%65536)
+FILEFLAGSMASK       0x3fL
+FILEFLAGS           0
+FILEOS              VOS_NT_WINDOWS32
+FILETYPE            VFT_APP
+FILESUBTYPE         VFT2_UNKNOWN
+BEGIN
+    BLOCK   "VarFileInfo"
+    BEGIN
+        VALUE   "Translation",  0x409,  1200
+    END
+    BLOCK   "StringFileInfo"
+    BEGIN
+        BLOCK   "040904b0"
+        BEGIN
+            VALUE   "CompanyName",      "Riuson Software\0"
+            VALUE   "FileDescription",  "Tool to create bitmaps and fonts for embedded applications\0"
+            VALUE   "FileVersion",      GIT_REVISION_ABBR
+            VALUE   "InternalName",     "lcd-image-converter\0"
+            VALUE   "LegalCopyright",   "Copyright 2010-2012 by riuson\0"
+            VALUE   "OriginalFilename", "lcd-image-converter.exe\0"
+            VALUE   "ProductName",      "LCD Image Converter\0"
+            VALUE   "ProductVersion",   GIT_REVISION
+        END
+    END
+END
+
+IDI_ICON1               ICON    DISCARDABLE     "resources/icons/lcd-image-converter.ico"