change LLVM_VERSION_SUFFIX default from svn to git

[nickdesaulniers]

Summary

Sayonara SVN!

Signed-off-by: Nick Desaulniers <[e-mail]>

[smeenai]

This LGTM, thanks! I'll give a couple of days for @hans and @tstellar to look at this in case they have any thoughts as the release managers.

[mgorny]

LGTM as well.

[hans]

In D70019#1739189, @smeenai wrote:

This LGTM, thanks! I'll give a couple of days for @hans and @tstellar to look at this in case they have any thoughts as the release managers.

Looks good to me!

libcxx/CMakeLists.txt

set(CMAKE_MODULE_PATH
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
   ${CMAKE_MODULE_PATH}
   )
 
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUILD)
   project(libcxx CXX C)
 
   set(PACKAGE_NAME libcxx)
-  set(PACKAGE_VERSION 10.0.0svn)
+  set(PACKAGE_VERSION 10.0.0git)
   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
   set(PACKAGE_BUGREPORT "[e-mail]")
 
   # Find the LLVM sources and simulate LLVM CMake options.
   include(HandleOutOfTreeLLVM)
 endif()
 
 if (LIBCXX_STANDALONE_BUILD)

libunwind/CMakeLists.txt

if (EXISTS ${LLVM_CMAKE_PATH})
     list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
     include("${LLVM_CMAKE_PATH}/AddLLVM.cmake")
     include("${LLVM_CMAKE_PATH}/HandleLLVMOptions.cmake")
   else()
     message(WARNING "Not found: ${LLVM_CMAKE_PATH}")
   endif()
 
   set(PACKAGE_NAME libunwind)
-  set(PACKAGE_VERSION 10.0.0svn)
+  set(PACKAGE_VERSION 10.0.0git)
   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
   set(PACKAGE_BUGREPORT "[e-mail]")
 
   if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
     set(LLVM_LIT ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
   else()
     # Seek installed Lit.
     find_program(LLVM_LIT "lit.py" ${LLVM_MAIN_SRC_DIR}/utils/lit

llvm/CMakeLists.txt

 endif()
 if(NOT DEFINED LLVM_VERSION_MINOR)
   set(LLVM_VERSION_MINOR 0)
 endif()
 if(NOT DEFINED LLVM_VERSION_PATCH)
   set(LLVM_VERSION_PATCH 0)
 endif()
 if(NOT DEFINED LLVM_VERSION_SUFFIX)
-  set(LLVM_VERSION_SUFFIX svn)
+  set(LLVM_VERSION_SUFFIX git)
 endif()
 
 if (NOT PACKAGE_VERSION)
   set(PACKAGE_VERSION
     "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}")
 endif()
 
 if ((CMAKE_GENERATOR MATCHES "Visual Studio") AND (CMAKE_GENERATOR_TOOLSET STREQUAL ""))

llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn

values = [
     "CLANG_OPENMP_NVPTX_DEFAULT_ARCH=sm_35",
     "CLANG_LIBDIR_SUFFIX=",
     "CLANG_RESOURCE_DIR=",
     "C_INCLUDE_DIRS=",
     "CLANG_CONFIG_FILE_SYSTEM_DIR=",
     "CLANG_CONFIG_FILE_USER_DIR=",
     "DEFAULT_SYSROOT=",
     "GCC_INSTALL_PREFIX=",
-    "BACKEND_PACKAGE_STRING=LLVM ${llvm_version}svn",
+    "BACKEND_PACKAGE_STRING=LLVM ${llvm_version}git",
     "ENABLE_LINKER_BUILD_ID=",
     "ENABLE_X86_RELAX_RELOCATIONS=",
     "ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER=",
     "CLANG_ENABLE_OBJC_REWRITER=1",  # FIXME: flag?
   ]
 
   if (clang_enable_arcmt) {
     values += [ "CLANG_ENABLE_ARCMT=1" ]

llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn

values = [
     "HAVE____CHKSTK=",
     "HAVE____CHKSTK_MS=",
     "HOST_LINK_VERSION=",
     "LLVM_TARGET_TRIPLE_ENV=",
     "LLVM_VERSION_INFO=",
     "LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO=1",
     "PACKAGE_BUGREPORT=https://bugs.llvm.org/",
     "PACKAGE_NAME=LLVM",
-    "PACKAGE_STRING=LLVM ${llvm_version}svn",
-    "PACKAGE_VERSION=${llvm_version}svn",
+    "PACKAGE_STRING=LLVM ${llvm_version}git",
+    "PACKAGE_VERSION=${llvm_version}git",
     "PACKAGE_VENDOR=",
     "RETSIGTYPE=void",
     "LLVM_GISEL_COV_ENABLED=",
     "LLVM_GISEL_COV_PREFIX=",
     "LLVM_WITH_Z3=",
 
     # FIXME: Set to 1 on mac once the 10.14 SDK is in common use.
     "LLVM_SUPPORT_XCODE_SIGNPOSTS=",
values = [
     "LLVM_NATIVE_TARGETINFO=1",
     "LLVM_NATIVE_TARGETMC=1",
     "LLVM_USE_INTEL_JITEVENTS=",
     "LLVM_USE_OPROFILE=",
     "LLVM_USE_PERF=",
     "LLVM_VERSION_MAJOR=$llvm_version_major",
     "LLVM_VERSION_MINOR=$llvm_version_minor",
     "LLVM_VERSION_PATCH=$llvm_version_patch",
-    "PACKAGE_VERSION=${llvm_version}svn",
+    "PACKAGE_VERSION=${llvm_version}git",
     "LLVM_FORCE_ENABLE_STATS=",
   ]
 
   if (current_os == "win") {
     values += [ "LLVM_ON_UNIX=" ]
   } else {
     values += [ "LLVM_ON_UNIX=1" ]
   }

llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn

values = [
     "LLVM_TARGETS_BUILT=$llvm_targets_to_build_string",
     "LLVM_SYSTEM_LIBS=$system_libs",
     "LLVM_BUILD_SYSTEM=gn",
     "LLVM_HAS_RTTI=0",
     "LLVM_BUILD_LLVM_DYLIB=0",
     "LLVM_LINK_LLVM_DYLIB=0",
     "BUILD_SHARED_LIBS=0",
     "LLVM_DYLIB_COMPONENTS_expanded=all",
-    "LLVM_DYLIB_VERSION=${llvm_version_major}svn",
+    "LLVM_DYLIB_VERSION=${llvm_version_major}git",
     "LLVM_HAS_GLOBAL_ISEL=1",
     "LLVM_TOOLS_INSTALL_DIR=",
   ]
 }
 
 # FIXME: It'd be nice to not depend on llvm-build on this, Depending on all the
 # LLVMBuild.txt files just for this seems a bit overkill.  `gn desc` should
 # have all this information too and could be called at build time.