Changeset 2525 for trunk

Timestamp:

05/16/12 09:23:15 (13 years ago)

Author:

Malte Marquarding

Message:

make extension into module to hide from setup.py

Location:

trunk

Files:

• SConstruct (modified) (2 diffs)
• setup.py (modified) (2 diffs)
• setup_ext (moved) (moved from trunk/distutils )
• setup_ext/__init__.py (moved) (moved from trunk/scons_ext.py ) (3 diffs)

trunk/SConstruct

@@ -32 +32 @@
 opts.AddVariables(
                 ("extraroot", "Addition tree to look for packages", None),
+                ("extraflags", "Additional build flags", None),
                 ("FORTRAN", "The fortran compiler", None),
                 ("f2clib", "The fortran to c library", None),
@@ -212 +213 @@
     if conf.env["alma"]:
         conf.env.Append(CPPFLAGS=['-DUSE_CASAPY'])
+    if conf.env.get("extraflags"):
+        flags = conf.env.ParseFlags(conf.env["extraflags"])
+        conf.env.MergeFlags(flags)
     env = conf.Finish()
 

trunk/setup.py

@@ -1 @@
-import glob
-try:
-    from setuptools import setup
-except ImportError, ex:
-    from distutils.core import setup
-from distutils.core import Extension
-from scons_ext import scons_ext
-from distutils import ccompiler
+from setup_ext import setup
 
 PKGNAME = "asap"
-asapso = Extension(name="%s._%s" % (PKGNAME, PKGNAME), sources=[])
 
 setup(name = PKGNAME,
@@ -27 +19 @@
       install_requires = ["ipython>=0.11", "matplotlib>=0.99", "numpy>=1.3"],
 #      setup_requires = [ "scons>=1.0" ],
-      ext_modules =[ asapso ],
-      cmdclass={'build_ext': scons_ext}
-
       )

trunk/setup_ext/__init__.py

@@ -1 +1 @@
 import os, sys, platform
 import subprocess
+import glob
 import shutil
 from distutils.command import build_ext
+
+try:
+    from setuptools import setup as _setup
+    from setuptools import Extension
+except ImportError, ex:
+    from distutils.core import setup as _setup
+    from distutils.core import Extension
+
+def setup(*args, **kwargs):
+    asapso = Extension(name="%s._%s".format(kwargs['name'],kwargs['name']),
+                                            sources=[])
+    d = {'ext_modules': [ asapso ],
+         'cmdclass': {'build_ext': scons_ext}
+         }
+    kwargs.update(d)
+    print kwargs
+    _setup(*args, **kwargs)
+    
 
 class scons_ext(build_ext.build_ext):
@@ -28 +47 @@
              ('f2clib=', None, 'Name of the fortran-to-c library'),
              ('jobs=','j', 'Number of processes'),
+             ('extraflags=', None, 
+              'Extra build flags e.g. static libs, defines etc.'),
              ('extraroot=', None, 
               'Extra root directory where muiltple packages could be found,'
@@ -44 +65 @@
         self.jobs = None
         self.extraroot = None
+        self.extraflags = None
         self.casacoreroot = None
         self.casacorestatic = None