Changeset 2509

Timestamp:

05/14/12 14:10:43 (12 years ago)

Author:

Malte Marquarding

Message:

Fix python2.5 build and add extra options from scons

Location:

trunk/distutils

Files:

• scons_ext.py (modified) (3 diffs)
• setup.cfg (modified) (1 diff)

trunk/distutils/scons_ext.py

@@ -21 +21 @@
              ('rpfitsroot=', None, 'Prefix for rpfits installation location'),
              ('rpfitslib=', None, 'Name of the rpfits library'),
+             ('blaslib=', None, 'Name of the blas library'),
+             ('lapacklib=', None, 'Name of the lapack library'),
+             ('f2clib=', None, 'Name of the fortran-to-c library'),
              ('jobs=','j', 'Number of processes'),
              ('extraroot=', None, 
@@ -47 +50 @@
         self.rpfitsroot = None
         self.rpfitslib = None
+        self.blaslib = None
+        self.lapacklib = None
+        self.f2clib = None
 
     def finalize_options(self):
@@ -60 +66 @@
 
     def build_extensions(self):
-        ext = self.extensions[0]
-        ext_path = self.get_ext_fullpath(ext.name)
-        extdir = os.path.dirname(ext_path)
+        ext = self.extensions[0]        
+        try:
+            ext_path = self.get_ext_fullpath(ext.name)
+            extdir = os.path.dirname(ext_path)
+        except AttributeError:
+            # hack for pyhton 2.5
+            extdir = os.path.join(self.build_lib, ext.name.split(".")[0])
         if not os.path.exists(extdir):
             os.makedirs(extdir)
-        cmd = ['scons', '--quiet'] + self._scons_options
+        cmd = ['scons'] + self._scons_options
         subprocess.call(cmd)
+        # copy extension into distutils build directory
         if os.path.exists("build/_asap.so"):
-            shutil.copy("build/_asap.so", ext_path)
+            shutil.copy("build/_asap.so", extdir)

trunk/distutils/setup.cfg

@@ -6 +6 @@
 # wcslib=/usr/local/lib/libwcs-4.13.2.a
 
-#casacore = /usr/local
-#boost-root = /usr
+# extra root directory to search for other packages
+#extraroot = 
+
+#casacoreroot = /usr/local
+#boostroot = /usr
 #boostlib = boost_python
-#cfitsio-root = /usr
+#cfitsioroot = /usr
 #cfitsiolib = cfitsio
-#wcs-root = /usr/local
+#wcsroot = /usr/local
 #wcslib = wcs
-#rpfits-root = /usr/local
+#rpfitsroot = /usr/local
 #rpfitslib = rpfits
+#blaslib = blas
+#lapacklib = lapack
+#f2clib = gfortran
 
-#extra-root = 
-