/[escript]/branches/windows_from_1456_trunk_1544_merged_in/SConstruct
ViewVC logotype

Diff of /branches/windows_from_1456_trunk_1544_merged_in/SConstruct

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

revision 1249 by phornby, Tue Aug 14 05:20:39 2007 UTC revision 1250 by ksteube, Thu Aug 16 02:54:42 2007 UTC
# Line 75  if not os.path.isfile(options_file) : Line 75  if not os.path.isfile(options_file) :
75    
76  if not options_file :  if not options_file :
77     import socket     import socket
78     from string import ascii_letters,digits     hostname = re.sub("[^0-9a-zA-Z]", "_", socket.gethostname().split('.')[0])
    hostname=""  
    for s in socket.gethostname().split('.')[0]:  
       if s in ascii_letters+digits:  
          hostname+=s  
       else:  
          hostname+="_"  
79     tmp = os.path.join("scons",hostname+"_options.py")     tmp = os.path.join("scons",hostname+"_options.py")
80    
81     if os.path.isfile(tmp) :     if os.path.isfile(tmp) :
# Line 676  except KeyError: Line 670  except KeyError:
670     api_doxygen = None     api_doxygen = None
671    
672  try:  try:
673     svn_pipe = os.popen("svn info | grep '^Revision'")     svn_pipe = os.popen("svnversion -n")
674     rev = svn_pipe.readlines()     global_revision = svn_pipe.readlines()
675     svn_pipe.close()     svn_pipe.close()
676     svn_version = re.sub("[^0-9]", "", rev[0])     global_revision = re.sub("[^0-9]", "", global_revision)
677  except:  except:
678     svn_version = "0"     global_revision = "0"
679  env.Append(CPPDEFINES = "SVN_VERSION="+svn_version)  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision[0])
680    
681  # Python install - esys __init__.py  # Python install - esys __init__.py
682  init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))  init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))

Legend:
Removed from v.1249  
changed lines
  Added in v.1250

  ViewVC Help
Powered by ViewVC 1.1.26