Changeset 1128 for trunk

Timestamp:

08/10/06 15:09:20 (18 years ago)

Author:

mar637

Message:

more fixes to 64bit install

Location:

trunk

Files:

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

trunk/SConstruct

@@ -59 +59 @@
 if  platform.architecture()[0] == '64bit':
     env.Append(CPPFLAGS='-fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__x86_64__ -DAIPS_64B'.split())
+    # hack to install into /usr/lib64 if scons isn't installed there
+    if moduledir.startswith("/usr/lib/"):
+        moduledir.replace("lib","lib64")
 if env['mode'] == 'release':
     env.Append(LINKFLAGS=['-Wl,-O1'])
@@ -69 +72 @@
 asapmod = InstallTree(env,
                       dest_dir = os.path.join(moduledir, "asap"),
-                      src_dir  = env["dist_dir"],
+                      src_dir  = "dist/asap",
                       includes = ['*.py', '*.so'],
                       excludes = [])

trunk/scons/casa.py

@@ +1 @@
+__revision__ = "$Version:$"
 import os
 import sys
@@ -4 +5 @@
 from SCons.Script import *
 
-def addCasaLibs(env):
+def addCasa(env):
     casalibs = "casav atnf images ms components coordinates \
                 lattices fits measures measures_f \
@@ -25 +26 @@
         conf.env.Append(CASAARCH = casa[1])
         conf.env.Append(CASAROOT = casa[0])
-        addCasaLibs(conf.env)
+        addCasa(conf.env)
         conf.Result('yes')
         return True
     casaarch = 'linux_gnu'
     if sys.platform == 'darwin':
-        casaarch = darwin
+        casaarch = 'darwin'
     elif sys.platform == 'linux2' and platform.architecture()[0] == '64bit':
         casaarch = 'linux_64b'
@@ -37 +38 @@
         paths = [path]
     for p in paths:
-        if os.path.isfile(os.path.join(p,casaarch,"lib/libcasa.a")):
+        if os.path.isfile(os.path.join(p, casaarch, "lib/libcasa.a")):
             conf.env.Append(CASAARCH = casaarch)
             conf.env.Append(CASAROOT = os.path.abspath(p))
-            addCasaLibs(conf.env)
+            addCasa(conf.env)
             conf.Result('yes')
             return True