/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 3349 by caltinay, Mon Nov 15 05:09:56 2010 UTC revision 3463 by caltinay, Mon Feb 7 02:09:57 2011 UTC
# Line 381  if conf.CheckFunc('gethostname'): Line 381  if conf.CheckFunc('gethostname'):
381  python_inc_path=sysconfig.get_python_inc()  python_inc_path=sysconfig.get_python_inc()
382  if IS_WINDOWS:  if IS_WINDOWS:
383      python_lib_path=os.path.join(sysconfig.get_config_var('prefix'), 'libs')      python_lib_path=os.path.join(sysconfig.get_config_var('prefix'), 'libs')
384    elif env['PLATFORM']=='darwin':
385        python_lib_path=sysconfig.get_config_var('LIBPL')
386  else:  else:
387      python_lib_path=sysconfig.get_config_var('LIBDIR')      python_lib_path=sysconfig.get_config_var('LIBDIR')
388  #python_libs=[sysconfig.get_config_var('LDLIBRARY')] # only on linux  #python_libs=[sysconfig.get_config_var('LDLIBRARY')] # only on linux
# Line 565  if env['parmetis']: Line 567  if env['parmetis']:
567      env.PrependENVPath(LD_LIBRARY_PATH_KEY, parmetis_lib_path)      env.PrependENVPath(LD_LIBRARY_PATH_KEY, parmetis_lib_path)
568      env.Append(CPPDEFINES = ['USE_PARMETIS'])      env.Append(CPPDEFINES = ['USE_PARMETIS'])
569    
570    ######## gmsh (optional, for tests)
571    
572    try:
573        import subprocess
574        p=subprocess.Popen(['gmsh', '-version'], stderr=subprocess.PIPE)
575        p.poll()
576        env['gmsh']=True
577    except OSError:
578        env['gmsh']=False
579    
580  ######################## Summarize our environment ###########################  ######################## Summarize our environment ###########################
581    
582  # keep some of our install paths first in the list for the unit tests  # keep some of our install paths first in the list for the unit tests
# Line 610  for i in e_list: Line 622  for i in e_list:
622      print("%16s:  YES"%i)      print("%16s:  YES"%i)
623  for i in d_list:  for i in d_list:
624      print("%16s:  DISABLED"%i)      print("%16s:  DISABLED"%i)
625    if env['gmsh']:
626        print("            gmsh:  FOUND")
627    else:
628        print("            gmsh:  NOT FOUND")
629  if ((fatalwarning != '') and (env['werror'])):  if ((fatalwarning != '') and (env['werror'])):
630      print("  Treating warnings as errors")      print("  Treating warnings as errors")
631  else:  else:
# Line 774  env.Alias('release_prep', ['docs', 'inst Line 790  env.Alias('release_prep', ['docs', 'inst
790  if not IS_WINDOWS:  if not IS_WINDOWS:
791      try:      try:
792          utest=open('utest.sh','w')          utest=open('utest.sh','w')
793          utest.write(GroupTest.makeHeader(env['BUILD_DIR'], env['PLATFORM']))          utest.write(GroupTest.makeHeader(env['PLATFORM']))
794          for tests in TestGroups:          for tests in TestGroups:
795              utest.write(tests.makeString())              utest.write(tests.makeString())
796          utest.close()          utest.close()

Legend:
Removed from v.3349  
changed lines
  Added in v.3463

  ViewVC Help
Powered by ViewVC 1.1.26