run the LyX configure.py script, so MiKTeX can download its packages. the console...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24154 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/Win32/packaging/installer/include/gui.nsh b/development/Win32/packaging/installer/include/gui.nsh
index d3b9d7da7bd42419e52c69320fb4aafe4d0ac203..bfd400f5ad96a52466bc5fd5dbfbc2488f32b207 100644 (file)
--- a/development/Win32/packaging/installer/include/gui.nsh
+++ b/development/Win32/packaging/installer/include/gui.nsh
@@ -1,113 +1,116 @@
-/*
-
-gui.nsh
-
-Installer user interface settings
-
-*/
-
-#--------------------------------
-# General
-
-Name "${APP_NAME} ${APP_VERSION}"
-BrandingText " "
-
-# Default installation folder
-InstallDir "${SETUP_DEFAULT_DIRECTORY}"
-
-#--------------------------------
-# Interface settings
-
-!define MUI_ABORTWARNING
-!define MUI_ICON "${SETUP_ICON}"
-!define MUI_UNICON "${SETUP_ICON}"
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "${SETUP_HEADERIMAGE}"
-!define MUI_HEADERIMAGE_RIGHT
-!define MUI_WELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}"
-!define MUI_CUSTOMFUNCTION_GUIINIT InitInterface
-!define MUI_COMPONENTSPAGE_NODESC
-
-#--------------------------------
-# Pages
-
-# Installer
-
-!define MUI_WELCOMEPAGE_TITLE_3LINES
-!define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME_${SETUPTYPE_NAME})
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "${FILES_LICENSE}"
-!insertmacro MULTIUSER_PAGE_INSTALLMODE
-
-Page custom PageReinstall PageReinstallValidate
-Page custom PageExternalLaTeX PageExternalLaTeXValidate
-Page custom PageExternalImageMagick PageExternalImageMagickValidate
-Page custom PageExternalGhostscript PageExternalGhostscriptValidate
-Page custom PageLanguage PageLanguageValidate
-
-!define MUI_PAGE_HEADER_TEXT $(TEXT_DICT_TITLE)
-!define MUI_PAGE_HEADER_SUBTEXT $(TEXT_DICT_SUBTITLE)
-!define MUI_COMPONENTSPAGE_TEXT_TOP $(TEXT_DICT_TOP)
-!define MUI_COMPONENTSPAGE_TEXT_COMPLIST $(TEXT_DICT_LIST)
-!insertmacro MUI_PAGE_COMPONENTS # For spell checker dictionaries
-
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_FINISHPAGE_RUN "$INSTDIR\${APP_RUN}"
-!define MUI_FINISHPAGE_SHOWREADME
-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDesktopShortcut
-!define MUI_FINISHPAGE_SHOWREADME_TEXT $(TEXT_FINISH_DESKTOP)
-!define MUI_FINISHPAGE_LINK $(TEXT_FINISH_WEBSITE)
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.lyx.org/"
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW CheckDesktopShortcut
-!insertmacro MUI_PAGE_FINISH
-
-# Uninstaller
-
-!define MUI_WELCOMEPAGE_TITLE_3LINES
-!define MUI_WELCOMEPAGE_TEXT $(UNTEXT_WELCOME)
-!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_COMPONENTS
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_UNPAGE_FINISH
-
-#--------------------------------
-# Installer Languages
-
-!macro LANG LANG_NAME
-  # NSIS language file
-  !insertmacro MUI_LANGUAGE "${LANG_NAME}"
-  # LyX language file
-  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "lang\${LANG_NAME}.nsh" "lang\English.nsh"
-!macroend
-
-!insertmacro LANG "english"
-!insertmacro LANG "french"
-!insertmacro LANG "german"
-!insertmacro LANG "italian"
-
-#--------------------------------
-# Version information
-
-VIProductVersion "${APP_VERSION_NUMBER}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${APP_INFO}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "${APP_COPYRIGHT}"
-
-Function InitInterface
-
-  # Warn the user when no Administrator or Power user privileges are available
-  # These privileges are required to install ImageMagick or Ghostscript
-
-  ${If} $MultiUser.Privileges != "Admin"
-  ${andif} $MultiUser.Privileges != "Power"
-    MessageBox MB_OK|MB_ICONEXCLAMATION $(TEXT_NO_PRIVILEDGES)
-  ${EndIf}
-
-FunctionEnd
+/*\r
+\r
+gui.nsh\r
+\r
+Installer user interface settings\r
+\r
+*/\r
+\r
+#--------------------------------\r
+# General\r
+\r
+Name "${APP_NAME} ${APP_VERSION}"\r
+BrandingText " "\r
+\r
+# Default installation folder\r
+InstallDir "${SETUP_DEFAULT_DIRECTORY}"\r
+\r
+#--------------------------------\r
+# Interface settings\r
+\r
+!define MUI_ABORTWARNING\r
+!define MUI_ICON "${SETUP_ICON}"\r
+!define MUI_UNICON "${SETUP_ICON}"\r
+!define MUI_HEADERIMAGE\r
+!define MUI_HEADERIMAGE_BITMAP "${SETUP_HEADERIMAGE}"\r
+!define MUI_HEADERIMAGE_RIGHT\r
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}"\r
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${SETUP_WIZARDIMAGE}"\r
+!define MUI_CUSTOMFUNCTION_GUIINIT InitInterface\r
+!define MUI_COMPONENTSPAGE_NODESC\r
+\r
+#--------------------------------\r
+# Pages\r
+\r
+# Installer\r
+\r
+!define MUI_WELCOMEPAGE_TITLE_3LINES\r
+!define MUI_WELCOMEPAGE_TEXT $(TEXT_WELCOME_${SETUPTYPE_NAME})\r
+!insertmacro MUI_PAGE_WELCOME\r
+!insertmacro MUI_PAGE_LICENSE "${FILES_LICENSE}"\r
+!insertmacro MULTIUSER_PAGE_INSTALLMODE\r
+\r
+Page custom PageReinstall PageReinstallValidate\r
+Page custom PageExternalLaTeX PageExternalLaTeXValidate\r
+Page custom PageExternalImageMagick PageExternalImageMagickValidate\r
+Page custom PageExternalGhostscript PageExternalGhostscriptValidate\r
+Page custom PageLanguage PageLanguageValidate\r
+\r
+!define MUI_PAGE_HEADER_TEXT $(TEXT_DICT_TITLE)\r
+!define MUI_PAGE_HEADER_SUBTEXT $(TEXT_DICT_SUBTITLE)\r
+!define MUI_COMPONENTSPAGE_TEXT_TOP $(TEXT_DICT_TOP)\r
+!define MUI_COMPONENTSPAGE_TEXT_COMPLIST $(TEXT_DICT_LIST)\r
+!insertmacro MUI_PAGE_COMPONENTS # For spell checker dictionaries\r
+\r
+!insertmacro MUI_PAGE_DIRECTORY\r
+!insertmacro MUI_PAGE_INSTFILES\r
+\r
+!define MUI_FINISHPAGE_RUN "$INSTDIR\${APP_RUN}"\r
+!define MUI_FINISHPAGE_SHOWREADME\r
+!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED\r
+!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDesktopShortcut\r
+!define MUI_FINISHPAGE_SHOWREADME_TEXT $(TEXT_FINISH_DESKTOP)\r
+!define MUI_FINISHPAGE_LINK $(TEXT_FINISH_WEBSITE)\r
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.lyx.org/"\r
+!define MUI_PAGE_CUSTOMFUNCTION_SHOW CheckDesktopShortcut\r
+!insertmacro MUI_PAGE_FINISH\r
+\r
+# Uninstaller\r
+\r
+!define MUI_WELCOMEPAGE_TITLE_3LINES\r
+!define MUI_WELCOMEPAGE_TEXT $(UNTEXT_WELCOME)\r
+!insertmacro MUI_UNPAGE_WELCOME\r
+!insertmacro MUI_UNPAGE_CONFIRM\r
+!insertmacro MUI_UNPAGE_COMPONENTS\r
+!insertmacro MUI_UNPAGE_INSTFILES\r
+\r
+!insertmacro MUI_UNPAGE_FINISH\r
+\r
+#--------------------------------\r
+# Installer Languages\r
+\r
+!macro LANG LANG_NAME\r
+  # NSIS language file\r
+  !insertmacro MUI_LANGUAGE "${LANG_NAME}"\r
+  # LyX language file\r
+  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "lang\${LANG_NAME}.nsh" "lang\English.nsh"\r
+!macroend\r
+\r
+!insertmacro LANG "english"\r
+!insertmacro LANG "french"\r
+!insertmacro LANG "german"\r
+!insertmacro LANG "italian"\r
+\r
+#--------------------------------\r
+# Version information\r
+\r
+VIProductVersion "${APP_VERSION_NUMBER}"\r
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}"\r
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${APP_INFO}"\r
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}"\r
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "${APP_COPYRIGHT}"\r
+\r
+#--------------------------------\r
+# Interface initialization\r
+\r
+Function InitInterface\r
+\r
+  # Warn the user when no Administrator or Power user privileges are available\r
+  # These privileges are required to install ImageMagick or Ghostscript\r
+\r
+  ${If} $MultiUser.Privileges != "Admin"\r
+  ${andif} $MultiUser.Privileges != "Power"\r
+    MessageBox MB_OK|MB_ICONEXCLAMATION $(TEXT_NO_PRIVILEDGES)\r
+  ${EndIf}\r
+\r
+FunctionEnd\r

diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index 6e4685a83479a7fcdd063663fa5db04d23939f59..4062133f7f87c9a0019ebca3cbd5a8a99171b6dd 100644 (file)
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -30,14 +30,14 @@ Function .onInit
   !insertmacro PRINTER_INIT
   !insertmacro MULTIUSER_INIT
   
-  ${unless} ${silent}
+  ${IfNot} ${Silent}
     Banner::show /NOUNLOAD "Checking system"
   ${EndIf}
   
   Call SearchExternal
   Call InitExternal
 
-  ${unless} ${silent}
+  ${IfNot} ${Silent}
     Banner::destroy
   ${EndIf}
 

diff --git a/development/Win32/packaging/installer/lang/english.nsh b/development/Win32/packaging/installer/lang/english.nsh
index a2fbb7a197d245badde7d669f1924f24b58b907d..02efb34d6478009c69953e9836b7067eb962efc8 100644 (file)
--- a/development/Win32/packaging/installer/lang/english.nsh
+++ b/development/Win32/packaging/installer/lang/english.nsh
@@ -83,6 +83,9 @@ ${LangFileString} TEXT_NOTINSTALLED_GHOSTSCRIPT "The Ghostscript setup wizard wa
 ${LangFileString} TEXT_NOTINSTALLED_VIEWER "You did not associate GSView with the PDF/Postscript file types. Do you want to run GSView setup again?"
 ${LangFileString} TEXT_NOTINSTALLED_DICT "The setup wizard of the $DictionaryLangName spell checker dictionary was not completed. Do you want to run the setup again?"
 
