Procházet zdrojové kódy

Test command: git log

Kandrashin Denis před 12 roky
rodič
revize
183999d5e4
4 změnil soubory, kde provedl 24 přidání a 4 odebrání
  1. 9 2
      CMakeLists.txt
  2. 9 0
      source/fb2app.cpp
  3. 3 0
      source/fb2app.hpp
  4. 3 2
      source/fb2main.cpp

+ 9 - 2
CMakeLists.txt

@@ -28,8 +28,15 @@ file( GLOB FB2_SRCS source/*.cpp     )
 file( GLOB FB2_UIS  source/*.ui      )
 file( GLOB FB2_TSS  source/ts/*.ts   )
 
-set(PACKAGE_COMMIT `log --pretty=format:'%ai | %H | %d' --abbrev-commit -1`)
-set(FB2_DEFINITIONS "PACKAGE_NAME=\"${PACKAGE_NAME}\"; PACKAGE_VENDOR=\"${PACKAGE_VENDOR}\"; PACKAGE_VERSION=\"${PACKAGE_VERSION}\"; PACKAGE_COMMIT=\"${PACKAGE_COMMIT}\"")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTK_PKG_FLAGS}")
+
+if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git)
+#    exec_program("git --git-dir=${CMAKE_HOME_DIRECTORY}/.git git log --format=%ai%H%d -1" OUTPUT_VARIABLE COMMIT_INFO)
+#    exec_program("git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --format=medium -1 | head -n1" OUTPUT_VARIABLE COMMIT_INFO)
+#    message( STATUS "COMMIT_INFO = ${COMMIT_INFO}")
+endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git)
+
+set(FB2_DEFINITIONS "PACKAGE_NAME=\"${PACKAGE_NAME}\"; PACKAGE_VENDOR=\"${PACKAGE_VENDOR}\"; PACKAGE_VERSION=\"${PACKAGE_VERSION}\"; COMMIT_INFO=\"${COMMIT_INFO}\"")
 set_source_files_properties( source/fb2app.cpp PROPERTIES COMPILE_DEFINITIONS "${FB2_DEFINITIONS}")
 
 set(FB2_RES

+ 9 - 0
source/fb2app.cpp

@@ -11,6 +11,15 @@
     #define PACKAGE_VERSION "0.XX.XX"
 #endif  // PACKAGE_VERSION
 
+QString FbApplication::lastCommit()
+{
+#ifndef COMMIT_INFO
+    return COMMIT_INFO;
+#else
+    return QString();
+#endif  // PACKAGE_VERSION
+}
+
 void FbApplication::handleMessage(QtMsgType type, const char *msg)
 {
     /*

+ 3 - 0
source/fb2app.hpp

@@ -13,8 +13,11 @@ public:
 
     void handleMessage(QtMsgType type, const char *msg);
 
+    static QString lastCommit();
+
 signals:
     void logMessage(const QString &message);
 };
 
+
 #endif // FB2APP_H

+ 3 - 2
source/fb2main.cpp

@@ -218,8 +218,9 @@ bool FbMainWindow::fileSaveAs()
 
 void FbMainWindow::about()
 {
-    QMessageBox::about(this, tr("About fb2edit"),
-        tr("The <b>fb2edit</b> is application for editing FB2-files."));
+    QString text = tr("The <b>fb2edit</b> is application for editing FB2-files.");
+    text += "<br>" << FbApplication::lastCommit();
+    QMessageBox::about(this, tr("About fb2edit"), text);
 }
 
 void FbMainWindow::documentWasModified()