/[escript]/trunk/finley/src/SConscript
ViewVC logotype

Diff of /trunk/finley/src/SConscript

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

revision 1845 by gross, Fri Oct 3 05:23:47 2008 UTC revision 1847 by phornby, Fri Oct 3 06:45:34 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 138  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  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'] )
141    
142  lib = local_env.SharedLibrary('finley', sources)  module_name = 'finley'
143    py_wrapper_name = module_name + 'cpp'
144    
145    lib = local_env.SharedLibrary(module_name, sources)
146  env.Alias('target_finley_so', lib)  env.Alias('target_finley_so', lib)
147    
148  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')
149  env.Alias('target_finleycpp_so', py_wrapper_lib)  env.Alias('target_finleycpp_so', py_wrapper_lib)
150    
151  include_path = Dir('finley', local_env['incinstall'])  include_path = Dir('finley', local_env['incinstall'])
# Line 155  tmp3 = local_env.Install(local_env['libi Line 159  tmp3 = local_env.Install(local_env['libi
159  env.Alias('target_install_finley_so', tmp3)  env.Alias('target_install_finley_so', tmp3)
160    
161  #windows specific mod  #windows specific mod
162  tmp_inst = os.path.join(local_env['pyinstall'],'finley')  tmp_inst = os.path.join(local_env['pyinstall'],module_name)
163  if os.name == 'nt':  if os.name == 'nt':
164    wrapper_postfix = '.pyd'    wrapper_postfix = '.pyd'
   source_lib = py_wrapper_lib[0]  
165  else:  else:
166    wrapper_postfix = '.so'    wrapper_postfix = '.so'
   source_lib = py_wrapper_lib  
167    
168  share_name = os.path.join(tmp_inst,'finleycpp'+wrapper_postfix)  share_name = os.path.join(tmp_inst,py_wrapper_name+wrapper_postfix)
169    
170  tmp4 = py_wrapper_local_env.InstallAs(target=share_name, source=source_lib)  tmp4 = py_wrapper_local_env.InstallAs(target=share_name,
171                                          source=py_wrapper_lib[0])
172    
173  env.Alias('target_install_finleycpp_so', tmp4)  env.Alias('target_install_finleycpp_so', tmp4)
174    

Legend:
Removed from v.1845  
changed lines
  Added in v.1847

  ViewVC Help
Powered by ViewVC 1.1.26