diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt new file mode 100644 index 0000000000..ea253572bc --- /dev/null +++ b/development/Win32/packaging/installer/Packages.txt @@ -0,0 +1,148 @@ +l3kernel +l3packages +mptopdf +bezos +algorithms +arabi +bibtopic +booktabs +braille +breakurl +cjk +covington +csquotes +cyrillic +endnotes +enumitem +esint +eso-pic +greek-inputenc +fancybox +fancyhdr +framed +hyphenat +jurabib +lettrine +listings +lithuanian +genmisc +mhchem +mongolian-babel +natbib +units +nomencl +polyglossia +pdfpages +prettyref +preview +refstyle +rotating +rotfloat +setspace +soul +splitindex +subfig +turkmen +ulem +undertilde +units +url +wrapfig +xargs +xcolor +arydshln +braket +cancel +caption +colortbl +diagbox +etoolbox +fp +koma-script +marginnote +picinpar +pict2e +sidecap +was +charter +mathpazo +bera +ccfonts +cmbright +eco +feyn +fourier +luxi +symbol +tipa +wasy +zhmetrics +ascii +bbding +ifsym +marvosym +textgreek +txfonts +wasysym +aastex +achemso +aguplus +apa6 +apacite +apa +arabtex +beamer +bigfoot +changepage +cite +cleveref +ctex +dinbrief +dtk +elsarticle +endfloat +epsf +europecv +extsizes +fancyvrb +filecontents +footmisc +frletter +g-brief +harvard +ieeetran +ifmtarg +kluwer +lastpage +lettre +lineno +mciteplus +memoir +microtype +moderncv +ms +mwcls +paper +paralist +pgf +placeins +powerdot +pst-grad +pst-node +revtex4 +sauerj +savesym +seminar +simplecv +skak +spie +sttools +textcase +titlesec +tufte-latex +tugboat +type1cm +ucs +upquote +xecjk +xifthen \ No newline at end of file diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index 1c1446f9f7..8df91d6c4f 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -193,21 +193,30 @@ Var ConfigureReturn Section -ConfigureScript SetOutPath "$INSTDIR\Resources" + + # ask to update MiKTeX + ${if} $LaTeXInstalled == "MiKTeX" + Call UpdateMiKTeX # function from latex.nsh + # install all necessary packages at once + DetailPrint $(TEXT_CONFIGURE_LYX) + ${if} $MultiUser.Privileges != "Admin" + ${andif} $MultiUser.Privileges != "Power" + # call the non-admin version + nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--install-some=$INSTDIR\Resources\Packages.txt"' + ${else} + ${if} $MiKTeXUser != "HKCU" # call the admin version + nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--admin" "--verbose" "--install-some=$INSTDIR\Resources\Packages.txt"' + ${else} + nsExec::ExecToLog '"$PathLaTeX\mpm.exe" "--verbose" "--install-some=$INSTDIR\Resources\Packages.txt"' + ${endif} + ${endif} + ${endif} + DetailPrint $(TEXT_CONFIGURE_LYX) nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"' # $ConfigureReturn is "0" if successful, otherwise "1" Pop $ConfigureReturn # Return value - # ask to update MiKTeX - ${if} $LaTeXInstalled == "MiKTeX" - Call UpdateMiKTeX # function from latex.nsh - # especially for new installations a second run is necessary to install all missing package - # the reason for this is unknown, most probably it is a timeout problem, because with a fast - # Internet connection one run is sometimes sufficient - # a new installed MiKTeX needs some time until it is ready to install packages - nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"' - ${endif} - SectionEnd #--------------------------------