/[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

revision 1840 by phornby, Fri Oct 3 03:16:11 2008 UTC revision 2031 by phornby, Wed Nov 12 08:02:33 2008 UTC
# Line 1  Line 1 
1    
2    
3  ########################################################  ########################################################
4  #  #
5  # Copyright (c) 2003-2008 by University of Queensland  # Copyright (c) 2003-2008 by University of Queensland
# Line 136  cppadapter_headers = """ Line 137  cppadapter_headers = """
137  """.split()  """.split()
138    
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 :
142      local_env.Append(CPPDEFINES = ['FINLEY_EXPORTS',
143                                     'ESYSUTILS_STATIC_LIB'])
144    
145  py_wrapper_local_env.Append(LIBS = ['finley', 'escript', 'esysUtils', 'paso'] + env['sys_libs'] )  py_wrapper_local_env.Append(LIBS = ['finley', 'escript', 'esysUtils', 'paso'] + env['sys_libs'] )
146    
147  py_wrapper_name = 'finley'  module_name = 'finley'
148    py_wrapper_name = module_name + 'cpp'
149    
150  lib = local_env.SharedLibrary(py_wrapper_name, sources)  lib = local_env.SharedLibrary(module_name, sources)
151  env.Alias('target_finley_so', lib)  env.Alias('target_finley_so', lib)
152    
153  py_wrapper_lib = py_wrapper_local_env.SharedLibrary('finleycpp', 'CPPAdapter/finleycpp.cpp')  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'CPPAdapter/finleycpp.cpp')
154  env.Alias('target_finleycpp_so', py_wrapper_lib)  env.Alias('target_finleycpp_so', py_wrapper_lib)
155    
156  include_path = Dir('finley', local_env['incinstall'])  include_path = Dir('finley', local_env['incinstall'])
# Line 157  tmp3 = local_env.Install(local_env['libi Line 164  tmp3 = local_env.Install(local_env['libi
164  env.Alias('target_install_finley_so', tmp3)  env.Alias('target_install_finley_so', tmp3)
165    
166  #windows specific mod  #windows specific mod
167  tmp_inst = os.path.join(local_env['pyinstall'],py_wrapper_name)  tmp_inst = os.path.join(local_env['pyinstall'],module_name)
168  if os.name == 'nt':  if os.name == 'nt':
169    wrapper_postfix = '.pyd'    wrapper_postfix = '.pyd'
   source_lib = py_wrapper_lib[0]  
170  else:  else:
171    wrapper_postfix = '.so'    wrapper_postfix = '.so'
   source_lib = py_wrapper_lib  
172    
173  share_name = os.path.join(tmp_inst,py_wrapper_name+wrapper_postfix)  share_name = os.path.join(tmp_inst,py_wrapper_name+wrapper_postfix)
174    
175  tmp4 = py_wrapper_local_env.InstallAs(target=share_name, source=source_lib)  tmp4 = py_wrapper_local_env.InstallAs(target=share_name,
176                                          source=py_wrapper_lib[0])
177    
178  env.Alias('target_install_finleycpp_so', tmp4)  env.Alias('target_install_finleycpp_so', tmp4)
179    

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

  ViewVC Help
Powered by ViewVC 1.1.26