start the v3.21 cycle

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e179a3e..ca7a1da 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,8 +106,8 @@ endif()
 
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "20")
-set(SIMGRID_VERSION_PATCH "0")
-# set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_PATCH "90")
+set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
 
 set(SIMGRID_VERSION_DATE  "2018") # Year for copyright information
 

diff --git a/ChangeLog b/ChangeLog
index 5f4dcfc..a4ff839 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+SimGrid (3.21) NOT RELEASED (Release Target: September 23. 2018, 1:54 UTC)
+
+
+
+
 SimGrid (3.20) Released June 24. 2018
 
 The proxy snake_case() release.

diff --git a/NEWS b/NEWS
index eab228e..c04c3f9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+                    _               _____  ____  _
+__   _____ _ __ ___(_) ___  _ __   |___ / |___ \/ |
+\ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   __) | |
+ \ V /  __/ |  \__ \ | (_) | | | |  ___) | / __/| |
+  \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_____|_|
+               (not released)
+
+
                     _               _____  ____   ___
 __   _____ _ __ ___(_) ___  _ __   |___ / |___ \ / _ \
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   __) | | | |

diff --git a/doc/doxygen/inside_release.doc b/doc/doxygen/inside_release.doc
index b2e9332..2417373 100644 (file)
--- a/doc/doxygen/inside_release.doc
+++ b/doc/doxygen/inside_release.doc
@@ -120,7 +120,7 @@ the settings icon of the release you want to change.
  - Also mail some other lists (G5K users), with only the NEWS chunk
    and the link to the download section
 - Release the debian package
-  - make -C debian/rules get-orig-source
+  - make -f debian/rules get-orig-source
   - gbp import ../simgrid_XXX+dfsg.orig.tar.xz
   - dch -i "New upstream release" # + copy the NEWS into debian/changelog
   - git mv debian/libsimgrid3.XX.install debian/libsimgrid3.XY.install
@@ -129,6 +129,7 @@ the settings icon of the release you want to change.
     - libsimgrid3.XY conflicts with libsimgrid3.XX because of smpimain
 - Update the simgrid/package.py for spack: https://gitlab.inria.fr/solverstack/spack-repo
 - Create the template for the next release in ChangeLog and NEWS files
+  Release Target date: https://en.wikipedia.org/wiki/Equinox
 - Change the release number to 3.X.90 in CMakeLists.txt and sonar-project.properties
 - Deal with deprecations:
   - Introduce the XBT_ATTRIB_DEPRECATED_v??? macro for the next release.

diff --git a/sonar-project.properties b/sonar-project.properties
index cd397b4..680725f 100644 (file)
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -3,7 +3,7 @@
 
 sonar.projectKey=simgrid
 sonar.projectName=SimGrid
-sonar.projectVersion=3.20
+sonar.projectVersion=3.20.90
 
 sonar.links.homepage=http://simgrid.org
 sonar.links.issue=https://github.com/simgrid/simgrid/issues