Changeset 1757 for branches/alma/SConstruct

Timestamp:

06/09/10 19:03:06 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• SConstruct (modified) (13 diffs)

branches/alma/SConstruct

@@ -6 +6 @@
 
 moduledir = distutils.sysconfig.get_python_lib()
-if  platform.architecture()[0] == '64bit':
+
+if sys.platform.startswith('linux') and platform.architecture()[0] == '64bit':
     # hack to install into /usr/lib64 if scons is in the 32bit /usr/lib/
     if moduledir.startswith("/usr/lib/"):
         moduledir = moduledir.replace("lib", "lib64")
 
-opts = Options("options.cfg")
-opts.AddOptions(
+EnsureSConsVersion(1,1,0)
+
+opts = Variables("options.cfg")
+opts.AddVariables(
                 ("FORTRAN", "The fortran compiler", None),
                 ("f2clib", "The fortran to c library", None),
-                PathOption("prefix",
+                PathVariable("prefix",
                 "The root installation path",
                            distutils.sysconfig.PREFIX),
-                PathOption("moduledir",
+                PathVariable("moduledir",
                             "The python module path (site-packages))",
                             moduledir),
-                PathOption("casacoreroot", "The location of casacore",
-                                    "/usr/local"),
+                PathVariable("casacoreroot", "The location of casacore",
+                             "/usr/local"),
                 ("boostroot", "The root dir where boost is installed", None),
                 ("boostlib", "The name of the boost python library", 
@@ -45 +48 @@
                 ("cfitsiolib", "The cfitsio library name", "cfitsio"),
                 ("cfitsioincdir", "The cfitsio include location", None),
+                ("wcslib", "The wcs library name", "wcs"),
                 ("wcsroot", 
                  "The root directory where wcs is installed", None),
@@ -52 +56 @@
                  "The root directory where rpfits is installed", None),
                 ("rpfitslibdir", "The rpfits library location", None),
-#               ("rpfitsincdir", "The rpfits include location", None),
-                EnumOption("mode", "The type of build.", "debug",
+                ("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", 
+                             False),
+
+                EnumVariable("mode", "The type of build.", "release",
                            ["release","debug"], ignorecase=1),
                 ("makedist",
                  "Make a binary archive giving a suffix, e.g. sarge or fc5",
                  ""),
-                EnumOption("makedoc", "Build the userguide in specified format",
+                EnumVariable("makedoc", "Build the userguide in specified format",
                            "none",
-                           ["none", "pdf", "html"], ignorecase=1)
+                           ["none", "pdf", "html"], ignorecase=1),
+                BoolVariable("apps", "Build cpp apps", True),
+                BoolVariable("alma", "Enable alma specific functionality", 
+                             False),
                 )
 
@@ -73 +89 @@
 env.SConsignFile()
 
-if env["PLATFORM"] == "darwin":
-    env.EnsureSConsVersion(0,96,95)
-
 casacoretooldir = os.path.join(env["casacoreroot"],"share",
                                    "casacore")
@@ -83 +96 @@
 
 # load casacore specific build flags
+env.Tool('casaoptions', [casacoretooldir])
+opts.Update(env)
 env.Tool('casa', [casacoretooldir])
 
@@ -93 +108 @@
                                                "include", "casacore"))
     if not conf.CheckLib("casa_casa", language='c++'): Exit(1)
-    conf.env.PrependUnique(LIBS=["casa_ms", "casa_components", 
+    conf.env.PrependUnique(LIBS=["casa_images", "casa_ms", "casa_components", 
                                  "casa_coordinates", "casa_lattices", 
                                  "casa_fits", "casa_measures", "casa_scimath",
@@ -108 +123 @@
 
     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)
@@ -118 +141 @@
         Exit(1)
     conf.env.AddCustomPackage('wcs')
-    if not conf.CheckLibWithHeader('wcs', 'wcslib/wcs.h', language='c'):
+    if not conf.CheckLibWithHeader(conf.env["wcslib"], 
+                                   'wcslib/wcs.h', language='c'):
         Exit(1)
     conf.env.AddCustomPackage('rpfits')
@@ -125 +149 @@
 
     # test for blas/lapack
+    lapackname = conf.env.get("lapacklib", "lapack")
     conf.env.AddCustomPackage("lapack")
-    if not conf.CheckLib(conf.env["lapacklib"]): Exit(1)
+    if not conf.CheckLib(lapackname): Exit(1)
     blasname = conf.env.get("blaslib", "blas")
     conf.env.AddCustomPackage("blas")
-    if not conf.CheckLib(conf.env["blaslib"]): Exit(1)
+    if not conf.CheckLib(blasname): Exit(1)
     conf.env.CheckFortran(conf)
     if not conf.CheckLib('stdc++', language='c++'): Exit(1)
+    if conf.env["alma"]:
+        conf.env.Append(CPPFLAGS=['-DUSE_ALMA'])
     env = conf.Finish()
 
-env["version"] = "2.2.x"
+env["version"] = "3.0.0"
 
 if env['mode'] == 'release':
@@ -141 +168 @@
     env.Append(CCFLAGS=["-O2"])
 else:
-    env.Append(CCFLAGS=["-g"])
+    env.Append(CCFLAGS=["-g", "-Wall"])
 
 # Export for SConscript files
@@ -165 +192 @@
 
 # install targets
-somod = env.Install("$moduledir/asap", so )
-pymods = env.Install("$moduledir/asap", env.SGlob("python/*.py"))
-bins = env.Install("$prefix/bin", ["bin/asap", "bin/asap_update_data"])
-shares = env.Install("$moduledir/asap/data", "share/ipythonrc-asap")
-env.Alias('install', [somod, pymods, bins, shares])
+installs = []
+installs.append(env.Install("$moduledir/asap", so))
+installs.append(env.Install("$moduledir/asap", env.SGlob("python/*.py")))
+installs.append(env.Install("$prefix/bin", 
+                            ["bin/asap", "bin/asap_update_data"]))
+installs.append(env.Install("$moduledir/asap/data", "share/ipythonrc-asap"))
+installs.append(env.Install("$moduledir/asap/data", "share/ipy_user_conf.py"))
+env.Alias('install', installs)
 
 # install aips++ data repos
-rootdir=None
+rootdir = None
 outdir =  os.path.join(env["moduledir"],'asap','data')
 sources = ['ephemerides','geodetic']
@@ -193 +223 @@
     env.QInstall("$stagedir", ["bin/install"])
     env.QInstall("$stagedir/asap/data", "share/ipythonrc-asap")
+    env.QInstall("$stagedir/asap/data", "share/ipy_user_conf.py")
     if rootdir is not None:
         # This creates a directory Using data table... - disabled
@@ -209 +240 @@
     env.SConscript("doc/SConscript")
 
+if env["apps"]:
+    env.SConscript("apps/SConscript")
+
 if env.GetOption("clean"):
     Execute(Delete(".sconf_temp"))