/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1550 by jpye, Mon Jul 23 06:25:49 2007 UTC revision 1551 by jpye, Tue Jul 24 07:29:42 2007 UTC
# Line 1320  def CheckPythonLib(context): Line 1320  def CheckPythonLib(context):
1320      python_libpath = []      python_libpath = []
1321      python_linkflags = []      python_linkflags = []
1322      if platform.system()=="Windows":      if platform.system()=="Windows":
1323          python_libpath+=[cfig['prefix']]          python_libpath += [os.path.join(sys.prefix,"libs")]
1324      else:      else:
1325          # checked on Linux and SunOS          # checked on Linux and SunOS
1326          if cfig['LDLIBRARY']==cfig['LIBRARY']:          if cfig['LDLIBRARY']==cfig['LIBRARY']:
# Line 2384  if env.get('CAN_INSTALL'): Line 2384  if env.get('CAN_INSTALL'):
2384  # WINDOWS INSTALLER  # WINDOWS INSTALLER
2385  # For the windows installer, please see pygtk/SConscript  # For the windows installer, please see pygtk/SConscript
2386    
2387    if not env.get('NSIS'):
2388        with_installer = False
2389        without_installer_reason = "NSIS not found"
2390    
2391  if with_installer:  if with_installer:
2392      env.Append(NSISDEFINES={      env.Append(NSISDEFINES={
2393          'OUTFILE':"#dist/"+env['WIN_INSTALLER_NAME']          'OUTFILE':"#dist/"+env['WIN_INSTALLER_NAME']
# Line 2434  env.Depends(tar,'#doc/book.pdf') Line 2438  env.Depends(tar,'#doc/book.pdf')
2438  Alias('dist',tar)  Alias('dist',tar)
2439    
2440  #------------------------------------------------------  #------------------------------------------------------
2441  # USER'S MANUAL  # DOCUMENTATION
   
 env.SConscript('doc/SConscript',['env'])  
2442    
2443    
 #------------------------------------------------------  
 # LIBASCEND DOXYGEN DOCUMENTATION  
   
2444  if not with_doc_build:  if not with_doc_build:
2445      print "Skipping... Windows installer isn't being built:",without_doc_build_reason      print "Skipping... Documentation isn't being built:",without_doc_build_reason
2446    
2447    #user's manual
2448    env.SConscript('doc/SConscript',['env'])
2449    
2450    # doxygen documentation
2451  env.SConscript('base/doc/SConscript',['env'])  env.SConscript('base/doc/SConscript',['env'])
2452    
2453  #------------------------------------------------------  #------------------------------------------------------

Legend:
Removed from v.1550  
changed lines
  Added in v.1551

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