+${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename database..."
+${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX (MiKTeX may download missing packages, this can take some time) ..."
+
 ${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut"
 ${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news, support and tips"
 

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index dfa21f78de3740a41d1af5a3ae822d55a508c07b..1afa534a096b8f8f3099a28410c23b3e056f7023 100644 (file)
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -132,13 +132,13 @@ Section -dvipost
   # Update file name database
 
   ${if} $PathLaTeX != ""
-    nsExec::Exec '"$PathLaTeX\initexmf.exe" --update-fndb'
+    DetailPrint $(TEXT_CONFIGURE_MIKTEXFNDB)
+    nsExec::ExecToLog '"$PathLaTeX\initexmf.exe" --update-fndb'
     Pop $UpdateFNDBReturn # Return value
   ${endif}
 
 SectionEnd
 
-
 #--------------------------------
 # Postscript printer for metafile to EPS converter
 
@@ -163,6 +163,19 @@ Section -PSPrinter
 
 SectionEnd
 
+#--------------------------------
+# Run the LyX configure.py script, so MiKTeX can download its packages
+
+Var PythonReturn
+
+Section -ConfigureScript
+
+  DetailPrint $(TEXT_CONFIGURE_LYX)
+  nsExec::ExecToLog '"$INSTDIR\python\python.exe" "$INSTDIR\Resources\configure.py"'
+  Pop $PythonReturn # Return value
+
+SectionEnd
+
 #--------------------------------
 # Desktop shortcut