Changeset 1105 for trunk/src

Timestamp:

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

Author:

mar637

Message:

more clever use of python...

File:

• trunk/src/SConscript (modified) (1 diff)

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