Reviewers: bnoordhuis, Jakob,
Message:
PTAL
Description:
Port public version macros.
This ports https://codereview.chromium.org/959713003/ to
the 3.30 branch.
BUG=v8:3075
LOG=n
Please review this at https://codereview.chromium.org/959733002/
Base URL: https://chromium.googlesource.com/v8/[email protected]
Affected files (+39, -52 lines):
M PRESUBMIT.py
M include/v8.h
A include/v8-version.h
M src/version.cc
Index: PRESUBMIT.py
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index
3a9895db8df02806d2af560970041d9b2c60d323..35f7c1cba9dc8c994cfd054d76fd28df030f8f41
100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -198,8 +198,8 @@ def _CommonChecks(input_api, output_api):
def _SkipTreeCheck(input_api, output_api):
"""Check the env var whether we want to skip tree check.
- Only skip if src/version.cc has been updated."""
- src_version = 'src/version.cc'
+ Only skip if include/v8-version.h has been updated."""
+ src_version = 'include/v8-version.h'
FilterFile = lambda file: file.LocalPath() == src_version
if not input_api.AffectedSourceFiles(
lambda file: file.LocalPath() == src_version):
Index: include/v8-version.h
diff --git a/include/v8-version.h b/include/v8-version.h
new file mode 100644
index
0000000000000000000000000000000000000000..06bdbea76342ebd1446d86596fb2b1fa47d7a346
--- /dev/null
+++ b/include/v8-version.h
@@ -0,0 +1,20 @@
+// Copyright 2015 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_INCLUDE_VERSION_H_ // V8_VERSION_H_ conflicts with
src/version.h
+#define V8_INCLUDE_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 V8_MAJOR_VERSION 3
+#define V8_MINOR_VERSION 30
+#define V8_BUILD_NUMBER 33
+#define V8_PATCH_LEVEL 16
+
+// Use 1 for candidates and 0 otherwise.
+// (Boolean macro values are not supported by all preprocessors.)
+#define V8_IS_CANDIDATE_VERSION 0
+
+#endif // V8_INCLUDE_VERSION_H_
Index: include/v8.h
diff --git a/include/v8.h b/include/v8.h
index
d5433a6a269836955df2bd7f9a4c9380e53a1b7c..11945e782e3e77e05f853862e2993ffd2fc0783f
100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -19,6 +19,7 @@
#include <stdint.h>
#include <stdio.h>
+#include "v8-version.h"
#include "v8config.h"
// We reserve the V8_* prefix for macros defined in V8 public API and
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;
--
--
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.
