Changeset 1127

Timestamp:

08/10/06 14:35:46 (18 years ago)

Author:

mar637

Message:

more fixes to casa detection

Location:

trunk

Files:

• SConstruct (modified) (3 diffs)
• scons/casa.py (modified) (2 diffs)

trunk/SConstruct

@@ -17 +17 @@
                             "The python module path (site-packages))",
                             moduledir),
+                ("casadir", "Where casa lives. Default is to autodetect", ""),
                 EnumOption("mode", "The type of build.", "debug",
                            ["release","debug"], ignorecase=1))
@@ -49 +50 @@
     if not conf.CheckLib('g2c'): Exit(1)
     if not conf.CheckLib('stdc++',language='c++'): Exit(1)
-    if not conf.CheckCasa(): Exit(1)
+    if not conf.CheckCasa(env["casadir"]): Exit(1)
     env = conf.Finish()
 
@@ -71 +72 @@
                       includes = ['*.py', '*.so'],
                       excludes = [])
-env.Alias('install', asapmod)
+asapbin = env.Install(os.path.join(distutils.sysconfig.PREFIX, "bin"),"bin/asap")
+env.Alias('install', [asapmod, asapbin])
 
 #if env['mode'] == "release":

trunk/scons/casa.py

@@ -1 +1 @@
 import os
+import sys
+import platform
 from SCons.Script import *
 
@@ -30 +32 @@
         casaarch = darwin
     elif sys.platform == 'linux2' and platform.architecture()[0] == '64bit':
-        casarch = 'linux_64b'
+        casaarch = 'linux_64b'
     paths = "/nfs/aips++/weekly /aips++ /opt/aips++ ../casa_asap".split()
-    if path is not None:
+    if path is not None and len(path):
         paths = [path]
     for p in paths:
         if os.path.isfile(os.path.join(p,casaarch,"lib/libcasa.a")):
             conf.env.Append(CASAARCH = casaarch)
-            conf.env.Append(CASAROOT = p)
+            conf.env.Append(CASAROOT = os.path.abspath(p))
             addCasaLibs(conf.env)
             conf.Result('yes')
             return True
-    conf.Result('n')
+    conf.Result('no')
     return False