Changeset 96 in tspsg-svn for trunk/src/version.h

Timestamp:

Mar 1, 2010, 2:13:23 PM (15 years ago)

Author:

laleppa

Message:

• Fixed some wrong defines that prevented successful compilation under *nix.
• Renamed i18n to l10n to follow common standards.
• Translation and documentation paths are now synchronized between .pro and source.
• Moved some versioning information to .pro file.
• Updated translations.

File:

• trunk/src/version.h (modified) (6 diffs)

trunk/src/version.h

@@ -52 +52 @@
 
 //! TSPSG version ID
-#define VERSIONID "$Id$"
+//#define VERSIONID "$Id$"
 //! Major version of current TSPSG build
-#define BUILD_VERSION_MAJOR 0
+//#define BUILD_VERSION_MAJOR 0
 //! Minor version of current TSPSG build
-#define BUILD_VERSION_MINOR 1
+//#define BUILD_VERSION_MINOR 1
 /*!
  * \brief TSPSG release number
@@ -66 +66 @@
  *    - 11 --  x: <b>release</b> 1 to x-10
  */
-#define BUILD_RELEASE 2
+//#define BUILD_RELEASE 2
 
 /*!
@@ -73 +73 @@
  *  This will only change on releases and will be the same as revision number.
  */
-#define BUILD_NUMBER 65535
+//#define BUILD_NUMBER 65535
 
 /*!
@@ -81 +81 @@
  * Determined based on BUILD_NUMBER and BUILD_RELEASE.
  */
-#if BUILD_NUMBER == 65535
+#ifndef TSPSG_RELEASE_BUILD
         #define BUILD_STATUS (dev build)
 #else
@@ -90 +90 @@
         #elif BUILD_RELEASE < 11
                 #define BUILD_STATUS (rc)
-        #else
-                #define BUILD_STATUS
+//      #else
+//              #define BUILD_STATUS
         #endif
-#endif // BUILD_NUMBER == 65535
+#endif // TSPSG_RELEASE_BUILD
 
 //! \internal \brief A helper for QUOTE(x).
@@ -102 +102 @@
 /*!
  * \def BUILD_VERSION
- * \brief Full version of TSPSG in the form: \c major.\c minor.\c release[ \c status].
+ * \brief Full version of TSPSG in the form: \c major.\c minor.\c release.\c build [ \c status].
  */
 #ifndef BUILD_STATUS
-        #define BUILD_VERSION QUOTE(BUILD_VERSION_MAJOR.BUILD_VERSION_MINOR.BUILD_RELEASE)
+        #define BUILD_VERSION QUOTE(BUILD_VERSION_MAJOR.BUILD_VERSION_MINOR.BUILD_RELEASE.BUILD_NUMBER)
 #else
-        #define BUILD_VERSION QUOTE(BUILD_VERSION_MAJOR.BUILD_VERSION_MINOR.BUILD_RELEASE BUILD_STATUS)
+        #define BUILD_VERSION QUOTE(BUILD_VERSION_MAJOR.BUILD_VERSION_MINOR.BUILD_RELEASE.BUILD_NUMBER BUILD_STATUS)
 #endif