/[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 1570 by jpye, Fri Aug 3 14:18:08 2007 UTC revision 1571 by jpye, Fri Aug 3 15:50:59 2007 UTC
# Line 51  Page components Line 51  Page components
51  Page directory  Page directory
52  Page custom dependenciesCreate dependenciesLeave  Page custom dependenciesCreate dependenciesLeave
53  Page instfiles  Page instfiles
54    Page custom ascendIniCreate ascendIniLeave
55    
56  UninstPage uninstConfirm  UninstPage uninstConfirm
57  UninstPage instfiles  UninstPage instfiles
# Line 79  Var /GLOBAL PYGOBJECTDOWNLOAD Line 80  Var /GLOBAL PYGOBJECTDOWNLOAD
80  Var /GLOBAL PYCAIRODOWNLOAD  Var /GLOBAL PYCAIRODOWNLOAD
81  Var /GLOBAL GTKDOWNLOAD  Var /GLOBAL GTKDOWNLOAD
82    
83    Var /GLOBAL ASCENDINIFOUND
84    
85  Function .onInit  Function .onInit
86      StrCpy $PYINSTALLED ""      StrCpy $PYINSTALLED ""
87      StrCpy $TCLINSTALLED ""      StrCpy $TCLINSTALLED ""
88        StrCpy $ASCENDINIFOUND ""
89            
90      ExpandEnvStrings $DEFAULTPATH "%WINDIR%;%WINDIR%\system32"      ExpandEnvStrings $DEFAULTPATH "%WINDIR%;%WINDIR%\system32"
91    
# Line 120  FunctionEnd Line 124  FunctionEnd
124  !define PYTHON_VERSION "${PYVERSION}${PYPATCH}"  !define PYTHON_VERSION "${PYVERSION}${PYPATCH}"
125  !define PYTHON_FN "python-${PYTHON_VERSION}.msi"  !define PYTHON_FN "python-${PYTHON_VERSION}.msi"
126  !define PYTHON_URL "http://www.python.org/ftp/python/${PYTHON_VERSION}/${PYTHON_FN}"  !define PYTHON_URL "http://www.python.org/ftp/python/${PYTHON_VERSION}/${PYTHON_FN}"
127  !define PYTHON_CMD "msiexec /i /passive $$DAI_TMPFILE"  !define PYTHON_CMD "msiexec /i $DAI_TMPFILE /passive"
128    
129  !define GTK_FN "gtk-2.10.11-win32-1.exe"  !define GTK_FN "gtk-2.10.11-win32-1.exe"
130  !define GTK_URL "http://downloads.sourceforge.net/gladewin32/${GTK_FN}"  !define GTK_URL "http://downloads.sourceforge.net/gladewin32/${GTK_FN}"
131  !define GTK_CMD "${GTK_FN}"  !define GTK_CMD "$DAI_TMPFILE"
132    
133  !define PYGOBJECT_FN "pygobject-2.12.3-1.win32-py${PYVERSION}.exe"  !define PYGOBJECT_FN "pygobject-2.12.3-1.win32-py${PYVERSION}.exe"
134  !define PYGOBJECT_URL "http://ftp.gnome.org/pub/GNOME/binaries/win32/pygobject/2.12/${PYGOBJECT_FN}"  !define PYGOBJECT_URL "http://ftp.gnome.org/pub/GNOME/binaries/win32/pygobject/2.12/${PYGOBJECT_FN}"
135  !define PYGOBJECT_CMD "${PYGOBJECT_FN}"  !define PYGOBJECT_CMD "$DAI_TMPFILE"
136    
137  !define PYCAIRO_FN "pycairo-1.2.6-1.win32-py${PYVERSION}.exe"  !define PYCAIRO_FN "pycairo-1.2.6-1.win32-py${PYVERSION}.exe"
138  !define PYCAIRO_URL "http://ftp.gnome.org/pub/GNOME/binaries/win32/pycairo/1.2/${PYCAIRO_FN}"  !define PYCAIRO_URL "http://ftp.gnome.org/pub/GNOME/binaries/win32/pycairo/1.2/${PYCAIRO_FN}"
139  !define PYCAIRO_CMD "${PYGOBJECT_FN}"  !define PYCAIRO_CMD "$DAI_TMPFILE"
140    
141  !define PYGTK_FN "pygtk-2.10.4-1.win32-py${PYVERSION}.exe"  !define PYGTK_FN "pygtk-2.10.4-1.win32-py${PYVERSION}.exe"
142  !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}"
143  !define PYGTK_CMD "${PYGTK_FN}"  !define PYGTK_CMD "$DAI_TMPFILE"
144    
145  !include "download.nsi"  !include "download.nsi"
146    
147  Section "-python"  Section "-python"
148      DetailPrint "--- DOWNLOAD PYTHON ---"      DetailPrint "--- DOWNLOAD PYTHON ---"
149          ${If} $PYDOWNLOAD == '1'          ${If} $PYDOWNLOAD == '1'
150                !insertmacro downloadAndInstall "Python" "${PYTHON_URL}" "${PYTHON_FN}" "${PYTHON_CMD}"          !insertmacro downloadAndInstall "Python" "${PYTHON_URL}" "${PYTHON_FN}" "${PYTHON_CMD}"
151                  Call DetectPython          Call DetectPython
152                  Pop $PYOK          Pop $PYOK
153                  Pop $PYPATH          Pop $PYPATH
154            ${If} $PYOK == 'NOK'
155                MessageBox MB_OK "Python installation appears to have failed"
156            ${EndIf}
157          ${EndIf}          ${EndIf}
158  SectionEnd  SectionEnd
159  Section "-gtk"  Section "-gtk"
160      DetailPrint "--- DOWNLOAD GTK+ ---"      DetailPrint "--- DOWNLOAD GTK+ ---"
161      ${If} $GTKDOWNLOAD == '1'      ${If} $GTKDOWNLOAD == '1'
162                !insertmacro downloadAndInstall "GTK+" ${GTK_URL} ${GTK_FN} ${GTK_CMD}          !insertmacro downloadAndInstall "GTK+" ${GTK_URL} ${GTK_FN} ${GTK_CMD}
163                  Call DetectGTK          Call DetectGTK
164                  Pop $GTKOK          Pop $GTKOK
165                  Pop $GTKPATH          Pop $GTKPATH
166                  Call DetectGlade          Call DetectGlade
167                  Pop $GLADEOK          Pop $GLADEOK
168                  Pop $GLADEPATH          Pop $GLADEPATH
169          ${EndIf}          ${EndIf}
170  SectionEnd  SectionEnd
171  Section "-pygobject"  Section "-pygobject"
172      DetailPrint "--- DOWNLOAD PYGOBJECT ---"      DetailPrint "--- DOWNLOAD PYGOBJECT ---"
173          ${If} $PYGOBJECTDOWNLOAD == '1'          ${If} $PYGOBJECTDOWNLOAD == '1'
174                !insertmacro downloadAndInstall "PyGObject" ${PYGOBJECT_URL} ${PYGOBJECT_FN} ${PYGOBJECT_CMD}          ${AndIf} $PYOK == 'OK'
175                  Call DetectPyGObject          !insertmacro downloadAndInstall "PyGObject" ${PYGOBJECT_URL} ${PYGOBJECT_FN} ${PYGOBJECT_CMD}
176                  Pop $PYGOBJECTOK          Call DetectPyGObject
177            Pop $PYGOBJECTOK
178          ${EndIf}          ${EndIf}
179  SectionEnd  SectionEnd
180  Section "-pycairo"  Section "-pycairo"
181      DetailPrint "--- DOWNLOAD PYCAIRO ---"      DetailPrint "--- DOWNLOAD PYCAIRO ---"
182          ${If} $PYCAIRODOWNLOAD == '1'          ${If} $PYCAIRODOWNLOAD == '1'
183                !insertmacro downloadAndInstall "PyCairo" ${PYCAIRO_URL} ${PYCAIRO_FN} ${PYCAIRO_CMD}          ${AndIf} $PYOK == 'OK'
184            !insertmacro downloadAndInstall "PyCairo" ${PYCAIRO_URL} ${PYCAIRO_FN} ${PYCAIRO_CMD}
185          Call DetectPyCairo          Call DetectPyCairo
186          Pop $PYCAIROOK          Pop $PYCAIROOK
187          ${EndIf}          ${EndIf}
# Line 180  SectionEnd Line 189  SectionEnd
189  Section "-pygtk"  Section "-pygtk"
190      DetailPrint "--- DOWNLOAD PYGTK ---"      DetailPrint "--- DOWNLOAD PYGTK ---"
191          ${If} $PYGTKDOWNLOAD == '1'          ${If} $PYGTKDOWNLOAD == '1'
192                !insertmacro downloadAndInstall "PyGTK" ${PYGTK_URL} ${PYGTK_FN} ${PYGTK_CMD}          ${AndIf} $PYOK == 'OK'
193            !insertmacro downloadAndInstall "PyGTK" ${PYGTK_URL} ${PYGTK_FN} ${PYGTK_CMD}
194          Call DetectPyGTK          Call DetectPyGTK
195          Pop $PYGTKOK          Pop $PYGTKOK
196    
# Line 225  Section "ASCEND (required)" Line 235  Section "ASCEND (required)"
235      File "..\tools\textpad\ascend.syn"      File "..\tools\textpad\ascend.syn"
236    
237      ${If} ${FileExists} "$APPDATA\.ascend.ini"      ${If} ${FileExists} "$APPDATA\.ascend.ini"
238          MessageBox MB_OK "The '$APPDATA\.ascend.ini' is NOT being updated. Manually delete this file if ASCEND doesn't behave as expected."          StrCpy $ASCENDINIFOUND "1"
239      ${Else}      ${Else}
240          ; Set 'librarypath' in .ascend.ini          ; Set 'librarypath' in .ascend.ini
241          WriteINIstr $APPDATA\.ascend.ini Directories librarypath "$DOCUMENTS\ascdata;$INSTDIR\models"          WriteINIstr $APPDATA\.ascend.ini Directories librarypath "$DOCUMENTS\ascdata;$INSTDIR\models"
# Line 529  SectionEnd Line 539  SectionEnd
539  !include "dependencies.nsi"  !include "dependencies.nsi"
540    
541  !include "detect.nsi"  !include "detect.nsi"
542    
543    !include "ascendini.nsi"

Legend:
Removed from v.1570  
changed lines
  Added in v.1571

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