Changeset 1135 for trunk

Timestamp:

08/14/06 15:59:40 (18 years ago)

Author:

mar637

Message:

more work on a modular scons set up

Location:

trunk

Files:

• SConstruct (modified) (3 diffs)
• python/SConscript (modified) (1 diff)
• scons/casa.py (modified) (4 diffs)
• scons/utils.py (added)
• src/SConscript (modified) (1 diff)

trunk/SConstruct

@@ -1 +1 @@
 import os
 import sys
-import glob
 import distutils.sysconfig
 import platform
@@ -17 +16 @@
                             moduledir),
                 ("rpfitsdir", "Alternative rpfits location.", ""),
-                ("casadir", "Alternative rpfits location", ""),
+                ("casadir", "Alternative casa location", ""),
                 EnumOption("mode", "The type of build.", "debug",
-                           ["release","debug"], ignorecase=1)
+                           ["release","debug"], ignorecase=1),
+                BoolOption("staticlink",
+                           "Should extrenal libs be linked in statically",
+                           False)
                 )
 
-def SGlob(pattern):
-    path = GetBuildPath('SConscript').replace('SConscript', '')
-    return [ i.replace(path, '') for i in glob.glob(path + pattern) ]
-
-
-env = Environment( toolpath = ['./scons'], tools = ["default", "disttar", "installtree", "malte"],
-                  ENV = { 'PATH' : os.environ[ 'PATH' ],
+env = Environment( toolpath = ['./scons'],
+                   tools = ["default", "disttar", "installtree", "casa",
+                            "utils"],
+                   ENV = { 'PATH' : os.environ[ 'PATH' ],
                           'HOME' : os.environ[ 'HOME' ] },
-                  options = opts)
+                   options = opts)
 
 Help(opts.GenerateHelpText(env))
 env.SConsignFile()
-#env.Append(CASAARCH = '')
-#env.Append(CASAROOT = '')
+env.Append(CASAARCH = '', CASAROOT = '')
 
 if not env.GetOption('clean'):
     conf = Configure(env)
     # import Custom tests
-    env.AddCustomTests(conf)
+    env.AddCasaTest(conf)
     pylib = 'python'+distutils.sysconfig.get_python_version()
     pyinc = "Python.h"
@@ -63 +61 @@
     env = conf.Finish()
 
-env["dist_dir"] = "#/dist/asap"
+env["stage_dir"] = Dir("#/stage/asap")
+
 # general CPPFLAGS
-env.Append(CPPFLAGS='-O3 -Wno-long-long'.split())
+env.Append(CPPFLAGS=['-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE_SOURCE', '-O3'])
 # 64bit flags
 if  platform.architecture()[0] == '64bit':
-    env.Append(CPPFLAGS='-fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__x86_64__ -DAIPS_64B'.split())
+    env.Append(CPPFLAGS=['-fPIC', '-D__x86_64__', '-DAIPS_64B'])
     # hack to install into /usr/lib64 if scons is in the 32bit /usr/lib/
     if moduledir.startswith("/usr/lib/"):
         moduledir.replace("lib","lib64")
-if sys.platform == "darwin":
-    env['SHLINKFLAGS'] = '$LINKFLAGS -dynamiclib -single_module'
-    env['SHLIBSUFFIX'] = '.dylib'
+if env["PLATFORM"] == "darwin":
+    env['SHLINKFLAGS'] = '$LINKFLAGS -bundle'
+    #env['SHLIBSUFFIX'] = '.dylib'
 
 if env['mode'] == 'release':
     env.Append(LINKFLAGS=['-Wl,-O1'])
-Export("env","SGlob")
+Export("env")
 
 so = env.SConscript("src/SConscript", build_dir="build", duplicate=0)
-env.Install(env["dist_dir"], so )
+env.Install(env["stage_dir"], so )
 
 pys = env.SConscript("python/SConscript")
 asapmod = env.InstallTree(dest_dir = os.path.join(env["moduledir"], "asap"),
-                      src_dir  = "dist/asap",
-                      includes = ['*.py', '*.so'],
-                      excludes = [])
+                          src_dir  = "stage/asap",
+                          includes = ['*.py', '*.so'],
+                          excludes = [])
 asapbin = env.Install(os.path.join(env["prefix"], "bin"), "bin/asap")
 env.Alias('install', [asapmod, asapbin])
-
-#if env['mode'] == "release":
-#    env.DistTar("dist/asap", ["README", "INSTALL", Dir(env["dist_dir"])])

trunk/python/SConscript

@@ -2 +2 @@
 
 # import root environment
-Import( "env", "SGlob" )
+Import( "env")
 myenv = env.Copy()
 
 # gather python files
-pys = SGlob("*.py")
+pys = myenv.SGlob("*.py")
 pymods = []
 for p in pys:
-    myenv.Install(myenv["dist_dir"],p)
+    myenv.Install(myenv["stage_dir"],p)
 

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):

trunk/src/SConscript

@@ -2 +2 @@
 
 # import root environment
-Import( "env", "SGlob" )
+Import( "env")
 myenv = env.Copy()
 
 # gather cpp files
-cpps = SGlob("*.cpp")
-pycpps = SGlob("python_*.cpp")
+cpps = env.SGlob("*.cpp")
+pycpps = env.SGlob("python_*.cpp")
 for pf in pycpps: cpps.remove(pf)