Changeset 1501

Timestamp:

02/11/09 12:54:51 (16 years ago)

Author:

Malte Marquarding

Message:

support linking against pyrap

Location:

trunk

Files:

• SConstruct (modified) (3 diffs)
• src/python_asap.cpp (modified) (4 diffs)

trunk/SConstruct

@@ -56 +56 @@
                 ("rpfitslibdir", "The rpfits library location", None),
 #               ("rpfitsincdir", "The rpfits include location", None),
+                ("pyraproot", "The root directory where libpyrap is installed",
+                 None),
+                ("pyraplib", "The name of the pyrap library", "pyrap"),
+                ("pyraplibdir", "The directory where libpyrap is installed",
+                 None),
+                ("pyrapincdir", "The pyrap include location",
+                 None),
+                BoolVariable("enable_pyrap", "Use pyrap conversion library", 
+                             True),
+
                 EnumVariable("mode", "The type of build.", "release",
                            ["release","debug"], ignorecase=1),
@@ -65 +75 @@
                            ["none", "pdf", "html"], ignorecase=1),
                 BoolVariable("apps", "Build cpp apps", False),
-                BoolVariable("alma", "Enable alma specific functionality", False)
+                BoolVariable("alma", "Enable alma specific functionality", 
+                             False),
                 )
 
@@ -113 +124 @@
 
     conf.env.AddCustomPackage('boost')
-    if not conf.CheckLibWithHeader(env["boostlib"], 
+    if not conf.CheckLibWithHeader(conf.env["boostlib"], 
                                    'boost/python.hpp', language='c++'): 
         Exit(1)
+
+    conf.env.AddCustomPackage('pyrap')
+    if  conf.env.get("enable_pyrap") and conf.CheckLib(conf.env["pyraplib"], 
+                                                       language='c++', 
+                                                       autoadd=0): 
+        conf.env.Append(CPPFLAGS=['-DHAVE_PYRAP'])
+        conf.env.PrependUnique(LIBS=env['pyraplib'])
+    
     # test for cfitsio
     if not conf.CheckLib("m"): Exit(1)

trunk/src/python_asap.cpp

@@ -39 +39 @@
 #include "ScantableWrapper.h"
 
+#ifndef HAVE_LIBPYRAP
+  #include "pyconversions.h"
+#else
+  #include <pyrap/Converters/PycExcp.h>
+  #include <pyrap/Converters/PycBasicData.h>
+#endif
 
-#include "pyconversions.h"
 #include "python_asap.h"
 
+#ifndef HAVE_LIBPYRAP
 namespace asap {
   namespace python {
+
 void translate_ex(const casa::AipsError& e)
 {
@@ -53 +60 @@
   }
 }
+#endif
+
 using namespace boost::python;
 
@@ -65 +74 @@
   asap::python::python_STWriter();
   asap::python::python_LineCatalog();
+  asap::python::python_Logger();
 
-  asap::python::python_Logger();
+#ifndef HAVE_LIBPYRAP
+  // Use built-in pyconversions.h
   register_exception_translator<casa::AipsError>(&asap::python::translate_ex);
-
-  //std_vector_to_tuple <  > ();
   from_python_sequence < std::vector< asap::ScantableWrapper >,
     variable_capacity_policy > ();
-
   std_vector_to_tuple < int > ();
   from_python_sequence < std::vector < int >,
@@ -91 +99 @@
   from_python_sequence < std::vector < bool >,
     variable_capacity_policy > ();
+#else
+  casa::pyrap::register_convert_excp();
+  casa::pyrap::register_convert_basicdata();
+  casa::pyrap::register_convert_std_vector<asap::ScantableWrapper>();
+#endif
 }