aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Basic/Version.cpp
diff options
context:
space:
mode:
authorPetr Hosek <phosek@chromium.org>2019-01-31 06:21:01 +0000
committerPetr Hosek <phosek@chromium.org>2019-01-31 06:21:01 +0000
commit0e712a766e4f3e2cf9ad0e42cab6cb4d543d0320 (patch)
tree59f0d05f0226a864cd489b27381d438c3201bc82 /clang/lib/Basic/Version.cpp
parentb37419ef6629b7c32f0a4bd309f2a2aed6f514fb (diff)
downloadllvm-0e712a766e4f3e2cf9ad0e42cab6cb4d543d0320.zip
llvm-0e712a766e4f3e2cf9ad0e42cab6cb4d543d0320.tar.gz
llvm-0e712a766e4f3e2cf9ad0e42cab6cb4d543d0320.tar.bz2
[CMake] Unify scripts for generating VCS headers
Previously, there were two different scripts for generating VCS headers: one used by LLVM and one used by Clang. They were both similar, but different. They were both broken in their own ways, for example the one used by Clang didn't properly handle monorepo resulting in an incorrect version information reported by Clang. This change unifies two the scripts by introducing a new script that's used from both LLVM and Clang, ensures that the new script supports both monorepo and standalone SVN and Git setups, and removes the old scripts. Differential Revision: https://reviews.llvm.org/D57063 llvm-svn: 352729
Diffstat (limited to 'clang/lib/Basic/Version.cpp')
-rw-r--r--clang/lib/Basic/Version.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/clang/lib/Basic/Version.cpp b/clang/lib/Basic/Version.cpp
index 4ed081d..bbaeafe 100644
--- a/clang/lib/Basic/Version.cpp
+++ b/clang/lib/Basic/Version.cpp
@@ -10,6 +10,7 @@
//
//===----------------------------------------------------------------------===//
+#include "VCSRevision.h"
#include "clang/Basic/Version.h"
#include "clang/Basic/LLVM.h"
#include "clang/Config/config.h"
@@ -17,23 +18,19 @@
#include <cstdlib>
#include <cstring>
-#ifdef HAVE_SVN_VERSION_INC
-# include "SVNVersion.inc"
-#endif
-
namespace clang {
std::string getClangRepositoryPath() {
#if defined(CLANG_REPOSITORY_STRING)
return CLANG_REPOSITORY_STRING;
#else
-#ifdef SVN_REPOSITORY
- StringRef URL(SVN_REPOSITORY);
+#ifdef CLANG_REPOSITORY
+ StringRef URL(CLANG_REPOSITORY);
#else
StringRef URL("");
#endif
- // If the SVN_REPOSITORY is empty, try to use the SVN keyword. This helps us
+ // If the CLANG_REPOSITORY is empty, try to use the SVN keyword. This helps us
// pick up a tag in an SVN export, for example.
StringRef SVNRepository("$URL$");
if (URL.empty()) {
@@ -71,8 +68,8 @@ std::string getLLVMRepositoryPath() {
}
std::string getClangRevision() {
-#ifdef SVN_REVISION
- return SVN_REVISION;
+#ifdef CLANG_REVISION
+ return CLANG_REVISION;
#else
return "";
#endif