/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 804 by johnpye, Fri Aug 4 05:54:34 2006 UTC revision 811 by johnpye, Thu Aug 10 17:08:16 2006 UTC
# Line 1461  else: Line 1461  else:
1461  #-------------  #-------------
1462  # EXTERNAL FUNCTIONS  # EXTERNAL FUNCTIONS
1463    
1464  extfns = []  env['extfns']=[]
1465  if with_extfns:  modeldirs = env.SConscript(['models/SConscript'],'env')
1466      testdirs = ['johnpye/extfn']  
1467      for testdir in testdirs:  if not with_extfns:
         path = 'models/'+testdir+"/SConscript"  
         extfns += env.SConscript(path,'env')  
 else:  
1468      print "Skipping... External modules aren't being built:",without_extfns_reason      print "Skipping... External modules aren't being built:",without_extfns_reason
1469    
1470  env.Alias('extfns',extfns)  env.Alias('extfns',env['extfns'])
1471    
1472  #------------------------------------------------------  #------------------------------------------------------
1473  # CREATE ASCEND-CONFIG scriptlet  # CREATE ASCEND-CONFIG scriptlet
# Line 1481  ascendconfig = env.SubstInFile('ascend-c Line 1478  ascendconfig = env.SubstInFile('ascend-c
1478  # INSTALLATION  # INSTALLATION
1479    
1480  if env.get('CAN_INSTALL'):  if env.get('CAN_INSTALL'):
     # the models directory only needs to be processed for installation, no other processing required.  
     env.SConscript(['models/SConscript'],'env')  
1481    
1482      dirs = ['INSTALL_BIN','INSTALL_ASCDATA','INSTALL_LIB', 'INSTALL_INCLUDE']      dirs = ['INSTALL_BIN','INSTALL_ASCDATA','INSTALL_LIB', 'INSTALL_INCLUDE']
1483      install_dirs = [env['INSTALL_ROOT']+env[d] for d in dirs]      install_dirs = [env['INSTALL_ROOT']+env[d] for d in dirs]
1484        install_dirs += modeldirs
1485    
1486      # TODO: add install options      # TODO: add install options
1487      env.Alias('install',install_dirs)      env.Alias('install',install_dirs)

Legend:
Removed from v.804  
changed lines
  Added in v.811

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