[PATCH] D21821: Bump trunk version to 4.0 and switch to new versioning scheme

[Hans Wennborg via llvm-commits]

hans added a reviewer: rsmith.
hans updated this revision to Diff 62242.
hans added a comment.

This just sets the version to 4.0.0, with the expectation that the next major release be 5.0.0, and patch releases 4.0.1, etc.

I like this, as it eliminates the ambiguity of what 4.1 would mean (major release like 3.1 or patch release?), and avoids the problem of trying to remove one part of the tuple without breaking clients expecting it to be there, e.g. in LLVM's config headers, Clang's built-in macros, etc.

Richard, I'd be interested to hear your thoughts on this one.


http://reviews.llvm.org/D21821

Files:
  CMakeLists.txt
  docs/DeveloperPolicy.rst
  docs/conf.py

Index: docs/conf.py
===================================================================
--- docs/conf.py
+++ docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.9'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.9'
+release = '4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
Index: docs/DeveloperPolicy.rst
===================================================================
--- docs/DeveloperPolicy.rst
+++ docs/DeveloperPolicy.rst
@@ -510,8 +510,7 @@
 * Additions and changes to the IR should be reflected in
   ``test/Bitcode/compatibility.ll``.
 
-* The bitcode format produced by a X.Y release will be readable by all
-  following X.Z releases and the (X+1).0 release.
+* The current LLVM version supports loading any bitcode since version 3.0.
 
 * After each X.Y release, ``compatibility.ll`` must be copied to
   ``compatibility-X.Y.ll``. The corresponding bitcode file should be assembled
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -21,10 +21,10 @@
 endif()
 
 if(NOT DEFINED LLVM_VERSION_MAJOR)
-  set(LLVM_VERSION_MAJOR 3)
+  set(LLVM_VERSION_MAJOR 4)
 endif()
 if(NOT DEFINED LLVM_VERSION_MINOR)
-  set(LLVM_VERSION_MINOR 9)
+  set(LLVM_VERSION_MINOR 0)
 endif()
 if(NOT DEFINED LLVM_VERSION_PATCH)
   set(LLVM_VERSION_PATCH 0)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D21821.62242.patch
Type: text/x-patch
Size: 1477 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160629/561ac6b7/attachment.bin>