/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1430 by jpye, Sun May 6 13:42:18 2007 UTC revision 1431 by jpye, Fri May 18 09:20:26 2007 UTC
# Line 1185  ida_test_text = """ Line 1185  ida_test_text = """
1185  # include <ida.h>  # include <ida.h>
1186  # include <ida/ida_spgmr.h>  # include <ida/ida_spgmr.h>
1187  #else  #else
1188    # error "NEW VERSION"
1189  # include <sundials/sundials_config.h>  # include <sundials/sundials_config.h>
1190  # include <nvector/nvector_serial.h>  # include <nvector/nvector_serial.h>
1191  # include <ida/ida.h>  # include <ida/ida.h>
# Line 1572  def sconsversioncheck(): Line 1573  def sconsversioncheck():
1573      v = SCons.__version__.split(".")      v = SCons.__version__.split(".")
1574      if v[0] != '0':      if v[0] != '0':
1575          return 0          return 0
1576        if int(v[1]) >= 97:
1577            return 1
1578      if v[1] != '96':      if v[1] != '96':
1579          return 0          return 0
1580      micro = int(v[2])      micro = int(v[2])
# Line 2157  if env.get('CAN_INSTALL'): Line 2160  if env.get('CAN_INSTALL'):
2160      # TODO: add install options      # TODO: add install options
2161      env.Alias('install',install_dirs)      env.Alias('install',install_dirs)
2162    
2163      env.InstallShared(env['INSTALL_ROOT']+env['INSTALL_LIB'],libascend)      env.InstallShared(env.subst("$INSTALL_ROOT$INSTALL_LIB"),libascend)
2164    
2165      env.InstallProgram(env['INSTALL_ROOT']+env['INSTALL_BIN'],ascendconfig)      env.InstallProgram(env.subst("$INSTALL_ROOT$INSTALL_BIN"),ascendconfig)
2166    
2167  #------------------------------------------------------  #------------------------------------------------------
2168  # WINDOWS INSTALLER  # WINDOWS INSTALLER
Legend:
Removed from v.1430  
changed lines
  Added in v.1431
john.pye@anu.edu.au
 ViewVC Help
Powered by ViewVC 1.1.22