Changeset 7512
- Timestamp:
- Sep 16, 2009, 4:41:12 PM (15 years ago)
- Location:
- installation_files/windows
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
installation_files/windows/installer.nsi
r7502 r7512 31 31 Var Control2 32 32 Var Control3 33 Var Control4 33 34 34 35 # UI config … … 101 102 # compile anuga 102 103 SetOutPath "$PackagesDir\anuga" 103 Exec '"$PythonDir\python.exe" "$OUTDIR\compile_all.py"'104 ExecWait '"$PythonDir\python.exe" "$OUTDIR\compile_all.py"' 104 105 SectionEnd 105 106 … … 107 108 # test anuga 108 109 SetOutPath "$PackagesDir\anuga" 109 Exec '"$PythonDir\python.exe" "$OUTDIR\test_all.py"'110 ExecWait '"$PythonDir\python.exe" "$OUTDIR\test_all.py"' 110 111 SectionEnd 111 112 … … 156 157 WriteRegDWORD HKLM "SOFTWARE\${ProductName}" "ScientificPythonInstalled" "" 157 158 WriteRegDWORD HKLM "SOFTWARE\${ProductName}" "NumericPythonInstalled" "" 159 WriteRegDWORD HKLM "SOFTWARE\${ProductName}" "MatplotlibInstalled" "" 158 160 WriteRegDWORD HKLM "SOFTWARE\${ProductName}" "MinGWInstalled" "$MinGWInst" 159 161 WriteRegStr HKLM "SOFTWARE\${ProductName}" "MinGWDir" "$MinGWDir" … … 284 286 ${NSD_CreateLabel} 40 100 350 28 "$(page_extensions_scientific_ok)" 285 287 Pop $Control2 288 ${NSD_CreateLabel} 40 150 350 28 "$(page_extensions_matplotlib_ok)" 289 Pop $Control3 286 290 ${NSD_CreateLabel} 10 190 430 28 "$(page_extensions_outro_next)" 287 Pop $Control 3291 Pop $Control4 288 292 289 293 StrCpy $1 "0" 290 294 StrCpy $2 "0" 291 295 StrCpy $3 "0" 296 StrCpy $4 "0" 297 StrCpy $5 "0" 292 298 IfFileExists "$PackagesDir\Numpy\*.py" 0 +2 293 299 IntOp $1 $1 + 1 294 300 IfFileExists "$PackagesDir\Scientific\*.py" 0 +2 295 301 IntOp $2 $2 + 1 296 IntOp $3 $2 + $1 302 IfFileExists "$PackagesDir\matplotlib\*.py" 0 +2 303 IntOp $3 $3 + 1 304 IntOp $4 $2 + $1 305 IntOp $5 $4 + $3 297 306 298 307 IntCmp $1 0 0 num_ok num_ok … … 303 312 ${NSD_SetText} $Control2 "$(page_extensions_scientific_label_install)" 304 313 scien_ok: 305 306 IntCmp $3 2 no_inst 307 ${NSD_SetText} $Control3 "$(page_extensions_outro_install)" 314 315 IntCmp $3 0 0 matp_ok matp_ok 316 ${NSD_SetText} $Control3 "$(page_extensions_matplotlib_label_install)" 317 matp_ok: 318 319 IntCmp $5 3 no_inst 320 ${NSD_SetText} $Control4 "$(page_extensions_outro_install)" 308 321 ${NSD_SetText} $Control0 "$(^InstallBtn)" 309 322 no_inst: … … 313 326 314 327 Function LeaveExtensions 315 IntCmp $ 30 +2328 IntCmp $5 0 +2 316 329 Return 317 330 … … 327 340 ExecWait '"${TemporaryFilesDir}\${ScientificInst}"' 328 341 after_scien: 342 343 StrCmp $3 1 after_matp 344 File "${FileSource}\prereqs\${MatplotlibInst}" 345 ExecWait '"${TemporaryFilesDir}\${MatplotlibInst}"' 346 after_matp: 347 329 348 FunctionEnd 330 349 -
installation_files/windows/installer.py
r7504 r7512 5 5 numpy, 6 6 scientific_python, 7 matplotlib, 7 8 netcdf, 8 9 mingw): … … 37 38 file.write('!define NumpyInst "' + numpy + '"\n') 38 39 file.write('!define ScientificInst "' + scientific_python + '"\n') 40 file.write('!define MatplotlibInst "' + matplotlib + '"\n') 39 41 file.write('!define NetCDFFolder "' + netcdf + '"\n') 40 42 file.write('!define MinGWInst "' + mingw + '"\n\n') -
installation_files/windows/translation.nsh
r7488 r7512 34 34 LangString page_extensions_numpy_ok ${_CUR_LANG} "Numpy is installed!" 35 35 LangString page_extensions_scientific_ok ${_CUR_LANG} "ScientificPython is installed!" 36 LangString page_extensions_matplotlib_ok ${_CUR_LANG} "Matplotlib is installed!" 36 37 LangString page_extensions_numpy_label_install ${_CUR_LANG} "Numpy will be installed!" 37 38 LangString page_extensions_scientific_label_install ${_CUR_LANG} "ScientificPython will be installed!" 39 LangString page_extensions_matplotlib_label_install ${_CUR_LANG} "Matplotlib will be installed!" 38 40 LangString page_extensions_outro_next ${_CUR_LANG} "$(^ClickNext)" 39 41 LangString page_extensions_outro_install ${_CUR_LANG} "$(^ClickInstall)"
Note: See TracChangeset
for help on using the changeset viewer.