/[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 1076 by johnpye, Tue Jan 9 03:29:03 2007 UTC revision 1381 by jpye, Fri Apr 6 06:54:51 2007 UTC
# Line 23  OutFile ascend-setup.exe Line 23  OutFile ascend-setup.exe
23  !endif  !endif
24    
25    
26  ;SetCompressor /FINAL zlib  SetCompressor /FINAL zlib
27  SetCompressor /SOLID lzma  ;SetCompressor /SOLID lzma
28    
29  ; The default installation directory  ; The default installation directory
30  InstallDir $PROGRAMFILES\ASCEND  InstallDir $PROGRAMFILES\ASCEND
# Line 46  UninstPage instfiles Line 46  UninstPage instfiles
46    
47  ;--------------------------------  ;--------------------------------
48    
49    Var /GLOBAL DEFAULTPATH
50  Var /GLOBAL PYOK  Var /GLOBAL PYOK
51  Var /GLOBAL PYPATH  Var /GLOBAL PYPATH
52  Var /GLOBAL GTKOK  Var /GLOBAL GTKOK
# Line 56  Var /GLOBAL PYINSTALLED Line 57  Var /GLOBAL PYINSTALLED
57  Var /GLOBAL TCLOK  Var /GLOBAL TCLOK
58  Var /GLOBAL TCLPATH  Var /GLOBAL TCLPATH
59  Var /GLOBAL TCLINSTALLED  Var /GLOBAL TCLINSTALLED
60    Var /GLOBAL PATH
61    
62  Function .onInit  Function .onInit
63      StrCpy $PYINSTALLED ""      StrCpy $PYINSTALLED ""
64      StrCpy $TCLINSTALLED ""      StrCpy $TCLINSTALLED ""
65        
66        ExpandEnvStrings $DEFAULTPATH "%WINDIR%;%WINDIR%\system32"
67    
68      Call DetectPython      Call DetectPython
69      Pop $PYOK      Pop $PYOK
# Line 77  Function .onInit Line 81  Function .onInit
81      Pop $TCLOK      Pop $TCLOK
82      Pop $TCLPATH          Pop $TCLPATH    
83            
84        StrCpy $PATH "$DEFAULTPATH;$PYPATH;$GTKPATH"
85    
86  FunctionEnd  FunctionEnd
87    
88    
# Line 133  Section "ASCEND (required)" Line 139  Section "ASCEND (required)"
139      FileWrite $0 "@echo off"      FileWrite $0 "@echo off"
140      FileWriteByte $0 "13"      FileWriteByte $0 "13"
141      FileWriteByte $0 "10"      FileWriteByte $0 "10"
142      FileWrite $0 "set PATH=$PYPATH;$GTKPATH"      FileWrite $0 "set PATH=$PATH"
143      FileWriteByte $0 "13"      FileWriteByte $0 "13"
144      FileWriteByte $0 "10"      FileWriteByte $0 "10"
145      FileWrite $0 "cd "      FileWrite $0 "cd "
# Line 183  Section "PyGTK GUI" Line 189  Section "PyGTK GUI"
189                  FileWrite $0 "@echo off"                  FileWrite $0 "@echo off"
190                  FileWriteByte $0 "13"                  FileWriteByte $0 "13"
191                  FileWriteByte $0 "10"                  FileWriteByte $0 "10"
192                  FileWrite $0 "set PATH=$PYPATH;$GTKPATH"                  FileWrite $0 "set PATH=$PATH"
193                  FileWriteByte $0 "13"                  FileWriteByte $0 "13"
194                  FileWriteByte $0 "10"                  FileWriteByte $0 "10"
195                  FileWrite $0 "cd "                  FileWrite $0 "cd "
Legend:
Removed from v.1076  
changed lines
  Added in v.1381
john.pye@anu.edu.au
 ViewVC Help
Powered by ViewVC 1.1.22