Changeset 218 for trunk

Timestamp:

04/09/10 09:34:10 (14 years ago)

Author:

bas

Message:

setup.py.in:

• clean up old code. Only support pbs-config installations

File:

• trunk/setup.py.in (modified) (5 diffs)

trunk/setup.py.in

@@ -14 +14 @@
 #
 PBS_LIB_DIR='@pbs_library_dir@'
-NEW_BUILD_SYSTEM=1
-
-if not PBS_LIB_DIR:
-        for dir in ['/usr/lib', '/usr/local/lib', '/opt/pbs/usr/lib', '/usr/lib/torque', '/opt/pbs/lib', '/opt/torque/lib' ]:
-                dummy_new = os.path.join(dir, 'libtorque.so')
-                dummy_old = os.path.join(dir, 'libpbs.a')
-                if os.path.exists(dummy_new):
-                        PBS_LIB_DIR=dir
-                        break
-                elif os.path.exists(dummy_old):
-                        PBS_LIB_DIR=dir
-                        NEW_BUILD_SYSTEM=0
-                        break
 
 if not PBS_LIB_DIR:
@@ -35 +22 @@
 # Test if we have all the libs:
 #
-if NEW_BUILD_SYSTEM:
-        LIBS = ['torque']
-else:
-        LIBS = ['log', 'net', 'pbs']
-        for lib in LIBS:
-                library = 'lib%s.a' %(lib)
-                dummy = os.path.join(PBS_LIB_DIR, library)
-        if not os.path.exists(dummy):
-                        print 'You need to install "%s" in %s' %(library, PBS_LIB_DIR)
-                        sys.exit(1)
+LIBS = [PBS_LIB_DIR]
 
 ### Make symlinks to right torque version
@@ -51 +29 @@
 tmp = VERSION.split('.')
 major_version = '.'.join( tmp[0:2] )
-
 
 
@@ -70 +47 @@
         os.symlink('pbs_wrap_2.1.c', 'pbs_wrap.c')
         os.symlink('pbs_2.1.py', 'pbs.py')
+
 os.chdir('..')
 
 setup ( name = 'pbs_python',
-        version = '3.8.0',
+        version = '4.0.0',
         description = 'openpbs/torque python interface',
         author = 'Bas van der Vlies',
@@ -86 +64 @@
         ext_modules = [ 
                 Extension( '_pbs', ['src/pbs_wrap.c'],
-                library_dirs = [ PBS_LIB_DIR ],
-                libraries = LIBS) 
+                library_dirs = [ PBS_LIB_DIR ])
+                #libraries = [PBS_LIB_DIR]) 
         ]
 )