/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 680 by johnpye, Wed Jun 21 11:14:49 2006 UTC revision 683 by johnpye, Wed Jun 21 13:49:40 2006 UTC
# Line 26  if platform.system()=="Windows": Line 26  if platform.system()=="Windows":
26      default_absolute_paths = False      default_absolute_paths = False
27      default_ida_prefix = "c:/mingw"      default_ida_prefix = "c:/mingw"
28      need_libm = False      need_libm = False
29        python_exe = "c:\\Python24\\python.exe"
30  else:  else:
31      default_tcl_lib = "tcl8.4"      default_tcl_lib = "tcl8.4"
32      default_tk_lib = "tk8.4"      default_tk_lib = "tk8.4"
# Line 40  else: Line 41  else:
41      need_libm = True      need_libm = True
42      if not os.path.isdir(default_tcl):      if not os.path.isdir(default_tcl):
43          default_tcl = '/usr'          default_tcl = '/usr'
44        python_exe = distutils.sysconfig.EXEC_PREFIX+"/bin/python"
45    
46  opts.Add(  opts.Add(
47      'CC'      'CC'
# Line 305  opts.Add( Line 307  opts.Add(
307    
308  opts.Add(  opts.Add(
309      'INSTALL_LIB'      'INSTALL_LIB'
310      ,'Location to put binaries during installation'      ,'Location to put libraries during installation'
311      ,"$INSTALL_PREFIX/lib"      ,"$INSTALL_PREFIX/lib"
312  )  )
313    
# Line 1060  subst_dict = { Line 1062  subst_dict = {
1062      , '@INSTALL_ASCDATA@':env['INSTALL_ASCDATA']      , '@INSTALL_ASCDATA@':env['INSTALL_ASCDATA']
1063      , '@INSTALL_BIN@':env['INSTALL_BIN']      , '@INSTALL_BIN@':env['INSTALL_BIN']
1064      , '@INSTALL_INCLUDE@':env['INSTALL_INCLUDE']      , '@INSTALL_INCLUDE@':env['INSTALL_INCLUDE']
1065        , '@INSTALL_LIB@':env['INSTALL_LIB']
1066      , '@PYGTK_ASSETS@':env['PYGTK_ASSETS']      , '@PYGTK_ASSETS@':env['PYGTK_ASSETS']
1067      , '@VERSION@':version      , '@VERSION@':version
1068      , '@RELEASE@':release      , '@RELEASE@':release
# Line 1069  subst_dict = { Line 1072  subst_dict = {
1072      , '@ASC_SHLIBPREFIX@':env['SHLIBPREFIX']      , '@ASC_SHLIBPREFIX@':env['SHLIBPREFIX']
1073      , '@ASC_ENV_TK_DEFAULT@' : '$$ASCENDDIST/tcltk'      , '@ASC_ENV_TK_DEFAULT@' : '$$ASCENDDIST/tcltk'
1074      , '@ASC_DISTDIR_REL_BIN@' : default_rel_distdir      , '@ASC_DISTDIR_REL_BIN@' : default_rel_distdir
1075        , '@PYTHON@' : python_exe
1076  }  }
1077    
1078  if env.get('WITH_LOCAL_HELP'):  if env.get('WITH_LOCAL_HELP'):
# Line 1305  else: Line 1309  else:
1309      print "Skipping... CUnit tests aren't being built:",without_cunit_reason      print "Skipping... CUnit tests aren't being built:",without_cunit_reason
1310    
1311  #------------------------------------------------------  #------------------------------------------------------
1312    # CREATE ASCEND-CONFIG scriptlet
1313    
1314    ascendconfig = env.SubstInFile('ascend-config.in')
1315    
1316    #------------------------------------------------------
1317  # INSTALLATION  # INSTALLATION
1318    
1319  if env.get('CAN_INSTALL'):  if env.get('CAN_INSTALL'):
# Line 1319  if env.get('CAN_INSTALL'): Line 1328  if env.get('CAN_INSTALL'):
1328    
1329      env.InstallShared(env['INSTALL_ROOT']+env['INSTALL_LIB'],libascend)      env.InstallShared(env['INSTALL_ROOT']+env['INSTALL_LIB'],libascend)
1330    
1331        env.InstallProgram(env['INSTALL_ROOT']+env['INSTALL_BIN'],ascendconfig)
1332    
1333  #------------------------------------------------------  #------------------------------------------------------
1334  # WINDOWS INSTALLER  # WINDOWS INSTALLER
1335  # For the windows installer, please see pygtk/SConscript  # For the windows installer, please see pygtk/SConscript

Legend:
Removed from v.680  
changed lines
  Added in v.683

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