Changeset 2517 for trunk/scons_ext.py

Timestamp:

05/15/12 15:17:10 (12 years ago)

Author:

Malte Marquarding

Message:

More updates to get a distutils/scons build going

File:

• trunk/scons_ext.py (moved) (moved from trunk/distutils/scons_ext.py) (4 diffs)

trunk/scons_ext.py

@@ -19 +19 @@
               'Prefix for cfitsio installation location'),
              ('cfitsiolib=', None, 'Name of the cfitsio library'),
+             ('cfitsioincdir=', None, 'The custom cfitsio include dir'),
              ('wcsroot=', None, 'Prefix for wcslib installation location'),
              ('wcslib=', None, 'Name of the wcs library'),
@@ -49 +50 @@
         self.cfitsioroot = None
         self.cfitsiolib = None
+        self.cfitsioincdir = None
         self.wcsroot = None
         self.wcslib = None
@@ -60 +62 @@
         build_ext.build_ext.finalize_options(self)
         for opt in self.user_options:
-            atr = opt[0].strip("=")
-            v = getattr(self, atr)
+            attr = opt[0].strip("=")
+            v = getattr(self, attr)
             if v is not None:
                 if opt[1] is None:
-                    self._scons_options.append("=".join([atr, v]))
+                    self._scons_options.append("=".join([attr, v]))
                 else:
                     self._scons_options.append(" ".join(["-"+opt[1], v]))
@@ -79 +81 @@
             os.makedirs(extdir)
         cmd = ['scons'] + self._scons_options
-        subprocess.call(cmd)
+        retcode = subprocess.call(cmd)
+        if retcode != 0:
+            raise RuntimeError('scons failed')
         # copy extension into distutils build directory
         if os.path.exists("build/_asap.so"):