Reviewers: Jakob,
Message:
Leftovers
Description:
Revert "Make version generation robust to other user-defined tags."
This reverts commit 9ae1c2382a35147d7f4aeba3ecd2030123f0d5fb.
BUG=chromium:446166
LOG=n
[email protected]
Please review this at https://codereview.chromium.org/868093002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+4, -11 lines):
M src/version.cc
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
300f1731fd8ef3cd4e147762cc465d4ee5498464..48510d254c7d5ff83451a2c0189bd58a2585e115
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -17,22 +17,15 @@
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 1
-// Used to mark a version built from a bad tag.
-#define IS_INVALID_VERSION 0
-
// Define SONAME to have the build system put a specific SONAME into the
// shared library instead the generic SONAME generated from the V8 version
// number. This define is mainly used by the build system script.
#define SONAME ""
-#if IS_INVALID_VERSION
-#define SUFFIX_STRING " (invalid)"
-#else
#if IS_CANDIDATE_VERSION
-#define SUFFIX_STRING " (candidate)"
+#define CANDIDATE_STRING " (candidate)"
#else
-#define SUFFIX_STRING ""
-#endif
+#define CANDIDATE_STRING ""
#endif
#define SX(x) #x
@@ -41,10 +34,10 @@
#if PATCH_LEVEL > 0
#define
VERSION_STRING \
S(MAJOR_VERSION) "." S(MINOR_VERSION) "." S(BUILD_NUMBER) "."
S(PATCH_LEVEL) \
- SUFFIX_STRING
+ CANDIDATE_STRING
#else
#define VERSION_STRING \
- S(MAJOR_VERSION) "." S(MINOR_VERSION) "." S(BUILD_NUMBER) SUFFIX_STRING
+ S(MAJOR_VERSION) "." S(MINOR_VERSION) "." S(BUILD_NUMBER)
CANDIDATE_STRING
#endif
namespace v8 {
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
