/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2026 by jpye, Thu Apr 30 02:15:05 2009 UTC revision 2027 by jpye, Thu Apr 30 08:27:56 2009 UTC
# Line 4  Line 4 
4  # much less tested.  # much less tested.
5    
6  # version number for this ASCEND build:  # version number for this ASCEND build:
7  version = "0.9.5.116"  version = "0.9.6"
8    
9  # shared library API numbering, for Linux (FIXME windows too?)  # shared library API numbering, for Linux (FIXME windows too?)
10  soname_major = ".1"  soname_major = ".1"
# Line 2169  if conf.CheckFunc('isnan') is False and Line 2169  if conf.CheckFunc('isnan') is False and
2169    
2170  if conf.CheckGcc():  if conf.CheckGcc():
2171      conf.env['HAVE_GCC']=True;      conf.env['HAVE_GCC']=True;
2172      if env['WITH_GCCVISIBILITY'] and conf.CheckGccVisibility():      if env.get('WITH_GCCVISIBILITY') and conf.CheckGccVisibility():
2173          conf.env['HAVE_GCCVISIBILITY']=True;          conf.env['HAVE_GCCVISIBILITY']=True;
2174          conf.env.Append(CCFLAGS=['-fvisibility=hidden'])          conf.env.Append(CCFLAGS=['-fvisibility=hidden'])
2175          conf.env.Append(CPPDEFINES=['HAVE_GCCVISIBILITY'])          conf.env.Append(CPPDEFINES=['HAVE_GCCVISIBILITY'])
# Line 2788  if with_installer: Line 2788  if with_installer:
2788          ,'PYVERSION':pyversion          ,'PYVERSION':pyversion
2789      })      })
2790      installer = env.Installer('nsis/installer.nsi')      installer = env.Installer('nsis/installer.nsi')
2791      Depends(installer,["pygtk","tcltk","ascend.dll","models","solvers","ascend-config"])      Depends(installer,["pygtk","tcltk","ascend.dll","models","solvers","ascend-config",'pygtk/ascend'])
2792      env.Alias('installer',installer)      env.Alias('installer',installer)
2793  else:  else:
2794      print "Skipping... Windows installer isn't being built:",without_installer_reason      print "Skipping... Windows installer isn't being built:",without_installer_reason

Legend:
Removed from v.2026  
changed lines
  Added in v.2027

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