From: Hans Wennborg <hans@hanshq.net>
Date: Wed, 19 Jul 2017 12:19:01 +0000 (+0000)
Subject: Update trunk version to 6.0.0svn
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89fb1f68e327643614e9b26409c2f773336578ea;p=llvm

Update trunk version to 6.0.0svn

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@308442 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61ecfdf970d..b0572f9adfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ if(POLICY CMP0057)
 endif()
 
 if(NOT DEFINED LLVM_VERSION_MAJOR)
-  set(LLVM_VERSION_MAJOR 5)
+  set(LLVM_VERSION_MAJOR 6)
 endif()
 if(NOT DEFINED LLVM_VERSION_MINOR)
   set(LLVM_VERSION_MINOR 0)
diff --git a/docs/conf.py b/docs/conf.py
index e7c18da48eb..92eb9813ecf 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 = '5'
+version = '6'
 # The full version, including alpha/beta/rc tags.
-release = '5'
+release = '6'
 
 # 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 79871781211..ef9b21ce923 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=5.0.0-r%revision%
-set clang_format_vs_version=5.0.0.%revision%
+set package_version=6.0.0-r%revision%
+set clang_format_vs_version=6.0.0.%revision%
 set build_dir=llvm_package_%revision%
 
 echo Branch: %branch%