From: Hans Wennborg <hans@hanshq.net>
Date: Thu, 12 Jan 2017 21:22:36 +0000 (+0000)
Subject: Bump trunk version to 5.0.0svn
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6fc33e0fd84cc720fabb0723d4a1ebe901e438d;p=llvm

Bump trunk version to 5.0.0svn

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64b33f27757..bd5faacf6c3 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 4)
+  set(LLVM_VERSION_MAJOR 5)
 endif()
 if(NOT DEFINED LLVM_VERSION_MINOR)
   set(LLVM_VERSION_MINOR 0)
diff --git a/docs/conf.py b/docs/conf.py
index 428a513774e..cd9142cefdf 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -47,10 +47,10 @@ copyright = u'2003-%d, LLVM Project' % date.today().year
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-# The short X.Y version.
-version = '4.0'
+# The short version.
+version = '5'
 # The full version, including alpha/beta/rc tags.
-release = '4.0'
+release = '5'
 
 # 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 e7895157cd0..ab5a859d72c 100755
--- a/utils/release/build_llvm_package.bat
+++ b/utils/release/build_llvm_package.bat
@@ -25,8 +25,8 @@ set PATH=%PATH%;c:\gnuwin32\bin
 
 set revision=%1
 set branch=trunk
-set package_version=4.0.0-r%revision%
-set clang_format_vs_version=4.0.0.%revision%
+set package_version=5.0.0-r%revision%
+set clang_format_vs_version=5.0.0.%revision%
 set build_dir=llvm_package_%revision%
 
 echo Branch: %branch%