/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 605 by johnpye, Tue May 16 00:29:51 2006 UTC revision 624 by ben.allan, Thu May 18 15:39:38 2006 UTC
# Line 23  else: Line 23  else:
23      default_tcl_lib = "tcl8.3"      default_tcl_lib = "tcl8.3"
24      default_tk_lib = "tk8.3"      default_tk_lib = "tk8.3"
25      default_tktable_lib = "Tktable2.8"      default_tktable_lib = "Tktable2.8"
26      default_install_assets = "$INSTALL_DATA/ascend/glade/"      default_install_assets = "$INSTALL_SHARE/glade/"
27      icon_extension = '.svg'      icon_extension = '.svg'
28      default_tcl = os.path.expanduser("~/activetcl")      default_tcl = os.path.expanduser("~/activetcl")
29      default_tcl_libpath = "$TCL/lib"          default_tcl_libpath = "$TCL/lib"    
# Line 110  opts.Add( Line 110  opts.Add(
110      'DEFAULT_ASCENDLIBRARY'      'DEFAULT_ASCENDLIBRARY'
111      ,"Set the default value of the ASCENDLIBRARY -- the location where"      ,"Set the default value of the ASCENDLIBRARY -- the location where"
112          +" ASCEND will look for models when running ASCEND"          +" ASCEND will look for models when running ASCEND"
113      ,"$INSTALL_DATA/ascend/models"      ,"$INSTALL_SHARE/models"
114  )  )
115    
116  # Where is SWIG?  # Where is SWIG?
# Line 262  opts.Add( Line 262  opts.Add(
262  )  )
263    
264  opts.Add(  opts.Add(
265      'INSTALL_DATA'      'INSTALL_SHARE'
266      ,'Location to put data files during installation'      ,'Location to put data files during installation'
267      ,"$INSTALL_PREFIX/share"      ,"$INSTALL_PREFIX/share/ascend"
268  )  )
269    
270  opts.Add(  opts.Add(
# Line 893  subst_dict = { Line 893  subst_dict = {
893      , '@GLADE_FILE@':'ascend.glade'      , '@GLADE_FILE@':'ascend.glade'
894      , '@HELP_ROOT@':''      , '@HELP_ROOT@':''
895      , '@ICON_EXTENSION@':icon_extension      , '@ICON_EXTENSION@':icon_extension
896      , '@INSTALL_DATA@':env['INSTALL_DATA']      , '@INSTALL_SHARE@':env['INSTALL_SHARE']
897      , '@INSTALL_BIN@':env['INSTALL_BIN']      , '@INSTALL_BIN@':env['INSTALL_BIN']
898      , '@INSTALL_INCLUDE@':env['INSTALL_INCLUDE']      , '@INSTALL_INCLUDE@':env['INSTALL_INCLUDE']
899      , '@PYGTK_ASSETS@':env['PYGTK_ASSETS']      , '@PYGTK_ASSETS@':env['PYGTK_ASSETS']
# Line 1122  if env.get('CAN_INSTALL'): Line 1122  if env.get('CAN_INSTALL'):
1122      # the models directory only needs to be processed for installation, no other processing required.      # the models directory only needs to be processed for installation, no other processing required.
1123      env.SConscript(['models/SConscript'],'env')      env.SConscript(['models/SConscript'],'env')
1124    
1125      dirs = ['INSTALL_BIN','INSTALL_DATA','INSTALL_LIB']      dirs = ['INSTALL_BIN','INSTALL_SHARE','INSTALL_LIB']
1126      install_dirs = [env['INSTALL_ROOT']+env[d] for d in dirs]      install_dirs = [env['INSTALL_ROOT']+env[d] for d in dirs]
1127    
1128      # TODO: add install options      # TODO: add install options

Legend:
Removed from v.605  
changed lines
  Added in v.624

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