Changeset 17842 for fact/tools/pyscripts

Timestamp:

05/13/14 08:01:26 (10 years ago)

Author:

dneise

Message:

got rid of ugly loading libz

File:

• fact/tools/pyscripts/new_pyfact/pyfact.py (modified) (1 diff)

fact/tools/pyscripts/new_pyfact/pyfact.py

@@ -12 +12 @@
 ########## BUILDING OF THE SHARED OBJECT FILES ###############################
 if __name__ == '__main__' and len(sys.argv) > 1 and 'build' in sys.argv[1]:
-    hostname = ROOT.gSystem.HostName()
-    libz_path_dict = {
-        # hostname  :   /path/to/libz.so
-        'isdc'          : "/usr/lib64/libz.so",
-        'neiseLenovo'   : "/usr/lib/libz.so",
-        'factcontrol'   : "/usr/lib/libz.so",
-        "max-K50AB"     : "/usr/lib/x86_64-linux-gnu/libz.so",
-        "watz"          : "/usr/lib/x86_64-linux-gnu/libz.so",
-        "grolsch"       : "/usr/lib/i386-linux-gnu/libz.so",
-    }
-    libz_loaded = False
-    for my_hostname in libz_path_dict:
-        if my_hostname in hostname:
-            ROOT.gSystem.Load(libz_path_dict[my_hostname])
-            libz_loaded = True
-    if not libz_loaded:
-        print """Warning - Warning - Warning - Warning - Warning - Warning - Warning
-        I most probably need to load libz.so but I don't know where it is.
-        
-        Please edit pyfact.py around line 16-24 and insert your hostname and your
-        path to your libz.so 
-        Sorry for the inconvenience.
-        """
-        sys.exit(-1)
-
-        
+    ROOT.gSystem.AddLinkedLibs("-lz")
     root_make_string = ROOT.gSystem.GetMakeSharedLib()
     if not "-std=c++0x" in root_make_string: