Author: joost
Date: Mon Oct 31 03:13:11 2011
New Revision: 40111
URL: http://www.lyx.org/trac/changeset/40111
Log:
* remove reinstall page which is no longer necessary now spell checking
dictionaries are integrated
* Metafile to EPS Converter 2.1 doesn't need dat file
* use NSISdl plug-in for downloading
* fix icon in Windows program uninstall list
Deleted:
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/gui/reinstall.nsh
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/include/filelist.nsh
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/include/gui.nsh
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/lyx.nsi
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/setup/configure.nsh
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/setup/install.nsh
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/include/filelist.nsh
==============================================================================
---
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/include/filelist.nsh
Mon Oct 31 03:02:27 2011 (r40110)
+++
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/include/filelist.nsh
Mon Oct 31 03:13:11 2011 (r40111)
@@ -96,7 +96,6 @@
!macro FileListMetaFile2EPS COMMAND DIRECTORY
${FILE}metafile2eps.exe"
- ${FILE}metafile2eps.dat"
!macroend
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/include/gui.nsh
==============================================================================
---
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/include/gui.nsh
Mon Oct 31 03:02:27 2011 (r40110)
+++
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/include/gui.nsh
Mon Oct 31 03:13:11 2011 (r40111)
@@ -35,7 +35,6 @@
!insertmacro MUI_PAGE_LICENSE "${FILES_LICENSE}"
!insertmacro MULTIUSER_PAGE_INSTALLMODE
-Page custom PageReinstall PageReinstallValidate
Page custom PageExternalLaTeX PageExternalLaTeXValidate
!insertmacro MUI_PAGE_DIRECTORY
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/lyx.nsi
==============================================================================
---
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/lyx.nsi
Mon Oct 31 03:02:27 2011 (r40110)
+++
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/lyx.nsi
Mon Oct 31 03:13:11 2011 (r40111)
@@ -19,7 +19,6 @@
!include setup\uninstall.nsh
!include setup\configure.nsh
!include gui\external.nsh
-!include gui\reinstall.nsh
#--------------------------------
# Output file
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/setup/configure.nsh
==============================================================================
---
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/setup/configure.nsh
Mon Oct 31 03:02:27 2011 (r40110)
+++
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/setup/configure.nsh
Mon Oct 31 03:13:11 2011 (r40111)
@@ -62,7 +62,7 @@
${REG_UNINSTALL} "UninstallString" '"$INSTDIR\${SETUP_UNINSTALLER}"'
${REG_UNINSTALL} "DisplayVersion" "${APP_VERSION}"
- ${REG_UNINSTALL} "DisplayIcon" "$INSTDIR\bin\LyXLauncher,0"
+ ${REG_UNINSTALL} "DisplayIcon" "$INSTDIR\${APP_RUN},0"
${REG_UNINSTALL} "URLUpdateInfo" "http://www.lyx.org/";
${REG_UNINSTALL} "URLInfoAbout" "http://www.lyx.org/about/";
${REG_UNINSTALL} "Publisher" "LyX Team"
@@ -141,8 +141,6 @@
ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"'
# Install printer and driver
ExecWait '$PrinterConf /if /f "$WINDIR\inf\ntprint.inf" /b "Metafile to
EPS Converter" /r "FILE:" /m "MS Publisher Imagesetter"'
- # Restore DEVMODE with proper settings
- ExecWait '$PrinterConf /q /Sr /n "Metafile to EPS Converter" /a
"$INSTDIR\bin\metafile2eps.dat" g'
${EndIf}
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/setup/install.nsh
==============================================================================
---
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/setup/install.nsh
Mon Oct 31 03:02:27 2011 (r40110)
+++
lyx-devel/branches/BRANCH_2_0_X/development/Win32/packaging/installer/setup/install.nsh
Mon Oct 31 03:13:11 2011 (r40111)
@@ -46,10 +46,6 @@
SetOutPath "$INSTDIR"
# recursively copy all files under Python
File /r "${FILES_PYTHON}"
- # add MSVC runtimes
- SetOutPath "$INSTDIR\python"
- !insertmacro FileListMSVC File "${FILES_MSVC}\"
-
# Compile all Pyton files to byte-code
# The user using the scripts may not have write access
@@ -94,8 +90,10 @@
NSISdl::download "${DOWNLOAD_${ID}}${APPEND}" "$PLUGINSDIR\${FILENAME}"
Pop ${RET} # Return value (OK if succesful)
- ${If} ${RET} != "OK"
- # Download failed, try again (usally we get a different mirror)
+ ${If} ${RET} != "success"
+ ${AndIf} ${RET} != "cancel"
+ # Download failed, try once again before giving up
+ # (usally we get a different mirror)
NSISdl::download "${DOWNLOAD_${ID}}${APPEND}" "$PLUGINSDIR\${FILENAME}"
Pop ${RET}
${EndIf}
@@ -155,8 +153,9 @@
!insertmacro DOWNLOAD_FILE $DownloadResult "${COMPONENT}"
"${COMPONENT}Setup.exe" ""
- ${If} $DownloadResult != "OK"
- # Download failed
+ ${If} $DownloadResult != "success"
+ ${AndIf} $DownloadResult != "cancel"
+ # Download failed after trying twice - ask user
MessageBox MB_YESNO|MB_ICONEXCLAMATION
"$(TEXT_DOWNLOAD_FAILED_${COMPONENT}) ($DownloadResult)" IDYES
download_${COMPONENT}
Goto noinstall_${COMPONENT}
${EndIf}
