/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1232 by phornby, Fri Aug 10 06:44:04 2007 UTC revision 1235 by phornby, Mon Aug 13 00:25:29 2007 UTC
# Line 122  else: Line 122  else:
122  #  #
123  python_path_default=os.path.join(tools_prefix,'include','python%s.%s'%(sys.version_info[0],sys.version_info[1]))  python_path_default=os.path.join(tools_prefix,'include','python%s.%s'%(sys.version_info[0],sys.version_info[1]))
124  python_lib_path_default=os.path.join(tools_prefix,'lib')  python_lib_path_default=os.path.join(tools_prefix,'lib')
125  python_libs_default=["python%s.%s"%(sys.version_info[0],sys.version_info[1])]  python_lib_default="python%s.%s"%(sys.version_info[0],sys.version_info[1])
126    
127  #==========================================================================  #==========================================================================
128  #  #
129  #    boost installation:  #    boost installation:
130  #  #
131  boost_path_default=os.path.join(tools_prefix,'include')  boost_path_default=os.path.join(tools_prefix,'include')
132  boost_libs_path_default=os.path.join(tools_prefix,'lib')  boost_lib_path_default=os.path.join(tools_prefix,'lib')
133  boost_libs_default=['boost_python']  boost_lib_default=['boost_python']
134  #==========================================================================  #==========================================================================
135  #  #
136  #    check if netCDF is installed on the system:  #    check if netCDF is installed on the system:
# Line 218  opts.AddOptions( Line 218  opts.AddOptions(
218  # locations of include files for python  # locations of include files for python
219    PathOption('python_path', 'Path to Python includes', python_path_default),    PathOption('python_path', 'Path to Python includes', python_path_default),
220    PathOption('python_lib_path', 'Path to Python libs', python_lib_path_default),    PathOption('python_lib_path', 'Path to Python libs', python_lib_path_default),
221    ('python_libs', 'Python libraries to link with', python_libs_default),    ('python_lib', 'Python libraries to link with', python_lib_default),
222  # Boost  # Boost
223    PathOption('boost_path', 'Path to Boost includes', boost_path_default),    PathOption('boost_path', 'Path to Boost includes', boost_path_default),
224    PathOption('boost_libs_path', 'Path to Boost libs', boost_libs_path_default),    PathOption('boost_lib_path', 'Path to Boost libs', boost_lib_path_default),
225    ('boost_libs', 'Boost libraries to link with', boost_libs_default),    ('boost_lib', 'Boost libraries to link with', boost_lib_default),
226  # Doc building  # Doc building
227  #  PathOption('doxygen_path', 'Path to Doxygen executable', None),  #  PathOption('doxygen_path', 'Path to Doxygen executable', None),
228  #  PathOption('epydoc_path', 'Path to Epydoc executable', None),  #  PathOption('epydoc_path', 'Path to Epydoc executable', None),
# Line 317  try: Line 317  try:
317     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
318     if env['PLATFORM'] == "win32":     if env['PLATFORM'] == "win32":
319        env.PrependENVPath('PATH', libinstall)        env.PrependENVPath('PATH', libinstall)
320        env.PrependENVPath('PATH', env['boost_libs_path'])        env.PrependENVPath('PATH', env['boost_lib_path'])
321  except KeyError:  except KeyError:
322     libinstall = None     libinstall = None
323  try:  try:
# Line 553  try: Line 553  try:
553  except KeyError:  except KeyError:
554     pass     pass
555  try:  try:
556     lib_path = env['boost_libs_path']     lib_path = env['boost_lib_path']
557     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
558  except KeyError:  except KeyError:
559     pass     pass
560  try:  try:
561     boost_libs = env['boost_libs']     boost_lib = env['boost_lib']
562  except KeyError:  except KeyError:
563     boost_libs = None     boost_lib = None
564  try:  try:
565     includes = env['python_path']     includes = env['python_path']
566     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 572  try: Line 572  try:
572  except KeyError:  except KeyError:
573     pass     pass
574  try:  try:
575     python_libs = env['python_libs']     python_lib = env['python_lib']
576  except KeyError:  except KeyError:
577     python_libs = None     python_lib = None
578  try:  try:
579     doxygen_path = env['doxygen_path']     doxygen_path = env['doxygen_path']
580  except KeyError:  except KeyError:
# Line 674  env.Alias(init_target) Line 674  env.Alias(init_target)
674    
675  # Allow sconscripts to see the env  # Allow sconscripts to see the env
676  Export(["IS_WINDOWS_PLATFORM", "env", "incinstall", "libinstall", "pyinstall", "exinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "amd_libs", "blas_libs", "netCDF_libs", "useNetCDF",  Export(["IS_WINDOWS_PLATFORM", "env", "incinstall", "libinstall", "pyinstall", "exinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "amd_libs", "blas_libs", "netCDF_libs", "useNetCDF",
677      "boost_libs", "python_libs", "doxygen_path", "epydoc_path", "papi_libs",      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",
678          "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile", "src_tarfile", "examples_tarfile", "examples_zipfile",          "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile", "src_tarfile", "examples_tarfile", "examples_zipfile",
679          "guide_pdf", "guide_html_index", "api_epydoc", "api_doxygen", "useMPI" ])          "guide_pdf", "guide_html_index", "api_epydoc", "api_doxygen", "useMPI" ])
680    
Legend:
Removed from v.1232  
changed lines
  Added in v.1235
  ViewVC Help
Powered by ViewVC 1.1.26