Changeset 1873

Timestamp:

08/13/10 15:03:53 (14 years ago)

Author:

Malte Marquarding

Message:

Move to compile in pyrap out of external if it isn't found in the system

Location:

trunk

Files:

• SConstruct (modified) (3 diffs)
• src/SConscript (modified) (2 diffs)

trunk/SConstruct

@@ -4 +4 @@
 import platform
 import SCons
+
+# try to autodetect numpy
+def get_numpy_incdir():
+    try:
+        # try to find an egg
+        from pkg_resources import require
+        tmp = require("numpy")
+        import numpy
+        return numpy.__path__[0]+"/core/include"
+    except Exception:
+        # now try standard package
+        try:
+            import numpy
+            return numpy.__path__[0]+"/core/include"
+        except ImportError:
+            pass
+    return ""
 
 moduledir = distutils.sysconfig.get_python_lib()
@@ -58 +75 @@
                 ("pyraproot", "The root directory where libpyrap is installed",
                  None),
+                ("numpyincdir", "numpy header file directory",
+                 get_numpy_incdir()),
                 ("pyraplib", "The name of the pyrap library", "pyrap"),
                 ("pyraplibdir", "The directory where libpyrap is installed",
@@ -128 +147 @@
 
     conf.env.AddCustomPackage('pyrap')
-    if  conf.env.get("enable_pyrap") and conf.CheckLib(conf.env["pyraplib"], 
-                                                       language='c++', 
-                                                       autoadd=0): 
+    if conf.CheckLib(conf.env["pyraplib"], language='c++', autoadd=0): 
         conf.env.Append(CPPFLAGS=['-DHAVE_PYRAP'])
         conf.env.PrependUnique(LIBS=env['pyraplib'])
-    
+    else:
+        conf.env.AppendUnique(CPPPATH=[conf.env["numpyincdir"]])
+        # numpy 1.0 uses config.h; numpy >= 1.1 uses numpyconfig.h
+        if conf.CheckHeader("numpy/config.h") or \
+               conf.CheckHeader("numpy/numpyconfig.h"):
+            conf.env.Append(CPPDEFINES=["-DAIPS_USENUMPY"])
+        else:
+            conf.env.Exit(1)
+        # compile in pyrap here...
+        conf.env["pyrapint"] = "#/external/libpyrap/pyrap-0.3.2"
     # test for cfitsio
     if not conf.CheckLib("m"): Exit(1)

trunk/src/SConscript

@@ -8 +8 @@
 cpps = env.SGlob("*.cpp")
 pycpps = env.SGlob("python_*.cpp")
-for pf in pycpps: cpps.remove(pf)
+for pf in pycpps:
+    cpps.remove(pf)
 
 # location of libcasav.a
@@ -18 +19 @@
 myenv.Prepend( LIBS =  ['asap'] )
 
+shenv = myenv.Clone()
+pyrapdir = shenv.get("pyrapint", None)
+if pyrapdir:
+    shenv.PrependUnique(CPPPATH=pyrapdir)    
+    pycpps += shenv.Glob('%s/pyrap/*/*.cc' % pyrapdir)
 # Finally create the library for the module
-if not hasattr(myenv, "LoadableModule"):
-    myenv.LoadableModule = myenv.SharedLibrary
-so = myenv.LoadableModule( target = "_asap.so", source = pycpps, SHLIBSUFFIX="" )
-#test = myenv.Program("test", cpps)
+if not hasattr(shenv, "LoadableModule"):
+    shenv.LoadableModule = shenv.SharedLibrary
+so = shenv.LoadableModule( target = "_asap.so", source = pycpps, SHLIBSUFFIX="" )
+#test = shenv.Program("test", cpps)
 Return("so")