/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2296 by jfenwick, Thu Mar 5 05:47:34 2009 UTC revision 2299 by jfenwick, Wed Mar 11 03:14:41 2009 UTC
# Line 15  Line 15 
15  EnsureSConsVersion(0,96,91)  EnsureSConsVersion(0,96,91)
16  EnsurePythonVersion(2,3)  EnsurePythonVersion(2,3)
17    
18  import sys, os, re, socket, platform  import sys, os, re, socket, platform, stat
19    
20  # Add our extensions  # Add our extensions
21  if os.path.isdir('scons'): sys.path.append('scons')  if os.path.isdir('scons'): sys.path.append('scons')
# Line 656  print "" Line 656  print ""
656  Execute(Delete(env['libinstall'] + "/Compiled.with.debug"))  Execute(Delete(env['libinstall'] + "/Compiled.with.debug"))
657  Execute(Delete(env['libinstall'] + "/Compiled.with.mpi"))  Execute(Delete(env['libinstall'] + "/Compiled.with.mpi"))
658  Execute(Delete(env['libinstall'] + "/Compiled.with.openmp"))  Execute(Delete(env['libinstall'] + "/Compiled.with.openmp"))
659    Execute(Delete(env['libinstall'] + "pyversion"))
660  if not env['usempi']: Execute(Delete(env['libinstall'] + "/pythonMPI"))  if not env['usempi']: Execute(Delete(env['libinstall'] + "/pythonMPI"))
661    
662    
# Line 704  if env['omp_optim'] != '': Line 705  if env['omp_optim'] != '':
705    
706  env.Alias('remember_options', remember_list)  env.Alias('remember_options', remember_list)
707    
708    
709    ############### Record python interpreter version ##############
710    
711    if not IS_WINDOWS_PLATFORM:
712      versionstring="Python "+str(sys.version_info[0])+"."+str(sys.version_info[1])+"."+str(sys.version_info[2])
713      os.system("echo "+versionstring+" > "+env['libinstall']+"/pyversion")
714    
715  ############ Targets to build and install libraries ############  ############ Targets to build and install libraries ############
716    
717  target_init = env.Command(env['pyinstall']+'/__init__.py', None, Touch('$TARGET'))  target_init = env.Command(env['pyinstall']+'/__init__.py', None, Touch('$TARGET'))
# Line 773  if not IS_WINDOWS_PLATFORM: Line 781  if not IS_WINDOWS_PLATFORM:
781      for tests in TestGroups:      for tests in TestGroups:
782          utest.write(tests.makeString())          utest.write(tests.makeString())
783      utest.close()      utest.close()
784        os.chmod("utest.sh",stat.S_IRWXU|stat.S_IRGRP|stat.S_IXGRP|stat.S_IROTH|stat.S_IXOTH)
785      print "utest.sh written"      print "utest.sh written"
786     except IOError:     except IOError:
787      print "Error attempting to write unittests file."      print "Error attempting to write unittests file."

Legend:
Removed from v.2296  
changed lines
  Added in v.2299

  ViewVC Help
Powered by ViewVC 1.1.26