/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1312 by ksteube, Mon Sep 24 06:18:44 2007 UTC revision 1343 by ksteube, Wed Nov 14 02:48:02 2007 UTC
# Line 624  try: Line 624  try:
624  except KeyError:  except KeyError:
625     blas_libs = [ ]     blas_libs = [ ]
626    
627  # ========== netcdf (currently not supported with mpi) ====================================  # ========== netcdf ====================================
628  if useMPI:  try:
629     useNetCDF = 'no'     useNetCDF = env['useNetCDF']
630  else:  except KeyError:
631     try:     useNetCDF = 'yes'
632        useNetCDF = env['useNetCDF']     pass
    except KeyError:  
       useNetCDF = 'yes'  
       pass  
633            
634  if useNetCDF == 'yes':  if useNetCDF == 'yes':
635     try:     try:
# Line 827  try: Line 824  try:
824     svn_pipe = os.popen("svnversion -n .")     svn_pipe = os.popen("svnversion -n .")
825     global_revision = svn_pipe.readlines()     global_revision = svn_pipe.readlines()
826     svn_pipe.close()     svn_pipe.close()
827     global_revision = re.sub("[^0-9]", "", global_revision[0])     global_revision = re.sub(":.*", "", global_revision[0])
828       global_revision = re.sub("[^0-9]", "", global_revision)
829  except:  except:
830     global_revision = "0"     global_revision = "0"
831  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)
# Line 870  Export(["IS_WINDOWS_PLATFORM", "env", "i Line 868  Export(["IS_WINDOWS_PLATFORM", "env", "i
868  # End initialisation section  # End initialisation section
869  # Begin configuration section  # Begin configuration section
870  # adds this file and the scons option directore to the source tar  # adds this file and the scons option directore to the source tar
871  release_srcfiles=[env.File('SConstruct'),]+[ env.File(x) for x in glob.glob('scons/*.py') ]  release_srcfiles=[env.File('SConstruct'),env.Dir('lib'),env.Dir('include'),]+[ env.File(x) for x in glob.glob('scons/*.py') ]
872  release_testfiles=[env.File('README_TESTS'),]  release_testfiles=[env.File('README_TESTS'),]
873  env.Zip(src_zipfile, release_srcfiles)  env.Zip(src_zipfile, release_srcfiles)
874  env.Zip(test_zipfile, release_testfiles)  env.Zip(test_zipfile, release_testfiles)

Legend:
Removed from v.1312  
changed lines
  Added in v.1343

  ViewVC Help
Powered by ViewVC 1.1.26