Merge pull request #108 from OdyX/dev-central-cmake-version

Create a central version

8 files changed, 16 insertions, 21 deletions

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 1e577ca..c936ac1 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -246,7 +246,7 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[])
         else if (arg == "-help")
         {
             GetLogger()->Message("\n");
-            GetLogger()->Message("COLOBOT GOLD pre-alpha\n");
+            GetLogger()->Message("Colobot %s (%s)\n",COLOBOT_CODENAME,COLOBOT_VERSION);
             GetLogger()->Message("\n");
             GetLogger()->Message("List of available options:\n");
             GetLogger()->Message("  -help            this help\n");
diff --git a/src/common/config.h.cmake b/src/common/config.h.cmake
index dd280a3..022bb69 100644
--- a/src/common/config.h.cmake
+++ b/src/common/config.h.cmake
@@ -8,6 +8,10 @@
 #cmakedefine USE_GLEW @USE_GLEW@
 #cmakedefine GLEW_STATIC
 
+#define COLOBOT_VERSION "@COLOBOT_VERSION_FULL@"
+#define COLOBOT_CODENAME "@COLOBOT_VERSION_CODENAME@"
+#define COLOBOT_FULLNAME "Colobot @COLOBOT_VERSION_CODENAME@"
+
 #define COLOBOT_DEFAULT_DATADIR "@COLOBOT_INSTALL_DATA_DIR@"
 #define COLOBOT_I18N_DIR "@COLOBOT_INSTALL_I18N_DIR@"
 
diff --git a/src/common/restext.cpp b/src/common/restext.cpp
index da06131..4c56ae5 100644
--- a/src/common/restext.cpp
+++ b/src/common/restext.cpp
@@ -17,6 +17,8 @@
 
 #include "common/restext.h"
 
+#include "common/config.h"
+
 #include "common/global.h"
 #include "common/event.h"
 #include "common/logger.h"
@@ -39,7 +41,7 @@ const char* stringsCbot[TX_MAX]         = { nullptr };
 
 void InitializeRestext()
 {
-    stringsText[RT_VERSION_ID]       = "Colobot Gold";
+    stringsText[RT_VERSION_ID]       = COLOBOT_FULLNAME;
 
     stringsText[RT_DISINFO_TITLE]    = "SatCom";
     stringsText[RT_WINDOW_MAXIMIZED] = "Maximize";
diff --git a/src/desktop/CMakeLists.txt b/src/desktop/CMakeLists.txt
index 1a1cfd5..ce4f48d 100644
--- a/src/desktop/CMakeLists.txt
+++ b/src/desktop/CMakeLists.txt
@@ -53,6 +53,7 @@ if(POD2MAN)
                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${PM_PODFILE}
                    COMMAND ${POD2MAN} ARGS --section=${COLOBOT_MANPAGE_SECTION}
                                       --center="Colobot" --stderr --utf8
+                                      --release="${COLOBOT_VERSION_FULL}"
                                       ${CMAKE_CURRENT_SOURCE_DIR}/${PM_PODFILE}
                                       ${CMAKE_CURRENT_BINARY_DIR}${SLASHLOCALE}/colobot.${COLOBOT_MANPAGE_SECTION}
 		   COMMENT "Create ${SLASHLOCALE}/colobot.${COLOBOT_MANPAGE_SECTION} manpage"
diff --git a/src/po/colobot.pot b/src/po/colobot.pot
index a45303e..e1f9dc7 100644
--- a/src/po/colobot.pot
+++ b/src/po/colobot.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-27 13:53+0100\n"
+"POT-Creation-Date: 2012-12-27 17:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,9 +20,6 @@ msgstr ""
 msgid "Colobot rules!"
 msgstr ""
 
-msgid "Colobot Gold"
-msgstr ""
-
 msgid "SatCom"
 msgstr ""
 
diff --git a/src/po/de.po b/src/po/de.po
index 6edcedd..2992cb1 100644
--- a/src/po/de.po
+++ b/src/po/de.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-27 13:53+0100\n"
+"POT-Creation-Date: 2012-12-27 17:09+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -378,9 +378,6 @@ msgstr "Schließen"
 msgid "Closing bracket missing "
 msgstr "Es fehlt eine geschlossene Klammer \")\""
 
-msgid "Colobot Gold"
-msgstr "Colobot Gold"
-
 msgid "Colobot rules!"
 msgstr "Colobot ist wunderbar!"
 
diff --git a/src/po/fr.po b/src/po/fr.po
index 973dc19..662fb93 100644
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -2,16 +2,16 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-27 13:53+0100\n"
+"POT-Creation-Date: 2012-12-27 17:09+0100\n"
+"PO-Revision-Date: 2012-12-27 14:07+0100\n"
+"Last-Translator: Didier Raboud <odyx@debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Language: fr_FR\n"
 "X-Source-Language: en_US\n"
-"Last-Translator: Didier Raboud <odyx@debian.org>\n"
-"PO-Revision-Date: 2012-12-27 14:07+0100\n"
-"Language: fr\n"
 "X-Generator: Lokalize 1.4\n"
 
 msgid " "
@@ -378,9 +378,6 @@ msgstr "Fermer"
 msgid "Closing bracket missing "
 msgstr "Il manque une parenthèse fermante"
 
-msgid "Colobot Gold"
-msgstr "Colobot Gold"
-
 msgid "Colobot rules!"
 msgstr "Colobot est super!"
 
diff --git a/src/po/pl.po b/src/po/pl.po
index 27b05c4..9bab529 100644
--- a/src/po/pl.po
+++ b/src/po/pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-27 13:53+0100\n"
+"POT-Creation-Date: 2012-12-27 17:09+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -380,9 +380,6 @@ msgstr "Zamknij"
 msgid "Closing bracket missing "
 msgstr "Brak nawiasu zamykającego"
 
-msgid "Colobot Gold"
-msgstr "Colobot Gold"
-
 msgid "Colobot rules!"
 msgstr "Colobot rządzi!"