Author: probinson
Date: Fri Dec 5 23:06:37 2014
New Revision: 223578
URL: http://llvm.org/viewvc/llvm-project?rev=223578&view=rev
Log:
Rename a couple of preprocessor symbols to be more descriptive. NFC.
Review feedback from recent changes to GetSVN.cmake.
Modified:
cfe/trunk/lib/Basic/CMakeLists.txt
cfe/trunk/lib/Basic/Makefile
cfe/trunk/lib/Basic/Version.cpp
Modified: cfe/trunk/lib/Basic/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/CMakeLists.txt?rev=223578&r1=223577&r2=223578&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/CMakeLists.txt (original)
+++ cfe/trunk/lib/Basic/CMakeLists.txt Fri Dec 5 23:06:37 2014
@@ -36,7 +36,7 @@ if(DEFINED llvm_vc AND DEFINED clang_vc)
${CMAKE_COMMAND} "-DFIRST_SOURCE_DIR=${LLVM_MAIN_SRC_DIR}"
"-DFIRST_NAME=LLVM"
"-DSECOND_SOURCE_DIR=${CLANG_SOURCE_DIR}"
- "-DSECOND_NAME=SVN"
+ "-DSECOND_NAME=CLANG"
"-DHEADER_FILE=${version_inc}"
-P "${LLVM_MAIN_SRC_DIR}/cmake/modules/GetSVN.cmake")
Modified: cfe/trunk/lib/Basic/Makefile
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Makefile?rev=223578&r1=223577&r2=223578&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Makefile (original)
+++ cfe/trunk/lib/Basic/Makefile Fri Dec 5 23:06:37 2014
@@ -16,10 +16,10 @@ LIBRARYNAME := clangBasic
include $(CLANG_LEVEL)/Makefile
-SVN_REVISION := $(strip \
+CLANG_REVISION := $(strip \
$(shell $(LLVM_SRC_ROOT)/utils/GetSourceVersion $(PROJ_SRC_DIR)/../..))
-SVN_REPOSITORY := $(strip \
+CLANG_REPOSITORY := $(strip \
$(shell $(LLVM_SRC_ROOT)/utils/GetRepositoryPath
$(PROJ_SRC_DIR)/../..))
LLVM_REVISION := $(strip \
@@ -29,12 +29,12 @@ LLVM_REPOSITORY := $(strip \
$(shell $(LLVM_SRC_ROOT)/utils/GetRepositoryPath $(LLVM_SRC_ROOT)))
CPP.Defines += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
\
- -DSVN_REVISION='"$(SVN_REVISION)"'
-DSVN_REPOSITORY='"$(SVN_REPOSITORY)"' \
+ -DCLANG_REVISION='"$(CLANG_REVISION)"'
-DCLANG_REPOSITORY='"$(CLANG_REPOSITORY)"' \
-DLLVM_REVISION='"$(LLVM_REVISION)"'
-DLLVM_REPOSITORY='"$(LLVM_REPOSITORY)"'
$(ObjDir)/.ver-svn .ver: $(ObjDir)/.dir
- @if [ '$(SVN_REVISION) $(LLVM_REVISION)' != '$(shell cat
$(ObjDir)/.ver-svn 2>/dev/null)' ]; then\
- echo '$(SVN_REVISION) $(LLVM_REVISION)' > $(ObjDir)/.ver-svn;
\
+ @if [ '$(CLANG_REVISION) $(LLVM_REVISION)' != '$(shell cat
$(ObjDir)/.ver-svn 2>/dev/null)' ]; then\
+ echo '$(CLANG_REVISION) $(LLVM_REVISION)' > $(ObjDir)/.ver-svn;
\
fi
$(ObjDir)/.ver-svn: .ver
$(ObjDir)/Version.o: $(ObjDir)/.ver-svn
Modified: cfe/trunk/lib/Basic/Version.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Version.cpp?rev=223578&r1=223577&r2=223578&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Version.cpp (original)
+++ cfe/trunk/lib/Basic/Version.cpp Fri Dec 5 23:06:37 2014
@@ -28,13 +28,13 @@ 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()) {
@@ -72,8 +72,8 @@ std::string getLLVMRepositoryPath() {
}
std::string getClangRevision() {
-#ifdef SVN_REVISION
- return SVN_REVISION;
+#ifdef CLANG_REVISION
+ return CLANG_REVISION;
#else
return "";
#endif
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
