version.h: Don't mention the revision in stable releases.

It will always be 0 in that case.
jeeb · Sep 29, 2013 · 585f1e1 · 585f1e1
1 parent 4551d83
commit 585f1e1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/include/version.h b/include/version.h
@@ -69,20 +69,37 @@
 #define MPC_VERSION_NUM         MPC_VERSION_MAJOR,MPC_VERSION_MINOR,MPC_VERSION_PATCH,0
 #define MPC_VERSION_STR         MAKE_STR(MPC_VERSION_MAJOR) _T(".") \
                                 MAKE_STR(MPC_VERSION_MINOR) _T(".") \
-                                MAKE_STR(MPC_VERSION_PATCH) _T(".0")
+                                MAKE_STR(MPC_VERSION_PATCH)
 #define MPC_VERSION_STR_FULL    MPC_VERSION_STR
 
 #else // !NO_VERSION_REV_NEEDED
 
 #define MPC_VERSION_NUM         MPC_VERSION_MAJOR,MPC_VERSION_MINOR,MPC_VERSION_PATCH,MPC_VERSION_REV
+
+#if MPC_BETA_RELEASE
+
 #define MPC_VERSION_STR         MAKE_STR(MPC_VERSION_MAJOR) _T(".") \
                                 MAKE_STR(MPC_VERSION_MINOR) _T(".") \
                                 MAKE_STR(MPC_VERSION_PATCH) _T(".") \
                                 MAKE_STR(MPC_VERSION_REV)
 #define MPC_VERSION_STR_FULL    MAKE_STR(MPC_VERSION_MAJOR) _T(".") \
                                 MAKE_STR(MPC_VERSION_MINOR) _T(".") \
                                 MAKE_STR(MPC_VERSION_PATCH) _T(".") \
-                                MPC_VERSION_REV_FULL
+                                MAKE_STR(MPC_VERSION_REV) \
+                                MPC_VERSION_ADDITIONAL
+
+#else // !MPC_BETA_RELEASE
+
+#define MPC_VERSION_STR         MAKE_STR(MPC_VERSION_MAJOR) _T(".") \
+                                MAKE_STR(MPC_VERSION_MINOR) _T(".") \
+                                MAKE_STR(MPC_VERSION_PATCH)
+#define MPC_VERSION_STR_FULL    MAKE_STR(MPC_VERSION_MAJOR) _T(".") \
+                                MAKE_STR(MPC_VERSION_MINOR) _T(".") \
+                                MAKE_STR(MPC_VERSION_PATCH) \
+                                MPC_VERSION_ADDITIONAL
+
+#endif // MPC_BETA_RELEASE
+
 #endif // NO_VERSION_REV_NEEDED
 
 #endif // ISPP_INVOKED

diff --git a/version.sh b/version.sh
@@ -82,7 +82,7 @@ fi
 
 version_info+="#define MPCHC_HASH _T(\"$hash\")"$'\n'
 version_info+="#define MPC_VERSION_REV $ver"$'\n'
-version_info+="#define MPC_VERSION_REV_FULL _T(\"${ver}${ver_additional}\")"
+version_info+="#define MPC_VERSION_ADDITIONAL _T(\"${ver_additional}\")"
 
 
 # Update version_rev.h if it does not exist, or if version information was changed.