/[ascend]/trunk/nsis/installer.nsi
ViewVC logotype

Diff of /trunk/nsis/installer.nsi

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

revision 1572 by jpye, Sat Aug 4 07:53:42 2007 UTC revision 1573 by jpye, Sat Aug 4 09:37:03 2007 UTC
# Line 82  Var /GLOBAL PYGTKDOWNLOAD Line 82  Var /GLOBAL PYGTKDOWNLOAD
82  Var /GLOBAL PYGOBJECTDOWNLOAD  Var /GLOBAL PYGOBJECTDOWNLOAD
83  Var /GLOBAL PYCAIRODOWNLOAD  Var /GLOBAL PYCAIRODOWNLOAD
84  Var /GLOBAL GTKDOWNLOAD  Var /GLOBAL GTKDOWNLOAD
85    Var /GLOBAL TCLDOWNLOAD
86    
87  Var /GLOBAL ASCENDINIFOUND  Var /GLOBAL ASCENDINIFOUND
88    
# Line 146  FunctionEnd Line 147  FunctionEnd
147  !define PYGTK_URL "http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/2.10/${PYGTK_FN}"  !define PYGTK_URL "http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/2.10/${PYGTK_FN}"
148  !define PYGTK_CMD "$DAI_TMPFILE"  !define PYGTK_CMD "$DAI_TMPFILE"
149    
150    !define TCL_VERSION "8.4.15"
151    !define TCL_PATCH ".0.280619"
152    !define TCL_FN "ActiveTcl${TCL_VERSION}${TCL_PATCH}-win32-ix86-threaded.exe"
153    !define TCL_URL "http://downloads.activestate.com/ActiveTcl/Windows/${TCL_VERSION}/${TCL_FN}"
154    !define TCL_CMD "$DAI_TMPFILE"
155  !include "download.nsi"  !include "download.nsi"
156    
157  Section "-python"  Section "-python"
# Line 199  Section "-pygtk" Line 205  Section "-pygtk"
205          Pop $PYGTKOK          Pop $PYGTKOK
206    
207          ${EndIf}          ${EndIf}
208  SectionEnd    SectionEnd
209    Section "-tcl"
210        DetailPrint "--- DOWNLOAD TCL/TK ---"
211        ${If} $TCLDOWNLOAD == '1'
212            !insertmacro downloadAndInstall "Tcl/Tk" ${TCL_URL} ${TCL_FN} ${TCL_CMD}
213            Call DetectTcl
214            Pop $TCLOK
215            Pop $TCLPATH
216            ${EndIf}
217    SectionEnd
218    
219  ;------------------------------------------------------------------------  ;------------------------------------------------------------------------
220  ; INSTALL CORE STUFF including model library  ; INSTALL CORE STUFF including model library

Legend:
Removed from v.1572  
changed lines
  Added in v.1573

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