[llvm] r321712 - The trunk version is now 7.0.0svn

[Hans Wennborg via llvm-commits]

Author: hans
Date: Wed Jan  3 06:52:54 2018
New Revision: 321712

URL: http://llvm.org/viewvc/llvm-project?rev=321712&view=rev
Log:
The trunk version is now 7.0.0svn

Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/docs/conf.py
    llvm/trunk/utils/release/build_llvm_package.bat

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=321712&r1=321711&r2=321712&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Wed Jan  3 06:52:54 2018
@@ -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)

Modified: llvm/trunk/docs/conf.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/conf.py?rev=321712&r1=321711&r2=321712&view=diff
==============================================================================
--- llvm/trunk/docs/conf.py (original)
+++ llvm/trunk/docs/conf.py Wed Jan  3 06:52:54 2018
@@ -48,9 +48,9 @@ copyright = u'2003-%d, LLVM Project' % d
 # 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.

Modified: llvm/trunk/utils/release/build_llvm_package.bat
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/release/build_llvm_package.bat?rev=321712&r1=321711&r2=321712&view=diff
==============================================================================
--- llvm/trunk/utils/release/build_llvm_package.bat (original)
+++ llvm/trunk/utils/release/build_llvm_package.bat Wed Jan  3 06:52:54 2018
@@ -26,8 +26,8 @@ set python64_dir=C:\Users\%USER%\AppData
 
 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%