Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[mc] Fix the DSO debug ignore list
[simgrid.git] / tools / generate-multi-jar.py
index 7905d9b..c200c49 100755 (executable)
@@ -14,11 +14,11 @@ import zipfile
 import tempfile
 import os, sys, re
 
-dists = ['https://ci.inria.fr/simgrid/job/SimGrid-Multi/build_mode=Debug,label=%s/lastSuccessfulBuild/artifact/build/SimGrid-3.11/simgrid.jar'%dist
+dists = ['https://ci.inria.fr/simgrid/job/SimGrid-Multi/build_mode=Debug,label=%s/lastSuccessfulBuild/artifact/build/SimGrid-3.11/simgrid_full.jar'%dist
          for dist in ["small-debian-32"
                      ,"small-debian-64"
                      ,"small-freebsd-64-clang"]]
-dists.append('https://ci.inria.fr/simgrid/job/Simgrid-Mult-Win7/build_mode=Debug,label=windows-64/lastSuccessfulBuild/artifact/build/simgrid.jar')
+dists.append('https://ci.inria.fr/simgrid/job/Simgrid-Mult-Win7/build_mode=Debug,label=windows-64/lastSuccessfulBuild/artifact/build/simgrid_full.jar')
 
 class SimJar(object):
   def __init__(self, filename='simgrid.jar'):
@@ -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)