/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 760 by johnpye, Tue Jul 11 05:54:26 2006 UTC revision 761 by johnpye, Thu Jul 13 04:46:13 2006 UTC
# Line 388  opts.Add(BoolOption( Line 388  opts.Add(BoolOption(
388      ,True      ,True
389  ))  ))
390    
391    opts.Add(BoolOption(
392        'WITH_EXTFNS'
393        ,"Set to 0 if you don't want to attempt to build external modules bundled"
394            + " with ASCEND."
395        ,True
396    ))
397    
398  if platform.system()!="Windows":  if platform.system()!="Windows":
399      opts.Add(BoolOption(      opts.Add(BoolOption(
400          'WITH_GCCVISIBILITY'          'WITH_GCCVISIBILITY'
# Line 443  without_python_reason = "disabled by opt Line 450  without_python_reason = "disabled by opt
450  with_cunit = env.get('WITH_CUNIT')  with_cunit = env.get('WITH_CUNIT')
451  without_cunit_reason = "not requested"  without_cunit_reason = "not requested"
452    
453    with_extfns = env.get('WITH_EXTFNS')
454    without_extfn_reason = "disabled by options/config.py"
455    
456  if platform.system()=="Windows":  if platform.system()=="Windows":
457      with_installer=1      with_installer=1
458  else:  else:
# Line 1335  libascend = libascend_env.SharedLibrary( Line 1345  libascend = libascend_env.SharedLibrary(
1345  env.Alias('libascend',libascend)  env.Alias('libascend',libascend)
1346    
1347  #-------------  #-------------
1348  # UNIT TESTS  # UNIT TESTS (C CODE)
1349    
1350  if with_cunit:  if with_cunit:
1351      testdirs = ['general','solver','utilities']      testdirs = ['general','solver','utilities']
# Line 1355  if with_cunit: Line 1365  if with_cunit:
1365  else:  else:
1366      print "Skipping... CUnit tests aren't being built:",without_cunit_reason      print "Skipping... CUnit tests aren't being built:",without_cunit_reason
1367    
1368    #-------------
1369    # EXTERNAL FUNCTIONS
1370    
1371    extfns = []
1372    if with_extfns:
1373        testdirs = ['johnpye/extfn']
1374        for testdir in testdirs:
1375            path = 'models/'+testdir+"/SConscript"
1376            extfns += env.SConscript(path,'env')
1377    else:
1378        print "Skipping... External modules aren't being built:",without_extfns_reason
1379    
1380    env.Alias('extfns',extfns)
1381    
1382  #------------------------------------------------------  #------------------------------------------------------
1383  # CREATE ASCEND-CONFIG scriptlet  # CREATE ASCEND-CONFIG scriptlet
1384    
# Line 1428  if with_python: Line 1452  if with_python:
1452      default_targets.append('pygtk')      default_targets.append('pygtk')
1453  if with_installer:  if with_installer:
1454      default_targets.append('installer')      default_targets.append('installer')
1455    if with_extfns:
1456        default_targets.append('extfns')
1457    
1458  env.Default(default_targets)  env.Default(default_targets)
1459    

Legend:
Removed from v.760  
changed lines
  Added in v.761

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