Changeset 1135 for trunk/scons


Ignore:
Timestamp:
08/14/06 15:59:40 (18 years ago)
Author:
mar637
Message:

more work on a modular scons set up

Location:
trunk/scons
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/scons/casa.py

    r1129 r1135  
    11import os
    22import re
     3import sys
     4import platform
    35
    46def generate(env):
    … …  
    1517                        lattices fits measures measures_f \
    1618                        tables scimath scimath_f casa wcs".split()
    17             #env.Prepend( LIBS =  casalibs )
     19            env.Prepend( LIBS =  casalibs )
    1820            casaincd = [os.path.join(env['CASAROOT'], 'code/include'), \
    1921                        os.path.join(env['CASAROOT'], 'code/casa')]
    … …  
    3335            return True
    3436        casaarch = 'linux_gnu'
    35         if sys.platform == 'darwin':
     37        if context.env["PLATFORM"] == 'darwin':
    3638            casaarch = 'darwin'
    3739        elif sys.platform == 'linux2' and platform.architecture()[0] == '64bit':
    … …  
    5254
    5355
    54     def AddCustomTests(conf):
    55         conf.AddTests({
    56                         'CheckCasa'            : CheckCasa,
    57                       })
     56    def AddCasaTest(conf):
     57        conf.AddTests({'CheckCasa': CheckCasa})
    5858
    59     env.AddCustomTests = AddCustomTests
    60 
    61     def AddCustomPath(path=""):
    62         if not len(path) or not os.path.exists(path):
    63             return
    64         env.PrependUnique(CPPPATH = [os.path.join(path, "include")])
    65         env.PrependUnique(LIBPATH = [os.path.join(path, "lib")])
    66     env.AddCustomPath = AddCustomPath
     59    env.AddCasaTest = AddCasaTest
    6760
    6861def exists(env):
Note: See TracChangeset for help on using the changeset viewer.