Changeset 1135 for trunk/scons

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:

• casa.py (modified) (4 diffs)
• utils.py (added)

trunk/scons/casa.py

@@ -1 +1 @@
 import os
 import re
+import sys
+import platform
 
 def generate(env):
@@ -15 +17 @@
                         lattices fits measures measures_f \
                         tables scimath scimath_f casa wcs".split()
-            #env.Prepend( LIBS =  casalibs )
+            env.Prepend( LIBS =  casalibs )
             casaincd = [os.path.join(env['CASAROOT'], 'code/include'), \
                         os.path.join(env['CASAROOT'], 'code/casa')]
@@ -33 +35 @@
             return True
         casaarch = 'linux_gnu'
-        if sys.platform == 'darwin':
+        if context.env["PLATFORM"] == 'darwin':
             casaarch = 'darwin'
         elif sys.platform == 'linux2' and platform.architecture()[0] == '64bit':
@@ -52 +54 @@
 
 
-    def AddCustomTests(conf):
-        conf.AddTests({
-                        'CheckCasa'            : CheckCasa,
-                      })
+    def AddCasaTest(conf):
+        conf.AddTests({'CheckCasa': CheckCasa})
 
-    env.AddCustomTests = AddCustomTests
-
-    def AddCustomPath(path=""):
-        if not len(path) or not os.path.exists(path):
-            return
-        env.PrependUnique(CPPPATH = [os.path.join(path, "include")])
-        env.PrependUnique(LIBPATH = [os.path.join(path, "lib")])
-    env.AddCustomPath = AddCustomPath
+    env.AddCasaTest = AddCasaTest
 
 def exists(env):