Release 3 11

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e90ed43..46d7b20 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ set(CMAKE_Fortran_LINK_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "11")
 set(SIMGRID_VERSION_PATCH "0")
-set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1)
+#set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1)
 
 set(SIMGRID_VERSION_DATE  "2014") # Year for copyright information
 

diff --git a/ChangeLog b/ChangeLog
index f65b243..3436cb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-SimGrid (3.11) NOT RELEASED; urgency=low
+SimGrid (3.11) stable; urgency=low
 
  The Class Release.
 

diff --git a/NEWS b/NEWS
index 6388d4a..5691505 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ __   _____ _ __ ___(_) ___  _ __   |___ / / / |
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ | | |
  \ V /  __/ |  \__ \ | (_) | | | |  ___) || | |
   \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_|_|
-
+                May 31 2014
 The Class Release. Major changes:
  * Surf is now in C++ (and documented!)
  * Virtual Machine model for Cloud Simulation

diff --git a/tools/generate-multi-jar.py b/tools/generate-multi-jar.py
index 7bd1431..c200c49 100755 (executable)
--- a/tools/generate-multi-jar.py
+++ b/tools/generate-multi-jar.py
@@ -36,16 +36,16 @@ class SimJar(object):
        if len(path)==3 and path[0] == 'NATIVE':
          platform, arch = path[1:3]
        elif z.filename=='META-INF/MANIFEST.MF':
-          zf.read('META-INF/MANIFEST.MF')      
+          zf.read('META-INF/MANIFEST.MF')
           git_version = re.findall(r"Implementation-Version: \"(.*?)\"", zf.read('META-INF/MANIFEST.MF'))
-      
-      assert platform is not None and git_version is not None, "Jar file not valid"
+
+      assert platform is not None and git_version is not None, "Jar file not valid (%s, %s)"%(platform, git_version)
       print "Adding: %s %s"%(platform, arch)
       if self.git_version is None:
        self.git_version = git_version
       elif self.git_version != git_version:
        print "WARNING: Assembling jar of various commits (%s vs %s)"%(self.git_version, git_version)
-      
+
       for info in zf.infolist():
         if info.filename not in self.done:
           self.done.add(info.filename)