/[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 3114 by jfenwick, Fri Aug 27 05:26:25 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 59  sources = """ Line 59  sources = """
59      ElementFile_setCoordinates.c      ElementFile_setCoordinates.c
60      ElementFile_setNodeRange.c      ElementFile_setNodeRange.c
61      ElementFile_setTags.c      ElementFile_setTags.c
62      Finley.c      Dudley.c
63      IndexList.c      IndexList.c
64      Mesh.c      Mesh.c
65      Mesh_createNodeFileMappings.c      Mesh_createNodeFileMappings.c
# Line 67  sources = """ Line 67  sources = """
67      Mesh_findMatchingFaces.c      Mesh_findMatchingFaces.c
68      Mesh_getPattern.c      Mesh_getPattern.c
69      Mesh_glueFaces.c      Mesh_glueFaces.c
     Mesh_hex20.c  
     Mesh_hex8.c  
70      Mesh_joinFaces.c      Mesh_joinFaces.c
71      Mesh_markNodes.c      Mesh_markNodes.c
72      Mesh_merge.c      Mesh_merge.c
# Line 78  sources = """ Line 76  sources = """
76      Mesh_print.c      Mesh_print.c
77      Mesh_read.c      Mesh_read.c
78      Mesh_readGmsh.c      Mesh_readGmsh.c
     Mesh_rec4.c  
     Mesh_rec8.c  
79      Mesh_relableElementNodes.c      Mesh_relableElementNodes.c
80      Mesh_resolveNodeIds.c      Mesh_resolveNodeIds.c
81      Mesh_saveDX.c      Mesh_saveDX.c
82      Mesh_saveVTK.c      Mesh_saveVTK.c
83      Mesh_setCoordinates.c      Mesh_setCoordinates.c
84      Mesh_tagmaps.c      Mesh_tagmaps.c
85        Mesh_tet4.c
86        Mesh_tri3.c
87      Mesh_write.c      Mesh_write.c
88      NodeFile.c      NodeFile.c
89      NodeFile_allocTable.c      NodeFile_allocTable.c
# Line 102  sources = """ Line 100  sources = """
100      ShapeFunctions.c      ShapeFunctions.c
101      TagMap.c      TagMap.c
102      Util.c      Util.c
103      CPPAdapter/FinleAdapterException.cpp      ReferenceElementSets.c
104      CPPAdapter/FinleyError.cpp      CPPAdapter/DudleyAdapterException.cpp
105        CPPAdapter/DudleyError.cpp
106      CPPAdapter/MeshAdapter.cpp      CPPAdapter/MeshAdapter.cpp
107      CPPAdapter/MeshAdapterFactory.cpp      CPPAdapter/MeshAdapterFactory.cpp
108      CPPAdapter/SystemMatrixAdapter.cpp      CPPAdapter/SystemMatrixAdapter.cpp
# Line 112  sources = """ Line 111  sources = """
111  headers = """  headers = """
112      Assemble.h      Assemble.h
113      ElementFile.h      ElementFile.h
114      Finley.h      Dudley.h
115      FinleyVersion.h      DudleyVersion.h
116      IndexList.h      IndexList.h
117      Mesh.h      Mesh.h
118      NodeFile.h      NodeFile.h
119      NodeMapping.h      NodeMapping.h
120      Quadrature.h      Quadrature.h
121      RectangularMesh.h      TriangularMesh.h
122      ReferenceElements.h      ReferenceElements.h
123      ShapeFunctions.h      ShapeFunctions.h
124      TagMap.h      TagMap.h
125      Util.h      Util.h
126        ReferenceElementSets.h
127      vtkCellType.h      vtkCellType.h
128  """.split()  """.split()
129  cppadapter_headers = """  cppadapter_headers = """
130      CPPAdapter/FinleyAdapterException.h      CPPAdapter/DudleyAdapterException.h
131      CPPAdapter/FinleyError.h      CPPAdapter/DudleyError.h
132      CPPAdapter/MeshAdapter.h      CPPAdapter/MeshAdapter.h
133      CPPAdapter/MeshAdapterFactory.h      CPPAdapter/MeshAdapterFactory.h
134      CPPAdapter/SystemMatrixAdapter.h      CPPAdapter/SystemMatrixAdapter.h
# Line 139  cppadapter_headers = """ Line 139  cppadapter_headers = """
139  local_env.Append(LIBS = ['escript', 'esysUtils', 'paso'] + env['sys_libs'] )  local_env.Append(LIBS = ['escript', 'esysUtils', 'paso'] + env['sys_libs'] )
140    
141  if IS_WINDOWS_PLATFORM :  if IS_WINDOWS_PLATFORM :
142    local_env.Append(CPPDEFINES = ['FINLEY_EXPORTS',    local_env.Append(CPPDEFINES = ['DUDLEY_EXPORTS'])
                                  'ESYSUTILS_STATIC_LIB'])  
143    
144  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'] )
145    
146  module_name = 'finley'  module_name = 'dudley'
147  py_wrapper_name = module_name + 'cpp'  py_wrapper_name = module_name + 'cpp'
148    
149  lib = local_env.SharedLibrary(module_name, sources)  lib = local_env.SharedLibrary(module_name, sources)
150  env.Alias('target_finley_so', lib)  env.Alias('target_dudley_so', lib)
151    
152  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')
153  env.Alias('target_finleycpp_so', py_wrapper_lib)  env.Alias('target_dudleycpp_so', py_wrapper_lib)
154    
155  include_path = Dir('finley', local_env['incinstall'])  include_path = Dir('dudley', local_env['incinstall'])
156  cppadapter_include_path = Dir('CppAdapter', include_path)  cppadapter_include_path = Dir('CppAdapter', include_path)
157    
158  tmp1 = local_env.Install(include_path, headers )  tmp1 = local_env.Install(include_path, headers )
159  tmp2 = local_env.Install(cppadapter_include_path, cppadapter_headers )  tmp2 = local_env.Install(cppadapter_include_path, cppadapter_headers )
160  env.Alias('target_install_finley_headers', [tmp1, tmp2])  env.Alias('target_install_dudley_headers', [tmp1, tmp2])
161    
162  tmp3 = local_env.Install(local_env['libinstall'], lib)  tmp3 = local_env.Install(local_env['libinstall'], lib)
163  env.Alias('target_install_finley_so', tmp3)  env.Alias('target_install_dudley_so', tmp3)
164    
165  #windows specific mod  #windows specific mod
166  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 174  share_name = os.path.join(tmp_inst,py_wr
174  tmp4 = py_wrapper_local_env.InstallAs(target=share_name,  tmp4 = py_wrapper_local_env.InstallAs(target=share_name,
175                                        source=py_wrapper_lib[0])                                        source=py_wrapper_lib[0])
176    
177  env.Alias('target_install_finleycpp_so', tmp4)  env.Alias('target_install_dudleycpp_so', tmp4)
178    
179  # export the lib target since tests will depend on it  # export the lib target since tests will depend on it
180  # 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 183  dep_lib = [local_env['libinstall']+'/'+s
183  Export('dep_lib')  Export('dep_lib')
184    
185  # Call the python sconscript  # Call the python sconscript
186  env.SConscript(dirs = ['#/finley/py_src'], build_dir='py', duplicate=0)  CallSConscript(env,dirs = ['#/dudley/py_src'], variant_dir='py', duplicate=0)
187    
188  # Call the unit tests SConscript  # Call the unit tests SConscript
189  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)
190    

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

  ViewVC Help
Powered by ViewVC 1.1.26