summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2018-01-03 14:52:54 +0000
committerHans Wennborg <hans@hanshq.net>2018-01-03 14:52:54 +0000
commite28b7aabcf5cd1e7216602015e4ff4e8c2261dfa (patch)
tree1ebfa2beb12bc13629e14192854743b63086331b
parent1b838dc9f8531990d7d8fcaa0abd144ce0407f29 (diff)
The trunk version is now 7.0.0svn
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@321712 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--CMakeLists.txt2
-rw-r--r--docs/conf.py4
-rwxr-xr-xutils/release/build_llvm_package.bat4
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c100adef258..37ffe7a0ffe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ cmake_policy(SET CMP0056 NEW)
cmake_policy(SET CMP0057 NEW)
if(NOT DEFINED LLVM_VERSION_MAJOR)
- set(LLVM_VERSION_MAJOR 6)
+ set(LLVM_VERSION_MAJOR 7)
endif()
if(NOT DEFINED LLVM_VERSION_MINOR)
set(LLVM_VERSION_MINOR 0)
diff --git a/docs/conf.py b/docs/conf.py
index 92eb9813ecf..ce7df14ac3a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2003-%d, LLVM Project' % date.today().year
# built documents.
#
# The short version.
-version = '6'
+version = '7'
# The full version, including alpha/beta/rc tags.
-release = '6'
+release = '7'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/utils/release/build_llvm_package.bat b/utils/release/build_llvm_package.bat
index ef9b21ce923..30b245fc73d 100755
--- a/utils/release/build_llvm_package.bat
+++ b/utils/release/build_llvm_package.bat
@@ -26,8 +26,8 @@ set python64_dir=C:\Users\%USER%\AppData\Local\Programs\Python\Python35
set revision=%1
set branch=trunk
-set package_version=6.0.0-r%revision%
-set clang_format_vs_version=6.0.0.%revision%
+set package_version=7.0.0-r%revision%
+set clang_format_vs_version=7.0.0.%revision%
set build_dir=llvm_package_%revision%
echo Branch: %branch%