/[escript]/branches/domexper/dudley/src/SConscript
ViewVC logotype

Diff of /branches/domexper/dudley/src/SConscript

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

trunk/finley/src/SConscript revision 2031 by phornby, Wed Nov 12 08:02:33 2008 UTC branches/domexper/dudley/src/SConscript revision 3184 by jfenwick, Wed Sep 15 00:23:42 2010 UTC
# Line 2  Line 2 
2    
3  ########################################################  ########################################################
4  #  #
5  # Copyright (c) 2003-2008 by University of Queensland  # Copyright (c) 2003-2010 by University of Queensland
6  # Earth Systems Science Computational Center (ESSCC)  # Earth Systems Science Computational Center (ESSCC)
7  # http://www.uq.edu.au/esscc  # http://www.uq.edu.au/esscc
8  #  #
# Line 29  sources = """ Line 29  sources = """
29      Assemble_LumpedSystem.c      Assemble_LumpedSystem.c
30      Assemble_NodeCoordinates.c      Assemble_NodeCoordinates.c
31      Assemble_PDE.c      Assemble_PDE.c
     Assemble_PDE_Single2_1D.c  
32      Assemble_PDE_Single2_2D.c      Assemble_PDE_Single2_2D.c
33      Assemble_PDE_Single2_3D.c      Assemble_PDE_Single2_3D.c
     Assemble_PDE_Single2_C.c  
     Assemble_PDE_System2_1D.c  
34      Assemble_PDE_System2_2D.c      Assemble_PDE_System2_2D.c
35      Assemble_PDE_System2_3D.c      Assemble_PDE_System2_3D.c
     Assemble_PDE_System2_C.c  
36      Assemble_addToSystemMatrix.c      Assemble_addToSystemMatrix.c
37      Assemble_getAssembleParameters.c      Assemble_getAssembleParameters.c
38      Assemble_getSize.c      Assemble_getSize.c
# Line 59  sources = """ Line 55  sources = """
55      ElementFile_setCoordinates.c      ElementFile_setCoordinates.c
56      ElementFile_setNodeRange.c      ElementFile_setNodeRange.c
57      ElementFile_setTags.c      ElementFile_setTags.c
58      Finley.c      Dudley.c
59      IndexList.c      IndexList.c
60      Mesh.c      Mesh.c
61      Mesh_createNodeFileMappings.c      Mesh_createNodeFileMappings.c
# Line 67  sources = """ Line 63  sources = """
63      Mesh_findMatchingFaces.c      Mesh_findMatchingFaces.c
64      Mesh_getPattern.c      Mesh_getPattern.c
65      Mesh_glueFaces.c      Mesh_glueFaces.c
     Mesh_hex20.c  
     Mesh_hex8.c  
66      Mesh_joinFaces.c      Mesh_joinFaces.c
67      Mesh_markNodes.c      Mesh_markNodes.c
68      Mesh_merge.c      Mesh_merge.c
# Line 78  sources = """ Line 72  sources = """
72      Mesh_print.c      Mesh_print.c
73      Mesh_read.c      Mesh_read.c
74      Mesh_readGmsh.c      Mesh_readGmsh.c
     Mesh_rec4.c  
     Mesh_rec8.c  
75      Mesh_relableElementNodes.c      Mesh_relableElementNodes.c
76      Mesh_resolveNodeIds.c      Mesh_resolveNodeIds.c
77      Mesh_saveDX.c      Mesh_saveDX.c
78      Mesh_saveVTK.c      Mesh_saveVTK.c
79      Mesh_setCoordinates.c      Mesh_setCoordinates.c
80      Mesh_tagmaps.c      Mesh_tagmaps.c
81        Mesh_tet4.c
82        Mesh_tri3.c
83      Mesh_write.c      Mesh_write.c
84      NodeFile.c      NodeFile.c
85      NodeFile_allocTable.c      NodeFile_allocTable.c
# Line 102  sources = """ Line 96  sources = """
96      ShapeFunctions.c      ShapeFunctions.c
97      TagMap.c      TagMap.c
98      Util.c      Util.c
99      CPPAdapter/FinleAdapterException.cpp      ReferenceElementSets.c
100      CPPAdapter/FinleyError.cpp      CPPAdapter/DudleyAdapterException.cpp
101        CPPAdapter/DudleyError.cpp
102      CPPAdapter/MeshAdapter.cpp      CPPAdapter/MeshAdapter.cpp
103      CPPAdapter/MeshAdapterFactory.cpp      CPPAdapter/MeshAdapterFactory.cpp
104      CPPAdapter/SystemMatrixAdapter.cpp      CPPAdapter/SystemMatrixAdapter.cpp
# Line 112  sources = """ Line 107  sources = """
107  headers = """  headers = """
108      Assemble.h      Assemble.h
109      ElementFile.h      ElementFile.h
110      Finley.h      Dudley.h
111      FinleyVersion.h      DudleyVersion.h
112      IndexList.h      IndexList.h
113      Mesh.h      Mesh.h
114      NodeFile.h      NodeFile.h
115      NodeMapping.h      NodeMapping.h
116      Quadrature.h      Quadrature.h
117      RectangularMesh.h      TriangularMesh.h
118      ReferenceElements.h      ReferenceElements.h
119      ShapeFunctions.h      ShapeFunctions.h
120        ShapeTable.h
121      TagMap.h      TagMap.h
122      Util.h      Util.h
123        ReferenceElementSets.h
124      vtkCellType.h      vtkCellType.h
125  """.split()  """.split()
126  cppadapter_headers = """  cppadapter_headers = """
127      CPPAdapter/FinleyAdapterException.h      CPPAdapter/DudleyAdapterException.h
128      CPPAdapter/FinleyError.h      CPPAdapter/DudleyError.h
129      CPPAdapter/MeshAdapter.h      CPPAdapter/MeshAdapter.h
130      CPPAdapter/MeshAdapterFactory.h      CPPAdapter/MeshAdapterFactory.h
131      CPPAdapter/SystemMatrixAdapter.h      CPPAdapter/SystemMatrixAdapter.h
# Line 139  cppadapter_headers = """ Line 136  cppadapter_headers = """
136  local_env.Append(LIBS = ['escript', 'esysUtils', 'paso'] + env['sys_libs'] )  local_env.Append(LIBS = ['escript', 'esysUtils', 'paso'] + env['sys_libs'] )
137    
138  if IS_WINDOWS_PLATFORM :  if IS_WINDOWS_PLATFORM :
139    local_env.Append(CPPDEFINES = ['FINLEY_EXPORTS',    local_env.Append(CPPDEFINES = ['DUDLEY_EXPORTS'])
                                  'ESYSUTILS_STATIC_LIB'])  
