/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1852 by jpye, Sat Aug 16 13:58:43 2008 UTC revision 1853 by jpye, Thu Sep 11 06:13:47 2008 UTC
# Line 15  opts = Options(['options.cache', 'config Line 15  opts = Options(['options.cache', 'config
15  default_tcl_cpppath = "$TCL/include"  default_tcl_cpppath = "$TCL/include"
16  default_tron_envvar="TRON_PATH"  default_tron_envvar="TRON_PATH"
17  default_conopt_envvar="CONOPT_PATH"  default_conopt_envvar="CONOPT_PATH"
18  default_graphviz_rpath = None  #default_graphviz_rpath = None
19    
20  if platform.system()=="Windows":  if platform.system()=="Windows":
21      default_tcl_lib = "tcl84"      default_tcl_lib = "tcl84"
# Line 60  if platform.system()=="Windows": Line 60  if platform.system()=="Windows":
60      default_fortran="g77"      default_fortran="g77"
61      default_f2c_lib="g2c"      default_f2c_lib="g2c"
62            
63      default_graphviz_libs=['graph', 'gvc', 'pathplan', 'cdt', 'expat', 'zlib1', 'ltdl', 'msvcr80']      #default_graphviz_libs=['graph', 'gvc', 'pathplan', 'cdt', 'expat', 'zlib1', 'ltdl', 'msvcr80']
64      default_graphviz_libpath = default_libpath      #default_graphviz_libpath = default_libpath
65            
66  else:  else:
67      default_tcl_lib = "tcl8.5"      default_tcl_lib = "tcl8.5"
# Line 106  else: Line 106  else:
106      default_f2c_lib="gfortran"      default_f2c_lib="gfortran"
107    
108            
109      default_graphviz_libs=["graph","cdt","gvc"]      #default_graphviz_libs=["graph","cdt","gvc"]
110      default_graphviz_libpath = default_libpath      #default_graphviz_libpath = default_libpath
111      if os.path.exists("/usr/lib/graphviz/libgraph.so"):      #if os.path.exists("/usr/lib/graphviz/libgraph.so"):
112          # for Ubuntu 7.04      #   # for Ubuntu 7.04
113          default_graphviz_libpath="/usr/lib/graphviz"      #   default_graphviz_libpath="/usr/lib/graphviz"
114          default_graphviz_rpath="$GRAPHVIZ_LIBPATH"      #   default_graphviz_rpath="$GRAPHVIZ_LIBPATH"
115            
116  opts.Add(  opts.Add(
117      'CC'      'CC'
# Line 645  opts.Add(BoolOption( Line 645  opts.Add(BoolOption(
645      ,False      ,False
646  ))  ))
647    
648  #------ f --------  #------ Graphviz --------
649  opts.Add(PackageOption(  #   opts.Add(PackageOption(
650      'GRAPHVIZ_PREFIX'  #       'GRAPHVIZ_PREFIX'
651      ,"Where are your GRAPHVIZ files?"  #       ,"Where are your GRAPHVIZ files?"
652      ,default_prefix  #       ,default_prefix
653  ))  #   ))
654    #
655  opts.Add(PackageOption(  #   opts.Add(PackageOption(
656      'GRAPHVIZ_CPPPATH'  #       'GRAPHVIZ_CPPPATH'
657      ,"Where are your GRAPHVIZ include files? (don't need the final '/graphviz')"  #       ,"Where are your GRAPHVIZ include files? (don't need the final '/graphviz')"
658      ,default_cpppath  #       ,default_cpppath
659  ))  #   ))
660    #
661  opts.Add(PackageOption(  #   opts.Add(PackageOption(
662      'GRAPHVIZ_LIBPATH'  #       'GRAPHVIZ_LIBPATH'
663      ,"Where are your GRAPHVIZ libraries?"  #       ,"Where are your GRAPHVIZ libraries?"
664      ,default_graphviz_libpath  #       ,default_graphviz_libpath
665  ))  #   ))
666    #
667  opts.Add(  #   opts.Add(
668      'GRAPHVIZ_LIBS'  #       'GRAPHVIZ_LIBS'
669      ,"What are your GRAPHVIZ libraries named?"  #       ,"What are your GRAPHVIZ libraries named?"
670      ,default_graphviz_libs  #       ,default_graphviz_libs
671  )  #   )
672    #
673  opts.Add(PackageOption(  #   opts.Add(PackageOption(
674      'GRAPHVIZ_RPATH'  #       'GRAPHVIZ_RPATH'
675      ,"What is your GRAPHVIZ rpath for locating libraries at runtime? (only required for old Ubuntu)"  #       ,"What is your GRAPHVIZ rpath for locating libraries at runtime? (only required for old Ubuntu)"
676      ,default_graphviz_rpath  #       ,default_graphviz_rpath
677  ))  #   ))
678    
679  opts.Add(BoolOption(  opts.Add(BoolOption(
680      'WITH_GRAPHVIZ'      'WITH_GRAPHVIZ'
# Line 787  envadditional={} Line 787  envadditional={}
787    
788  tools = [  tools = [
789      'lex', 'yacc', 'fortran', 'swig', 'nsis', 'substinfile'      'lex', 'yacc', 'fortran', 'swig', 'nsis', 'substinfile'
790      ,'disttar', 'tar'      ,'disttar', 'tar', 'graphviz'
791  ]  ]
792  if platform.system()=="Windows":  if platform.system()=="Windows":
793      if os.environ.get('OSTYPE')=='msys' or os.environ.get('MSYSTEM'):      if os.environ.get('OSTYPE')=='msys' or os.environ.get('MSYSTEM'):
# Line 831  env = Environment( Line 831  env = Environment(
831    
832  opts.Update(env)  opts.Update(env)
833    
834  for l in ['GRAPHVIZ','SUNDIALS','IPOPT']:  for l in ['SUNDIALS','IPOPT']:
835      var = "%s_LIBS" % l      var = "%s_LIBS" % l
836      if not isinstance(env[var],types.ListType):      if not isinstance(env[var],types.ListType):
837          env[var] = env[var].split(",")          env[var] = env[var].split(",")

Legend:
Removed from v.1852  
changed lines
  Added in v.1853

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22