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

Diff of /trunk/escript/src/SConscript

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

revision 1844 by phornby, Fri Oct 3 03:16:11 2008 UTC revision 1845 by gross, Fri Oct 3 05:23:47 2008 UTC
# Line 91  headers = """ Line 91  headers = """
91  local_env.Append(LIBS = [ 'esysUtils'] + env['sys_libs'] )  local_env.Append(LIBS = [ 'esysUtils'] + env['sys_libs'] )
92  py_wrapper_local_env.Append(LIBS = [ 'escript', 'esysUtils'] + env['sys_libs'])  py_wrapper_local_env.Append(LIBS = [ 'escript', 'esysUtils'] + env['sys_libs'])
93    
 py_wrapper_name = 'escript'  
94    
95  lib = local_env.SharedLibrary(py_wrapper_name, sources)  lib = local_env.SharedLibrary('escript', sources)
96  env.Alias('target_escript_so', lib)  env.Alias('target_escript_so', lib)
97    
98  py_wrapper_lib = py_wrapper_local_env.SharedLibrary('escriptcpp', 'escriptcpp.cpp')  py_wrapper_lib = py_wrapper_local_env.SharedLibrary('escriptcpp', 'escriptcpp.cpp')
# Line 108  tmp3 = local_env.Install(local_env['libi Line 107  tmp3 = local_env.Install(local_env['libi
107  env.Alias('target_install_escript_so', tmp3)  env.Alias('target_install_escript_so', tmp3)
108    
109  #windows specific mod  #windows specific mod
110  tmp_inst = os.path.join(local_env['pyinstall'],py_wrapper_name)  tmp_inst = os.path.join(local_env['pyinstall'],'escript')
111  if os.name == 'nt':  if os.name == 'nt':
112    wrapper_postfix = '.pyd'    wrapper_postfix = '.pyd'
113    source_lib = py_wrapper_lib[0]    source_lib = py_wrapper_lib[0]
# Line 116  else: Line 115  else:
115    wrapper_postfix = '.so'    wrapper_postfix = '.so'
116    source_lib = py_wrapper_lib    source_lib = py_wrapper_lib
117    
118  share_name = os.path.join(tmp_inst,py_wrapper_name+wrapper_postfix)  share_name = os.path.join(tmp_inst,'escriptcpp'+wrapper_postfix)
119    
120  tmp4 = py_wrapper_local_env.InstallAs(target=share_name, source=source_lib)  tmp4 = py_wrapper_local_env.InstallAs(target=share_name, source=source_lib)
121    

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

  ViewVC Help
Powered by ViewVC 1.1.26