140    
141  py_wrapper_local_env.Append(LIBS = ['finley', 'escript', 'esysUtils', 'paso'] + env['sys_libs'] )  py_wrapper_local_env.Append(LIBS = ['dudley', 'escript', 'esysUtils', 'paso'] + env['sys_libs'] )
142    
143  module_name = 'finley'  module_name = 'dudley'
144  py_wrapper_name = module_name + 'cpp'  py_wrapper_name = module_name + 'cpp'
145    
146  lib = local_env.SharedLibrary(module_name, sources)  lib = local_env.SharedLibrary(module_name, sources)
147  env.Alias('target_finley_so', lib)  env.Alias('target_dudley_so', lib)
148    
149  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'CPPAdapter/finleycpp.cpp')  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'CPPAdapter/dudleycpp.cpp')
150  env.Alias('target_finleycpp_so', py_wrapper_lib)  env.Alias('target_dudleycpp_so', py_wrapper_lib)
151    
152  include_path = Dir('finley', local_env['incinstall'])  include_path = Dir('dudley', local_env['incinstall'])
153  cppadapter_include_path = Dir('CppAdapter', include_path)  cppadapter_include_path = Dir('CppAdapter', include_path)
154    
155  tmp1 = local_env.Install(include_path, headers )  tmp1 = local_env.Install(include_path, headers )
156  tmp2 = local_env.Install(cppadapter_include_path, cppadapter_headers )  tmp2 = local_env.Install(cppadapter_include_path, cppadapter_headers )
157  env.Alias('target_install_finley_headers', [tmp1, tmp2])  env.Alias('target_install_dudley_headers', [tmp1, tmp2])
158    
159  tmp3 = local_env.Install(local_env['libinstall'], lib)  tmp3 = local_env.Install(local_env['libinstall'], lib)
160  env.Alias('target_install_finley_so', tmp3)  env.Alias('target_install_dudley_so', tmp3)
161    
162  #windows specific mod  #windows specific mod
163  tmp_inst = os.path.join(local_env['pyinstall'],module_name)  tmp_inst = os.path.join(local_env['pyinstall'],module_name)
# Line 175  share_name = os.path.join(tmp_inst,py_wr Line 171  share_name = os.path.join(tmp_inst,py_wr
171  tmp4 = py_wrapper_local_env.InstallAs(target=share_name,  tmp4 = py_wrapper_local_env.InstallAs(target=share_name,
172                                        source=py_wrapper_lib[0])                                        source=py_wrapper_lib[0])
173    
174  env.Alias('target_install_finleycpp_so', tmp4)  env.Alias('target_install_dudleycpp_so', tmp4)
175    
176  # export the lib target since tests will depend on it  # export the lib target since tests will depend on it
177  # the lib target is a list of file nodes (why? win32 produces more than one output file: .lib, .dll, .pdb)  # the lib target is a list of file nodes (why? win32 produces more than one output file: .lib, .dll, .pdb)
# Line 184  dep_lib = [local_env['libinstall']+'/'+s Line 180  dep_lib = [local_env['libinstall']+'/'+s
180  Export('dep_lib')  Export('dep_lib')
181    
182  # Call the python sconscript  # Call the python sconscript
183  env.SConscript(dirs = ['#/finley/py_src'], build_dir='py', duplicate=0)  CallSConscript(env,dirs = ['#/dudley/py_src'], variant_dir='py', duplicate=0)
184    
185  # Call the unit tests SConscript  # Call the unit tests SConscript
186  local_env.SConscript(dirs = ['#/finley/test'], build_dir='#/build/$PLATFORM/finley/test', duplicate=0)  CallSConscript(local_env,dirs = ['#/dudley/test'], variant_dir='#/build/$PLATFORM/dudley/test', duplicate=0)
187    

Legend:
Removed from v.2031  
changed lines
  Added in v.3184

  ViewVC Help
Powered by ViewVC 1.1.26