/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1246 by phornby, Mon Aug 13 22:09:00 2007 UTC revision 1248 by phornby, Tue Aug 14 05:20:39 2007 UTC
# Line 15  EnsurePythonVersion(2,3) Line 15  EnsurePythonVersion(2,3)
15  #===============================================================  #===============================================================
16  #   import tools:  #   import tools:
17  import glob  import glob
18  import sys, os  import sys, os, re
19  # Add our extensions  # Add our extensions
20  if sys.path.count('scons')==0: sys.path.append('scons')  if sys.path.count('scons')==0: sys.path.append('scons')
21  import scons_extensions  import scons_extensions
# Line 331  try: Line 331  try:
331     libinstall = env['libinstall']     libinstall = env['libinstall']
332     env.Append(LIBPATH = [libinstall,]) # Adds -L for building of libescript.so libfinley.so escriptcpp.so finleycpp.so     env.Append(LIBPATH = [libinstall,]) # Adds -L for building of libescript.so libfinley.so escriptcpp.so finleycpp.so
333     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
334     if env['PLATFORM'] == "win32":     if IS_WINDOWS_PLATFORM :
335        env.PrependENVPath('PATH', libinstall)        env.PrependENVPath('PATH', libinstall)
       env.PrependENVPath('PATH', env['boost_lib_path'])  
336  except KeyError:  except KeyError:
337     libinstall = None     libinstall = None
338  try:  try:
# Line 567  if useNetCDF == 'yes': Line 566  if useNetCDF == 'yes':
566    
567     try:     try:
568        lib_path = env['netCDF_lib_path']        lib_path = env['netCDF_lib_path']
       if IS_WINDOWS_PLATFORM: env['ENV']['PATH']+=";"+lib_path  
569        env.Append(LIBPATH = [ lib_path, ])        env.Append(LIBPATH = [ lib_path, ])
570          if IS_WINDOWS_PLATFORM :
571             env.PrependENVPath('PATH', lib_path)
572     except KeyError:     except KeyError:
573        pass        pass
574  else:  else:
# Line 583  except KeyError: Line 583  except KeyError:
583  try:  try:
584     lib_path = env['boost_lib_path']     lib_path = env['boost_lib_path']
585     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
586       if IS_WINDOWS_PLATFORM :
587          env.PrependENVPath('PATH', lib_path)
588  except KeyError:  except KeyError:
589     pass     pass
590  try:  try:
# Line 673  try: Line 675  try:
675  except KeyError:  except KeyError:
676     api_doxygen = None     api_doxygen = None
677    
678    try:
679       svn_pipe = os.popen("svn info | grep '^Revision'")
680       rev = svn_pipe.readlines()
681       svn_pipe.close()
682       svn_version = re.sub("[^0-9]", "", rev[0])
683    except:
684       svn_version = "0"
685    env.Append(CPPDEFINES = "SVN_VERSION="+svn_version)
686    
687  # Python install - esys __init__.py  # Python install - esys __init__.py
688  init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))  init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))
689    

Legend:
Removed from v.1246  
changed lines
  Added in v.1248

  ViewVC Help
Powered by ViewVC 1.1.26