Changeset 7512


Ignore:
Timestamp:
Sep 16, 2009, 4:41:12 PM (14 years ago)
Author:
nariman
Message:

addition of matplotlib

Location:
installation_files/windows
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • installation_files/windows/installer.nsi

    r7502 r7512  
    3131Var Control2
    3232Var Control3
     33Var Control4
    3334
    3435# UI config
     
    101102  # compile anuga
    102103  SetOutPath "$PackagesDir\anuga"
    103   Exec '"$PythonDir\python.exe" "$OUTDIR\compile_all.py"'
     104  ExecWait '"$PythonDir\python.exe" "$OUTDIR\compile_all.py"'
    104105SectionEnd
    105106
     
    107108  # test anuga
    108109  SetOutPath "$PackagesDir\anuga"
    109   Exec '"$PythonDir\python.exe" "$OUTDIR\test_all.py"'
     110  ExecWait '"$PythonDir\python.exe" "$OUTDIR\test_all.py"'
    110111SectionEnd
    111112
     
    156157  WriteRegDWORD HKLM "SOFTWARE\${ProductName}" "ScientificPythonInstalled" ""
    157158  WriteRegDWORD HKLM "SOFTWARE\${ProductName}" "NumericPythonInstalled" ""
     159  WriteRegDWORD HKLM "SOFTWARE\${ProductName}" "MatplotlibInstalled" ""
    158160  WriteRegDWORD HKLM "SOFTWARE\${ProductName}" "MinGWInstalled" "$MinGWInst"
    159161  WriteRegStr HKLM "SOFTWARE\${ProductName}" "MinGWDir" "$MinGWDir"
     
    284286  ${NSD_CreateLabel} 40 100 350 28 "$(page_extensions_scientific_ok)"
    285287  Pop $Control2
     288  ${NSD_CreateLabel} 40 150 350 28 "$(page_extensions_matplotlib_ok)"
     289  Pop $Control3
    286290  ${NSD_CreateLabel} 10 190 430 28 "$(page_extensions_outro_next)"
    287   Pop $Control3
     291  Pop $Control4
    288292 
    289293  StrCpy $1 "0"
    290294  StrCpy $2 "0"
    291295  StrCpy $3 "0"
     296  StrCpy $4 "0"
     297  StrCpy $5 "0"
    292298  IfFileExists "$PackagesDir\Numpy\*.py" 0 +2
    293299  IntOp $1 $1 + 1
    294300  IfFileExists "$PackagesDir\Scientific\*.py" 0 +2
    295301  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
    297306 
    298307  IntCmp $1 0 0 num_ok num_ok
     
    303312  ${NSD_SetText} $Control2 "$(page_extensions_scientific_label_install)"
    304313  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)"
    308321  ${NSD_SetText} $Control0 "$(^InstallBtn)"
    309322  no_inst:
     
    313326
    314327Function LeaveExtensions
    315   IntCmp $3 0 +2
     328  IntCmp $5 0 +2
    316329  Return
    317330
     
    327340  ExecWait '"${TemporaryFilesDir}\${ScientificInst}"'
    328341  after_scien:
     342
     343  StrCmp $3 1 after_matp
     344  File "${FileSource}\prereqs\${MatplotlibInst}"
     345  ExecWait '"${TemporaryFilesDir}\${MatplotlibInst}"'
     346  after_matp:
     347
    329348FunctionEnd
    330349
  • installation_files/windows/installer.py

    r7504 r7512  
    55                  numpy,
    66                  scientific_python,
     7                  matplotlib,
    78                  netcdf,
    89                  mingw):
     
    3738        file.write('!define NumpyInst "' + numpy + '"\n')
    3839        file.write('!define ScientificInst "' + scientific_python + '"\n')
     40        file.write('!define MatplotlibInst "' + matplotlib + '"\n')
    3941        file.write('!define NetCDFFolder "' + netcdf + '"\n')
    4042        file.write('!define MinGWInst "' + mingw + '"\n\n')
  • installation_files/windows/translation.nsh

    r7488 r7512  
    3434LangString page_extensions_numpy_ok ${_CUR_LANG} "Numpy is installed!"
    3535LangString page_extensions_scientific_ok ${_CUR_LANG} "ScientificPython is installed!"
     36LangString page_extensions_matplotlib_ok ${_CUR_LANG} "Matplotlib is installed!"
    3637LangString page_extensions_numpy_label_install ${_CUR_LANG} "Numpy will be installed!"
    3738LangString page_extensions_scientific_label_install ${_CUR_LANG} "ScientificPython will be installed!"
     39LangString page_extensions_matplotlib_label_install ${_CUR_LANG} "Matplotlib will be installed!"
    3840LangString page_extensions_outro_next ${_CUR_LANG} "$(^ClickNext)"
    3941LangString page_extensions_outro_install ${_CUR_LANG} "$(^ClickInstall)"
Note: See TracChangeset for help on using the changeset viewer.