/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 551 by johnpye, Sat Apr 29 04:19:17 2006 UTC revision 552 by johnpye, Sat Apr 29 08:53:04 2006 UTC
# Line 295  if platform.system()=="Windows": Line 295  if platform.system()=="Windows":
295  # Import the outside environment  # Import the outside environment
296    
297  if os.environ.has_key('OSTYPE') and os.environ['OSTYPE']=='msys':  if os.environ.has_key('OSTYPE') and os.environ['OSTYPE']=='msys':
298      env = Environment(ENV=os.environ, tools=['mingw','swig','lex','yacc'])      env = Environment(
299            ENV=os.environ
300            , tools=['mingw','lex','yacc','fortran','swig','disttar']
301            , toolpath=['scons']
302        )
303      env['IS_MINGW']=True      env['IS_MINGW']=True
304  else:  else:
305      env = Environment(ENV=os.environ)      env = Environment(
306      Tool('lex')(env)          ENV=os.environ
307      Tool('yacc')(env)          ,tools=['default','lex','yacc','fortran','swig','disttar']
308      Tool('fortran')(env)          , toolpath=['scons']
309      Tool('swig')(env)      )
310    
311  if platform.system()=='Windows' and env.has_key('MSVS'):  if platform.system()=='Windows' and env.has_key('MSVS'):
312      print "INCLUDE =",env['ENV']['INCLUDE']      print "INCLUDE =",env['ENV']['INCLUDE']
# Line 583  def CheckTclVersion(context): Line 587  def CheckTclVersion(context):
587          return 0          return 0
588                    
589      # good version      # good version
590      context.Result(output+" (good)")      context.Result(output+", good")
591      return 1      return 1
592    
593  #----------------  #----------------
# Line 1211  else: Line 1215  else:
1215  #------------------------------------------------------  #------------------------------------------------------
1216  # INSTALLATION  # INSTALLATION
1217    
1218  if env.has_key('CAN_INSTALL') and env['CAN_INSTALL']:  if env.get('CAN_INSTALL'):
1219      # the models directory only needs to be processed for installation, no other processing required.      # the models directory only needs to be processed for installation, no other processing required.
1220      env.SConscript(['models/SConscript'],'env')      env.SConscript(['models/SConscript'],'env')
1221    
# Line 1228  if env.has_key('CAN_INSTALL') and env['C Line 1232  if env.has_key('CAN_INSTALL') and env['C
1232    
1233  if platform.system()=="Linux":  if platform.system()=="Linux":
1234      env.SubstInFile('ascend.spec.in')      env.SubstInFile('ascend.spec.in')
1235    
1236    #------------------------------------------------------
1237    # DISTRIBUTION TAR FILE
1238    
1239    #subdirs = Split("base tcltk pygtk lsod blas emacsMode linpack models jam scons test")
1240    #rootfiles = Split("ascend.spec.in SConstruct LICENSE.txt INSTALL")
1241    #
1242    #env['DISTTAR_FORMAT']='bz2'
1243    #
1244    #tar = env.DistTar("dist/ascend"
1245    #   , rootfiles + [env.Dir(d) for d in subdirs]
1246    #)
1247    #
1248    #env.Alias('dist',tar)

Legend:
Removed from v.551  
changed lines
  Added in v.552

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