From 47b7a37846d369042b59de9d26b5765dd27c5f1f Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 21 Jun 2011 09:11:52 +0200 Subject: [PATCH] release the v3.6, at least --- CMakeLists.txt | 10 +++++++--- ChangeLog | 6 ++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f48d694648..67a7a81a95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,15 +7,19 @@ project(simgrid CXX C) set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE) set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE) set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE) + ## Mapping version number -> version name # 3.5.99 -> alpha1 (oops) # 3.5.9{1,2} -> beta{1,2} # 3.5.9{3,4,5} -> rc{1,2,3} +# 3.6.0 -> release 3.6 -# 3.6.0 -> release 3.6 (not yet) set(SIMGRID_VERSION_MAJOR "3") -set(SIMGRID_VERSION_MINOR "5") -set(SIMGRID_VERSION_PATCH "95") +set(SIMGRID_VERSION_MINOR "6") +set(SIMGRID_VERSION_PATCH "0") + + + set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}") set(libsimgrid_version "${release_version}") set(libgras_version "${release_version}") diff --git a/ChangeLog b/ChangeLog index 0e14051eb9..e484fddb56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -SimGrid (3.6) unstable; urgency=low +SimGrid (3.6) stable; urgency=medium + + The Summer Release, also known as the "F*! They Killed Kenny!" version Java and Ruby: * Bindings now constitute their own package, separated from the main one. @@ -132,7 +134,7 @@ SimGrid (3.6) unstable; urgency=low * Add a build option -Denable_debug (set to ON by default): when set to OFF, assertions and verbose/debug logging events are disabled at compile time. - -- Da SimGrid team + -- Tue Jun 21 08:57:43 CEST 2011 Da SimGrid team SimGrid (3.5) stable; urgency=medium -- 2.20.1