/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 761 by johnpye, Thu Jul 13 04:46:13 2006 UTC revision 766 by johnpye, Thu Jul 13 06:33:03 2006 UTC
# Line 412  if platform.system()!="Windows": Line 412  if platform.system()!="Windows":
412  if os.environ.get('OSTYPE')=='msys':  if os.environ.get('OSTYPE')=='msys':
413      env = Environment(      env = Environment(
414          ENV=os.environ          ENV=os.environ
415          , tools=['mingw','lex','yacc','fortran','swig','disttar','nsis']          , tools=['mingw','lex','yacc','fortran','swig','disttar','nsis','doxygen']
416          , toolpath=['scons']          , toolpath=['scons']
417      )      )
418      env['IS_MINGW']=True      env['IS_MINGW']=True
# Line 425  elif platform.system()=="Windows": Line 425  elif platform.system()=="Windows":
425              ,'LIB':os.environ['LIB']              ,'LIB':os.environ['LIB']
426              ,'MSVS_IGNORE_IDE_PATHS':1              ,'MSVS_IGNORE_IDE_PATHS':1
427          }          }
428          , tools = ['default','lex','yacc','fortran','swig','disttar','nsis']          , tools = ['default','lex','yacc','fortran','swig','disttar','nsis','doxygen']
429          , toolpath = ['scons']          , toolpath = ['scons']
430      )      )
431      env.Append(CPPDEFINES=['_CRT_SECURE_NO_DEPRECATE'])      env.Append(CPPDEFINES=['_CRT_SECURE_NO_DEPRECATE'])
432  else:  else:
433      env = Environment(      env = Environment(
434          ENV=os.environ          ENV=os.environ
435          , tools=['default','lex','yacc','fortran','swig','disttar','nsis']          , tools=['default','lex','yacc','fortran','swig','disttar','nsis','doxygen']
436          , toolpath=['scons']          , toolpath=['scons']
437      )      )
438    
# Line 1437  tar = env.DistTar("dist/"+env['DISTTAR_N Line 1437  tar = env.DistTar("dist/"+env['DISTTAR_N
1437  env.Depends(tar,'ascend.spec')  env.Depends(tar,'ascend.spec')
1438    
1439  #------------------------------------------------------  #------------------------------------------------------
1440    # LIBASCEND DOXYGEN DOCUMENTATION
1441    
1442    env.SConscript('base/doc/SConscript',['env'])
1443    
1444    #------------------------------------------------------
1445  # RPM BUILD  # RPM BUILD
1446    
1447  #if platform.system()=="Linux":  # for RPM builds, 'scons dist' then 'rpmbuild -ta dist/ascend-*.tar.bz2'
1448  #   pass  # (check * for the version number used to create the tarball)
1449    
1450  #------------------------------------------------------  #------------------------------------------------------
1451  # DEFAULT TARGETS  # DEFAULT TARGETS

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

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