/[ascend]/branches/adrian/nsis/installer.nsi
ViewVC logotype

Diff of /branches/adrian/nsis/installer.nsi

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

revision 2943 by adrian, Wed Jun 3 22:05:25 2015 UTC revision 2944 by adrian, Thu Jun 4 20:28:52 2015 UTC
# Line 62  Var PYPATH Line 62  Var PYPATH
62  Var HAVE_GTK  Var HAVE_GTK
63  Var HAVE_PYGOBJECT  Var HAVE_PYGOBJECT
64  Var HAVE_PYCAIRO  Var HAVE_PYCAIRO
65    Var HAVE_GTKSOURCEVIEW
66  Var PYINSTALLED  Var PYINSTALLED
67    
68  Var PDFINSTALLED  Var PDFINSTALLED
# Line 172  Section "ASCEND (required)" Line 173  Section "ASCEND (required)"
173      ${IfNot} $ASCENDLIBRARY == "%ASCENDLIBRARY%"      ${IfNot} $ASCENDLIBRARY == "%ASCENDLIBRARY%"
174          StrCpy $ASCENDENVVARFOUND "1"          StrCpy $ASCENDENVVARFOUND "1"
175      ${EndIf}      ${EndIf}
176        
177      ; Write the installation path into the registry      ; Write the installation path into the registry
178      WriteRegStr HKLM SOFTWARE\ASCEND "Install_Dir" "$INSTDIR"      WriteRegStr HKLM SOFTWARE\ASCEND "Install_Dir" "$INSTDIR"
179    
# Line 213  Section "GTK GUI" sect_pygtk Line 214  Section "GTK GUI" sect_pygtk
214          MessageBox MB_OK "GTK GUI cannot be installed, because PyCairo was not found on this system.$\nIf you do want to use the GTK GUI, please install Cairo from PyGObject for Windows$\n"          MessageBox MB_OK "GTK GUI cannot be installed, because PyCairo was not found on this system.$\nIf you do want to use the GTK GUI, please install Cairo from PyGObject for Windows$\n"
215      ${ElseIf} $HAVE_PYGOBJECT == 'NOK'      ${ElseIf} $HAVE_PYGOBJECT == 'NOK'
216          MessageBox MB_OK "GTK GUI cannot be installed, because PyGObject was not found on this system.$\nIf you do want to use the GTK GUI, please install GOBject from PyGObject for Windows$\n"          MessageBox MB_OK "GTK GUI cannot be installed, because PyGObject was not found on this system.$\nIf you do want to use the GTK GUI, please install GOBject from PyGObject for Windows$\n"
217        ${ElseIf} $HAVE_GTKSOURCEVIEW == 'NOK'
218            MessageBox MB_OK "GTK GUI cannot be installed, because PyGObject was not found on this system.$\nIf you do want to use the GTK GUI, please install GTKSourceView from PyGObject for Windows$\n"
219      ${Else}      ${Else}
220          ;MessageBox MB_OK "Python: $PYPATH, GTK: $GTKPATH"          ;MessageBox MB_OK "Python: $PYPATH, GTK: $GTKPATH"
221    
# Line 574  Function .onInit Line 577  Function .onInit
577    
578      Call DetectPython      Call DetectPython
579      Call DetectGTK      Call DetectGTK
580        Call DetectGTKSourceView
581      Call DetectPyGObject      Call DetectPyGObject
582      Call DetectPyCairo      Call DetectPyCairo
583            

Legend:
Removed from v.2943  
changed lines
  Added in v.2944

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