| Index: src/version.cc
|
| diff --git a/src/version.cc b/src/version.cc
|
| index 0ef9ddaf4cfa55a00863ae8ebf8ee15f7c756143..eaef96d44df8b4471e5c12f5f121edd22507bc5c 100644
|
| --- a/src/version.cc
|
| +++ b/src/version.cc
|
| @@ -1,51 +1,17 @@
|
| // Copyright 2012 the V8 project authors. All rights reserved.
|
| -// Redistribution and use in source and binary forms, with or without
|
| -// modification, are permitted provided that the following conditions are
|
| -// met:
|
| -//
|
| -// * Redistributions of source code must retain the above copyright
|
| -// notice, this list of conditions and the following disclaimer.
|
| -// * Redistributions in binary form must reproduce the above
|
| -// copyright notice, this list of conditions and the following
|
| -// disclaimer in the documentation and/or other materials provided
|
| -// with the distribution.
|
| -// * Neither the name of Google Inc. nor the names of its
|
| -// contributors may be used to endorse or promote products derived
|
| -// from this software without specific prior written permission.
|
| -//
|
| -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
| -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
| -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
| -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
| -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| +// Use of this source code is governed by a BSD-style license that can be
|
| +// found in the LICENSE file.
|
|
|
| +#include "include/v8-version.h"
|
| #include "src/v8.h"
|
| -
|
| #include "src/version.h"
|
|
|
| -// These macros define the version number for the current version.
|
| -// NOTE these macros are used by some of the tool scripts and the build
|
| -// system so their names cannot be changed without changing the scripts.
|
| -#define MAJOR_VERSION 3
|
| -#define MINOR_VERSION 30
|
| -#define BUILD_NUMBER 33
|
| -#define PATCH_LEVEL 16
|
| -// Use 1 for candidates and 0 otherwise.
|
| -// (Boolean macro values are not supported by all preprocessors.)
|
| -#define IS_CANDIDATE_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_CANDIDATE_VERSION
|
| +#if V8_IS_CANDIDATE_VERSION
|
| #define CANDIDATE_STRING " (candidate)"
|
| #else
|
| #define CANDIDATE_STRING ""
|
| @@ -54,24 +20,24 @@
|
| #define SX(x) #x
|
| #define S(x) SX(x)
|
|
|
| -#if PATCH_LEVEL > 0
|
| -#define VERSION_STRING \
|
| - S(MAJOR_VERSION) "." S(MINOR_VERSION) "." S(BUILD_NUMBER) "." \
|
| - S(PATCH_LEVEL) CANDIDATE_STRING
|
| +#if V8_PATCH_LEVEL > 0
|
| +#define VERSION_STRING \
|
| + S(V8_MAJOR_VERSION) "." S(V8_MINOR_VERSION) "." S(V8_BUILD_NUMBER) "." S( \
|
| + V8_PATCH_LEVEL) CANDIDATE_STRING
|
| #else
|
| -#define VERSION_STRING \
|
| - S(MAJOR_VERSION) "." S(MINOR_VERSION) "." S(BUILD_NUMBER) \
|
| - CANDIDATE_STRING
|
| +#define VERSION_STRING \
|
| + S(V8_MAJOR_VERSION) "." S(V8_MINOR_VERSION) "." S(V8_BUILD_NUMBER) \
|
| + CANDIDATE_STRING
|
| #endif
|
|
|
| namespace v8 {
|
| namespace internal {
|
|
|
| -int Version::major_ = MAJOR_VERSION;
|
| -int Version::minor_ = MINOR_VERSION;
|
| -int Version::build_ = BUILD_NUMBER;
|
| -int Version::patch_ = PATCH_LEVEL;
|
| -bool Version::candidate_ = (IS_CANDIDATE_VERSION != 0);
|
| +int Version::major_ = V8_MAJOR_VERSION;
|
| +int Version::minor_ = V8_MINOR_VERSION;
|
| +int Version::build_ = V8_BUILD_NUMBER;
|
| +int Version::patch_ = V8_PATCH_LEVEL;
|
| +bool Version::candidate_ = (V8_IS_CANDIDATE_VERSION != 0);
|
| const char* Version::soname_ = SONAME;
|
| const char* Version::version_string_ = VERSION_STRING;
|
|
|
|
|