Commit bf41bde9 authored by machenbach's avatar machenbach Committed by Commit bot

Revert "Make version generation robust to other user-defined tags."

This reverts commit 9ae1c238.

BUG=chromium:446166
LOG=n
NOTRY=true
TBR=jkummerow@chromium.org

Review URL: https://codereview.chromium.org/868093002

Cr-Commit-Position: refs/heads/master@{#26254}
parent 12af2830
...@@ -17,22 +17,15 @@ ...@@ -17,22 +17,15 @@
// (Boolean macro values are not supported by all preprocessors.) // (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 1 #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 // Define SONAME to have the build system put a specific SONAME into the
// shared library instead the generic SONAME generated from the V8 version // shared library instead the generic SONAME generated from the V8 version
// number. This define is mainly used by the build system script. // number. This define is mainly used by the build system script.
#define SONAME "" #define SONAME ""
#if IS_INVALID_VERSION
#define SUFFIX_STRING " (invalid)"
#else
#if IS_CANDIDATE_VERSION #if IS_CANDIDATE_VERSION
#define SUFFIX_STRING " (candidate)" #define CANDIDATE_STRING " (candidate)"
#else #else
#define SUFFIX_STRING "" #define CANDIDATE_STRING ""
#endif
#endif #endif
#define SX(x) #x #define SX(x) #x
...@@ -41,10 +34,10 @@ ...@@ -41,10 +34,10 @@
#if PATCH_LEVEL > 0 #if PATCH_LEVEL > 0
#define VERSION_STRING \ #define VERSION_STRING \
S(MAJOR_VERSION) "." S(MINOR_VERSION) "." S(BUILD_NUMBER) "." S(PATCH_LEVEL) \ S(MAJOR_VERSION) "." S(MINOR_VERSION) "." S(BUILD_NUMBER) "." S(PATCH_LEVEL) \
SUFFIX_STRING CANDIDATE_STRING
#else #else
#define VERSION_STRING \ #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 #endif
namespace v8 { namespace v8 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment