/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2131 by mahesh, Fri Dec 18 03:43:36 2009 UTC revision 2132 by jpye, Fri Dec 18 06:02:27 2009 UTC
# Line 41  default_tcl_lib = "tcl8.5" Line 41  default_tcl_lib = "tcl8.5"
41  default_tk_lib = "tk8.5"  default_tk_lib = "tk8.5"
42  default_tktable_lib = "Tktable2.9"  default_tktable_lib = "Tktable2.9"
43  default_ida_prefix="$DEFAULT_PREFIX"  default_ida_prefix="$DEFAULT_PREFIX"
44    default_ipopt_libpath = "$IPOPT_PREFIX/lib"
45    default_ipopt_dll = "$IPOPT_LIBPATH/ipopt38.dll"
46    default_ipopt_libs = ["$F2C_LIB","blas","lapack","pthread","ipopt"]
47  default_conopt_prefix="$DEFAULT_PREFIX"  default_conopt_prefix="$DEFAULT_PREFIX"
48  default_conopt_libpath="$CONOPT_PREFIX"  default_conopt_libpath="$CONOPT_PREFIX"
49  default_conopt_cpppath="$CONOPT_PREFIX"  default_conopt_cpppath="$CONOPT_PREFIX"
# Line 84  if platform.system()=="Windows": Line 87  if platform.system()=="Windows":
87            
88      # where to look for IDA solver libraries, headers, etc.      # where to look for IDA solver libraries, headers, etc.
89      default_ida_prefix = "c:\\MinGW"      default_ida_prefix = "c:\\MinGW"
90        
91        # IPOPT
92        default_ipopt_libpath = "$IPOPT_PREFIX/lib/win32/release"
93        default_ipopt_libs = ["ipopt"]
94    
95      # where to look for CONOPT when compiling      # where to look for CONOPT when compiling
96      default_conopt_prefix = "c:\\Program Files\\CONOPT"      default_conopt_prefix = "c:\\Program Files\\CONOPT"
# Line 477  opts.Add(PackageOption( Line 484  opts.Add(PackageOption(
484  opts.Add(  opts.Add(
485      "IPOPT_LIBS"      "IPOPT_LIBS"
486      ,"Library linked to for IPOPT"      ,"Library linked to for IPOPT"
487      ,["$F2C_LIB","blas","lapack","pthread","ipopt"]      ,default_ipopt_libs
488  )  )
489    
490    
491  opts.Add(  opts.Add(
492      "IPOPT_LIBPATH"      "IPOPT_LIBPATH"
493      ,"Where is your IPOPT library installed"      ,"Where is your IPOPT library installed"
494      ,"$IPOPT_PREFIX/lib"      ,default_ipopt_libpath
495  )  )
496    
497  opts.Add(  opts.Add(
# Line 493  opts.Add( Line 500  opts.Add(
500      ,"$IPOPT_PREFIX/include"      ,"$IPOPT_PREFIX/include"
501  )  )
502    
503    opts.Add(
504        'IPOPT_DLL'
505        ,"Exact path of IPOPT DLL to be included in the installer (Windows only)"
506        ,default_ipopt_dll
507    )
508    
509    
510    
511  #------- TRON -------  #------- TRON -------
512    
# Line 2903  if with_installer: Line 2917  if with_installer:
2917          'OUTFILE':"#dist/"+env['WIN_INSTALLER_NAME']          'OUTFILE':"#dist/"+env['WIN_INSTALLER_NAME']
2918          ,"VERSION":version          ,"VERSION":version
2919          ,'PYVERSION':pyversion          ,'PYVERSION':pyversion
2920            ,'IPOPTDLL':os.path.normpath(env['IPOPT_DLL'])
2921      })      })
2922      installer = env.Installer('nsis/installer.nsi')      installer = env.Installer('nsis/installer.nsi')
2923      env.Depends(installer,["pygtk","tcltk","ascend.dll","models","solvers","ascend-config",'pygtk/ascend'])      env.Depends(installer,["pygtk","tcltk","ascend.dll","models","solvers","ascend-config",'pygtk/ascend'])

Legend:
Removed from v.2131  
changed lines
  Added in v.2132

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