Changeset 1105 for trunk

Timestamp:

08/03/06 10:21:54 (18 years ago)

Author:

mar637

Message:

more clever use of python...

Location:

trunk

Files:

• SConstruct (modified) (4 diffs)
• src/SConscript (modified) (1 diff)

trunk/SConstruct

@@ -1 @@
-import os,sys
+import os, sys, glob
 import distutils.sysconfig
 import platform
 
 #vars = distutils.sysconfig.get_config_vars()
-moduledir = "/tmp/dummy"#distutils.sysconfig.get_python_lib()
+moduledir = "/opt/lib/python2/"#distutils.sysconfig.get_python_lib()
 
 opts = Options("userconfig.py", ARGUMENTS)
 opts.Add("prefix", "The root installation path", distutils.sysconfig.PREFIX)
 opts.Add("moduledir", "The python module path (site-packages))", moduledir)
+
+def SGlob(pattern):
+    path = GetBuildPath('SConscript').replace('SConscript', '')
+    return [ i.replace(path, '') for i in glob.glob(path + pattern) ]
+
 
 def addCasaLibs(env):
@@ -15 +20 @@
                 tables scimath scimath_f casa wcs".split()
     env.Prepend( LIBS =  casalibs )
+    casaincd = [os.path.join(env['CASAROOT'], 'code/include'), \
+                os.path.join(env['CASAROOT'], 'code/casa')]
+    env.Append( CPPPATH = casaincd )
+    casalibd = os.path.join(env['CASAROOT'], env['CASAARCH'], 'lib')
+    env.Append( LIBPATH = [ casalibd ] )
     # Explicit templates in casa
     env.Append( CPPFLAGS = ['-DAIPS_NO_TEMPLATE_SRC'] )
@@ -62 +72 @@
     if not conf.CheckLib('rpfits'): Exit(1)
     if not conf.CheckLib('cfitsio'): Exit(1)
-    if not conf.CheckLib('g2c'): Exit(1)
     if not conf.CheckLib('lapack'): Exit(1)
     if not conf.CheckLib('blas'): Exit(1)
+    if not conf.CheckLib('g2c'): Exit(1)
     if not conf.CheckLib('stdc++',language='c++'): Exit(1)
     if not conf.CheckCasa(): Exit(1)
@@ -74 +84 @@
     env.Append(CPPFLAGS='-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__x86_64__ -DAIPS_64B'.split())
 
-Export("env")
+Export("env","SGlob")
 so = env.SConscript("src/SConscript", build_dir="build", duplicate=0)
 env.Install(moduledir, so )
-env.Install(moduledir, ["python/__init__.py"] )
-env.Alias('install',moduledir)
+#pys = env.SConscript("python/SConscript")
+# env.Install(moduledir, pys)
+env.Alias('install', moduledir)

trunk/src/SConscript

@@ -2 +2 @@
 
 # import root environment
-Import( "env" )
+Import( "env", "SGlob" )
 myenv = env.Copy()
 
-# casa includes
-casaincd = [os.path.join(myenv['CASAROOT'], 'code/include'), \
-            os.path.join(myenv['CASAROOT'], 'code/casa')]
 
-myenv.Append( CPPPATH = casaincd )
-
-# libaries and objects
-# myabe use glob here
-# ASAP
-cpps = """
-Logger.cpp
-MathUtils.cpp
-MathUtils2.cpp
-RowAccumulator.cpp
-STAsciiWriter.cpp
-STAttr.cpp
-STFiller.cpp
-STFit.cpp
-STFitEntry.cpp
-STFitter.cpp
-STFocus.cpp
-STFrequencies.cpp
-STHeader.cpp
-STHistory.cpp
-STLineFinder.cpp
-STMath.cpp
-STMolecules.cpp
-STPol.cpp
-STPolLinear.cpp
-STPolStokes.cpp
-STSelector.cpp
-STSubTable.cpp
-STTcal.cpp
-STWeather.cpp
-STWriter.cpp
-Scantable.cpp
-Templates.cpp
-""".split()
-
-pycpps = """
-python_Fitter.cpp
-python_Logger.cpp
-python_STFiller.cpp
-python_STFitEntry.cpp
-python_STLineFinder.cpp
-python_STMath.cpp
-python_STSelector.cpp
-python_STWriter.cpp
-python_Scantable.cpp
-python_asap.cpp
-""".split()
-
-
-# OTHER
-#genlibs = """
-#g2c stdc++ lapack blas
-#""".split()
-
-#myenv.Append( LIBS =  ['cfitsio_lfs'] )
-#myenv.Append( LIBS =  genlibs )
-
+cpps = SGlob("*.cpp")
+pycpps = SGlob("python_*.cpp")
+for pf in pycpps: cpps.remove(pf)
+print cpps
 
 casalibd = os.path.join(myenv['CASAROOT'],myenv['CASAARCH'],'lib')
+
 # location of libcasav.a
-myenv.Append( LIBPATH = ['#/build', casalibd] )
+myenv.Prepend( LIBPATH = ['#/build'] )
 myenv.Install('#build', os.path.join(casalibd, 'libwcs.a'))
 myenv['SHLIBPREFIX']=""   #gets rid of lib prefix