/[escript]/branches/scons-dev/esysUtils/src/SConscript
ViewVC logotype

Annotation of /branches/scons-dev/esysUtils/src/SConscript

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1628 - (hide annotations)
Fri Jul 11 13:12:46 2008 UTC (11 years, 10 months ago) by phornby
Original Path: trunk/esysUtils/src/SConscript
File size: 1542 byte(s)

Merge in /branches/windows_from_1456_trunk_1620_merged_in branch.

You will find a preserved pre-merge trunk in tags under tags/trunk_at_1625.
That will be useful for diffing & checking on my stupidity.

Here is a list of the conflicts and their resolution at this
point in time.


=================================================================================
(LLWS == looks like white space).

finley/src/Assemble_addToSystemMatrix.c - resolve to branch - unused var. may be wrong.....
finley/src/CPPAdapter/SystemMatrixAdapter.cpp - resolve to branch - LLWS
finley/src/CPPAdapter/MeshAdapter.cpp - resolve to branch - LLWS
paso/src/PCG.c - resolve to branch - unused var fixes.
paso/src/SolverFCT.c - resolve to branch - LLWS
paso/src/FGMRES.c - resolve to branch - LLWS
paso/src/Common.h - resolve to trunk version. It's omp.h's include... not sure it's needed,
but for the sake of saftey.....
paso/src/Functions.c - resolve to branch version, indentation/tab removal and return error
on bad unimplemented Paso_FunctionCall.
paso/src/SolverFCT_solve.c - resolve to branch version, unused vars
paso/src/SparseMatrix_MatrixVector.c - resolve to branch version, unused vars.
escript/src/Utils.cpp - resloved to branch, needs WinSock2.h
escript/src/DataExpanded.cpp - resolved to branch version - LLWS
escript/src/DataFactory.cpp - resolve to branch version
=================================================================================

This currently passes tests on linux (debian), but is not checked on windows or Altix yet.

This checkin is to make a trunk I can check out for windows to do tests on it.

Known outstanding problem is in the operator=() method of exceptions
causing warning messages on the intel compilers.

May the God of doughnuts have mercy on my soul.


1 gross 700 import os
2 jgs 180 Import('*')
3    
4 robwdcock 682 local_env=env.Copy()
5    
6 gross 700 # get the relevant file names:
7 robwdcock 682 src_dir = local_env.Dir('.').srcnode().abspath
8 gross 700 filenames = [ x for x in os.listdir(src_dir) if os.path.splitext(x)[1] in [".h", ".c", ".cpp"] ]
9 robwdcock 682
10     sources = [x for x in filenames if os.path.splitext(x)[1] in ['.cpp', '.c']]
11     headers = [x for x in filenames if os.path.splitext(x)[1] in ['.h']]
12     # Filter out sources that should not be in the list automatically
13 jgs 180
14 robwdcock 682 lib_name = 'esysUtils'
15 jgs 180
16 phornby 1628 local_env.Append(LIBS = [boost_lib, python_lib])
17 jgs 190
18 phornby 1628
19 robwdcock 682 lib = local_env.StaticLibrary(lib_name, sources)
20 jgs 468
21 phornby 1628 # NOTE: to use this you need to edit system_dep.h
22     # to switch on the declspecs.
23     #local_env.Append(CPPDEFINES = 'ESYSUTILS_EXPORTS')
24     #lib = local_env.SharedLibrary(lib_name, sources)
25    
26 robwdcock 682 include_path = Dir(lib_name, incinstall)
27 jgs 180
28 robwdcock 682 local_env.Install(include_path, headers )
29     local_env.Install(libinstall, lib)
30 jgs 180
31 robwdcock 682 # Call the unit tests SConscript
32     # export the lib target since tests will depend on it
33     # the lib target is a list of file nodes (why? win32 produces more than one output file: .lib, .dll, .pdb)
34     # FIXME: This list handling produces the desired result but can this be done directly with scons File nodes?
35 jgs 180
36 robwdcock 682 dep_lib = [libinstall+'/'+str(x) for x in lib]
37     Export('dep_lib')
38 jgs 352
39 gross 700 local_env.SConscript(dirs = ['#/esysUtils/test'], build_dir='#/build/$PLATFORM/esysUtils/test', duplicate=0)
40 robwdcock 682
41 gross 700
42     # add source files to release
43     release_srcfiles = [ env.File(x) for x in filenames ] + [env.File("SConscript"), ]
44     env.Zip(src_zipfile, release_srcfiles)
45 ksteube 1312 env.Tar(src_tarfile, release_srcfiles)
46    

  ViewVC Help
Powered by ViewVC 1.1.26