Changeset 2517

Timestamp:

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

Author:

Malte Marquarding

Message:

More updates to get a distutils/scons build going

Location:

trunk

Files:

• SConstruct (modified) (6 diffs)
• distutils/setupext.py (deleted)
• examples/waterfall.py (modified) (2 diffs)
• scons/casaoptions.py (deleted)
• scons/utils.py (modified) (3 diffs)
• scons_ext.py (moved) (moved from trunk/distutils/scons_ext.py ) (4 diffs)
• setup.cfg (moved) (moved from trunk/distutils/setup.cfg )
• setup.py (moved) (moved from trunk/distutils/setup.py ) (1 diff)

trunk/SConstruct

@@ -21 +21 @@
             pass
     return ""
+
+def get_libdir():
+    return os.path.basename(distutils.sysconfig.get_config_var('LIBDIR'))
+
+LIBDIR = "lib' #get_libdir()
 
 EnsureSConsVersion(1,0,0)
@@ -127 +132 @@
     else:
         conf.env.AppendUnique(CPPPATH=[conf.env["numpyincdir"]])
-        # numpy 1.0 uses config.h; numpy >= 1.1 uses numpyconfig.h
         if conf.CheckHeader("numpy/numpyconfig.h"):
             conf.env.Append(CPPDEFINES=["-DAIPS_USENUMPY"])
@@ -136 +140 @@
     conf.env.Append(CPPFLAGS=['-DHAVE_LIBPYRAP'])
 
+    if not conf.CheckLib("m"): 
+        Exit(1)
     # test for cfitsio
-    if not conf.CheckLib("m"): Exit(1)
     conf.env.AddCustomPackage('cfitsio')
     libname = conf.env["cfitsiolib"]
-    if libname.find(".") > -1 and os.path.exists(libname):
-        conf.env.AppendUnique(LIBS=[env.File(libname)])
-    else:
-        if not conf.CheckLibWithHeader(libname,
-                                       'fitsio.h', language='c'):
+    if not conf.CheckHeader("fitsio.h"):
+        #SuSE is being special
+        conf.env.AppendUnique(CPPPATH=['/usr/include/libcfitsio0'])
+        if not conf.CheckHeader("fitsio.h"):
+            Exit(1)
+    if libname.find(".") > -1 and os.path.exists(libname):
+        conf.env.AppendUnique(LIBS=[env.File(libname)])
+    else:
+        if not conf.CheckLib(libname, language='c'):
             Exit(1)
     conf.env.AddCustomPackage('wcs')
@@ -156 +165 @@
 
     conf.env.AddCustomPackage('rpfits')
-    if not conf.CheckLib(conf.env["rpfitslib"], language="c"):
+    if not conf.CheckLibWithHeader(conf.env["rpfitslib"], "RPFITS.h",
+                                   language="c"):
         Exit(1)
     
@@ -163 +173 @@
         pth = os.path.join(p, "include", "casacore")        
         if os.path.exists(pth):
-            libpth = os.path.join(p, "lib")
+            libpth = os.path.join(p, LIBDIR)
             conf.env.AppendUnique(CPPPATH=[pth])
             break
@@ -169 +179 @@
               "casa_coordinates", "casa_lattices", 
               "casa_fits", "casa_measures", "casa_scimath",
-              "casa_scimath_f", "casa_tables", 
-              "casa_mirlib", "casa_casa"]
+              "casa_scimath_f", "casa_tables", "casa_casa"]
     if conf.env["casacorestatic"]:
         libs = [ env.File(os.path.join(libpth, "lib"+lib+".a")) \

trunk/examples/waterfall.py

@@ -10 +10 @@
 scan = scantable("../test/data/tid-t002.rpf", average=False)
 print scan
+
 # select only one IF/Pol/Beam
-sel = selector()
-sel.set_ifs(0)
-sel.set_polarisations(0)
-sel.set_beams(0)
-scan.set_selection(sel)
+scan.set_selection(ifs=0, beams=0, pols=0)
 
 # plot in GHz
@@ -50 +47 @@
 xyplotter.ylabel("Obs. Time")
 
-#xyplotter.savefig("test.ps",orientation="landscape")
+xyplotter.savefig("test.png",orientation="landscape")

trunk/scons/utils.py

@@ -4 +4 @@
 import re
 import platform
+
+def get_libdir():
+    import distutils.sysconfig
+    return os.path.basename(distutils.sysconfig.get_config_var('LIBDIR'))
+
+LIBDIR = "lib" #get_libdir()
 
 def generate(env):
@@ -33 +39 @@
             env.Exit(1)
         env.PrependUnique(CPPPATH = [os.path.join(path, "include")])
-        env.PrependUnique(LIBPATH = [os.path.join(path, "lib")])
+        env.PrependUnique(LIBPATH = [os.path.join(path, LIBDIR)])
     env.AddCustomPath = AddCustomPath
 
@@ -46 +52 @@
         if pkgroot is not None:
             incd = os.path.join(pkgroot, "include")
-            libd = os.path.join(pkgroot, "lib")
+            libd = os.path.join(pkgroot, LIBDIR)
         else:       
             if pkgincd is not None:

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"):

trunk/setup.py

@@ -26 +26 @@
       license = 'GPL',
       install_requires = ["ipython>=0.11", "matplotlib>=0.99", "numpy>=1.3"],
-      setup_requires = [ "scons>=1.0" ],
+#      setup_requires = [ "scons>=1.0" ],
       ext_modules =[ asapso ],
       cmdclass={'build_ext': scons_ext}