/[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 1840 by phornby, Fri Oct 3 03:16:11 2008 UTC revision 1845 by gross, Fri Oct 3 05:23:47 2008 UTC
# Line 138  cppadapter_headers = """ Line 138  cppadapter_headers = """
138  local_env.Append(LIBS = ['escript', 'esysUtils', 'paso'] + env['sys_libs'] )  local_env.Append(LIBS = ['escript', 'esysUtils', 'paso'] + env['sys_libs'] )
139  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'] )
140    
141  py_wrapper_name = 'finley'  lib = local_env.SharedLibrary('finley', sources)
   
 lib = local_env.SharedLibrary(py_wrapper_name, sources)  
142  env.Alias('target_finley_so', lib)  env.Alias('target_finley_so', lib)
143    
144  py_wrapper_lib = py_wrapper_local_env.SharedLibrary('finleycpp', 'CPPAdapter/finleycpp.cpp')  py_wrapper_lib = py_wrapper_local_env.SharedLibrary('finleycpp', 'CPPAdapter/finleycpp.cpp')
# Line 157  tmp3 = local_env.Install(local_env['libi Line 155  tmp3 = local_env.Install(local_env['libi
155  env.Alias('target_install_finley_so', tmp3)  env.Alias('target_install_finley_so', tmp3)
156    
157  #windows specific mod  #windows specific mod
158  tmp_inst = os.path.join(local_env['pyinstall'],py_wrapper_name)  tmp_inst = os.path.join(local_env['pyinstall'],'finley')
159  if os.name == 'nt':  if os.name == 'nt':
160    wrapper_postfix = '.pyd'    wrapper_postfix = '.pyd'
161    source_lib = py_wrapper_lib[0]    source_lib = py_wrapper_lib[0]
# Line 165  else: Line 163  else:
163    wrapper_postfix = '.so'    wrapper_postfix = '.so'
164    source_lib = py_wrapper_lib    source_lib = py_wrapper_lib
165    
166  share_name = os.path.join(tmp_inst,py_wrapper_name+wrapper_postfix)  share_name = os.path.join(tmp_inst,'finleycpp'+wrapper_postfix)
167    
168  tmp4 = py_wrapper_local_env.InstallAs(target=share_name, source=source_lib)  tmp4 = py_wrapper_local_env.InstallAs(target=share_name, source=source_lib)
169    

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

  ViewVC Help
Powered by ViewVC 1.1.26