/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 506 by johnpye, Tue Apr 18 14:30:39 2006 UTC revision 507 by johnpye, Wed Apr 19 02:44:25 2006 UTC
# Line 267  without_cunit_reason = "not requested" Line 267  without_cunit_reason = "not requested"
267  #print "WITH_BINTOKEN:",env['WITH_BINTOKEN']  #print "WITH_BINTOKEN:",env['WITH_BINTOKEN']
268  #print "DEFAULT_ASCENDLIBRARY:",env['DEFAULT_ASCENDLIBRARY']  #print "DEFAULT_ASCENDLIBRARY:",env['DEFAULT_ASCENDLIBRARY']
269    
 subst_dict = {  
     '@WEBHELPROOT@':'http://pye.dyndns.org/ascend/manual/'  
     , '@GLADE_FILE@':'ascend.glade'  
     , '@DEFAULT_ASCENDLIBRARY@':env['DEFAULT_ASCENDLIBRARY']  
     , '@ICON_EXTENSION@':icon_extension  
     , '@HELP_ROOT@':''  
     , '@INSTALL_DATA@':env['INSTALL_DATA']  
     , '@INSTALL_BIN@':env['INSTALL_BIN']  
     , '@INSTALL_INCLUDE@':env['INSTALL_INCLUDE']  
     , '@PYGTK_ASSETS@':env['PYGTK_ASSETS']  
     , '@VERSION@':version  
 }  
   
 if env['WITH_LOCAL_HELP']:  
     print "WITH_LOCAL_HELP:",env['WITH_LOCAL_HELP']  
     subst_dict['@HELP_ROOT@']=env['WITH_LOCAL_HELP']  
   
 if with_python:  
     subst_dict['@ASCXX_USE_PYTHON@']="1"  
   
270  can_install = True  can_install = True
271  if platform.system()=='Windows':  if platform.system()=='Windows':
272      can_install = False      can_install = False
273    
274  env['CAN_INSTALL']=can_install  env['CAN_INSTALL']=can_install
275    
 env.Append(SUBST_DICT=subst_dict)  
276    
277  #------------------------------------------------------  #------------------------------------------------------
278  # SPECIAL CONFIGURATION TESTS  # SPECIAL CONFIGURATION TESTS
# Line 615  if not conf.CheckFunc('isnan'): Line 594  if not conf.CheckFunc('isnan'):
594  if conf.CheckGcc():  if conf.CheckGcc():
595      conf.env['HAVE_GCC']=True;      conf.env['HAVE_GCC']=True;
596      if conf.CheckGccVisibility():      if conf.CheckGccVisibility():
597          conf.env['HAVE_GCCVISIBILITY']=True;          pass
598          conf.env.Append(CCFLAGS=['-fvisibility=hidden'])          #conf.env['HAVE_GCCVISIBILITY']=True;
599            #conf.env.Append(CCFLAGS=['-fvisibility=hidden'])
600            #conf.env.Append(CPPDEFINES=['HAVE_GCCVISIBILITY'])
601    
602  # YACC  # YACC
603    
# Line 731  env.Append(PYTHON_LIBPATH=[distutils.sys Line 712  env.Append(PYTHON_LIBPATH=[distutils.sys
712  env.Append(PYTHON_LIB=[python_lib])  env.Append(PYTHON_LIB=[python_lib])
713  env.Append(PYTHON_CPPPATH=[distutils.sysconfig.get_python_inc()])  env.Append(PYTHON_CPPPATH=[distutils.sysconfig.get_python_inc()])
714    
715    #---------------------------------------
716    # SUBSTITUTION DICTIONARY for .in files
717    
718    subst_dict = {
719        '@DEFAULT_ASCENDLIBRARY@':env['DEFAULT_ASCENDLIBRARY']
720        , '@GLADE_FILE@':'ascend.glade'
721        , '@HELP_ROOT@':''
722        , '@ICON_EXTENSION@':icon_extension
723        , '@INSTALL_DATA@':env['INSTALL_DATA']
724        , '@INSTALL_BIN@':env['INSTALL_BIN']
725        , '@INSTALL_INCLUDE@':env['INSTALL_INCLUDE']
726        , '@PYGTK_ASSETS@':env['PYGTK_ASSETS']
727        , '@VERSION@':version
728        , '@WEBHELPROOT@':'http://pye.dyndns.org/ascend/manual/'
729    }
730    
731    if env['WITH_LOCAL_HELP']:
732        print "WITH_LOCAL_HELP:",env['WITH_LOCAL_HELP']
733        subst_dict['@HELP_ROOT@']=env['WITH_LOCAL_HELP']
734    
735    if with_python:
736        subst_dict['@ASCXX_USE_PYTHON@']="1"
737    
738    if env.has_key('HAVE_GCCVISIBILITY'):
739        subst_dict['@HAVE_GCCVISIBILITY@'] = "1"
740    
741    env.Append(SUBST_DICT=subst_dict)
742    
743  #------------------------------------------------------  #------------------------------------------------------
744  # RECIPE: 'SubstInFile', used in pygtk SConscript  # RECIPE: 'SubstInFile', used in pygtk SConscript
745    

Legend:
Removed from v.506  
changed lines
  Added in v.507

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