From 72ce071e25e2cc2626355a11d3e1088853343bfe Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 6 Jun 2019 14:32:47 +0200 Subject: [PATCH] prepare the release of 3.22.4 --- CMakeLists.txt | 3 +-- ChangeLog | 7 +++++++ doc/doxygen/inside_release.doc | 8 ++++++-- docs/source/conf.py | 2 +- setup.py | 2 +- sonar-project.properties | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 044b05bff6..4aca064856 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,8 +101,7 @@ endif() set(SIMGRID_VERSION_MAJOR "3") set(SIMGRID_VERSION_MINOR "22") -set(SIMGRID_VERSION_PATCH "90") -set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1) +set(SIMGRID_VERSION_PATCH "4") # odd => git branch; even => stable release or released snapshot set(SIMGRID_VERSION_DATE "2019") # Year for copyright information diff --git a/ChangeLog b/ChangeLog index 55033f4bb8..6af1ea661c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +This is SimGrid v3.22.4, a preview of v3.23 that is not released yet. + +It is distributed in the hope that it can be useful to you, but with +no waranty whatsoever. Released June 6. 2019. + +---------------------------------------------------------------------------- + SimGrid (3.23) NOT RELEASED (Release Target: June 21. 2019, 15:54 UTC) General: diff --git a/doc/doxygen/inside_release.doc b/doc/doxygen/inside_release.doc index d6da2b8fec..0853dbec55 100644 --- a/doc/doxygen/inside_release.doc +++ b/doc/doxygen/inside_release.doc @@ -157,14 +157,18 @@ Release numbering semantic: - We provide and store a source .tar.gz and a full jarfile on framagit - Deprecated symbols remain usable for at least 3 named releases (~1 year) - These releases are announced to the users - - 3.X.Y is a dot release of 3.X + - 3.X.Y where Y is even: dot release of 3.X, prerelease of 3.(X+1) - We provide and store a source .tar.gz and a full jarfile on framagit - These releases are NOT announced publicly, nor really documented. The idea is to have something close to a rolling release. - External projects can depend on dot releases to loosen their release process from ours, when 4 release a year is not enough - - 3.X.90 is a git version, a preversion of 3.(X+1) (3.22.90 = pre-3.23) + - 3.X.Y where Y is odd: git current status between two releases - No expectations on such versions + - Example + - 3.22.4: unannounced/losely documented stable release + - 3.22.5: git status somewhere between the release of 3.22.4 and the next one + - 3.23: Documented and announced stable release Doing a dot release: - Update the version number in: diff --git a/docs/source/conf.py b/docs/source/conf.py index f3f2dcb6e8..39761457ea 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -35,7 +35,7 @@ copyright = u'2002-2019, The SimGrid Team' author = u'The SimGrid Team' # The short X.Y version -version = u'3.22.90' +version = u'3.22.4' # The full version, including alpha/beta/rc tags release = u'3.23 alpha' diff --git a/setup.py b/setup.py index f3b07d5563..a309ff0017 100755 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ class CMakeBuild(build_ext): setup( name='simgrid', - version='3.22.2', + version='3.22.4', author='Da SimGrid Team', author_email='simgrid-devel@lists.gforge.inria.fr', description='Toolkit for scalable simulation of distributed applications', diff --git a/sonar-project.properties b/sonar-project.properties index c35687e16f..051423a50e 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -4,7 +4,7 @@ sonar.organization=simgrid sonar.projectKey=simgrid_simgrid sonar.projectName=SimGrid -sonar.projectVersion=3.22.90 +sonar.projectVersion=3.22.4 sonar.links.homepage=https://simgrid.org sonar.links.issue=https://framagit.org/simgrid/simgrid/issues -- 2.20.1