From 35331ca9480db881cb30bc1d17db3c12d4884c17 Mon Sep 17 00:00:00 2001 From: Joost Verburg Date: Wed, 5 Nov 2008 23:49:14 +0000 Subject: [PATCH] synchronize with trunk git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@27302 a592a061-630c-0410-9148-cb99ea01b6c8 --- .../packaging/installer/include/declarations.nsh | 1 - .../packaging/installer/include/filelist.nsh | 9 +-------- .../packaging/installer/include/langlist.nsh | 1 + .../Win32/packaging/installer/setup/configure.nsh | 12 ++++-------- .../Win32/packaging/installer/setup/install.nsh | 10 +++------- .../Win32/packaging/installer/setup/uninstall.nsh | 15 ++++----------- 6 files changed, 13 insertions(+), 35 deletions(-) diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh index c99958e90b..6e2662858f 100644 --- a/development/Win32/packaging/installer/include/declarations.nsh +++ b/development/Win32/packaging/installer/include/declarations.nsh @@ -53,7 +53,6 @@ SetCompressor /SOLID lzma !define FILES_DVIPOST_PKG "${FILES_DVIPOST}" !define FILES_PDFTOOLS "${FILES_DEPS}\pdftools" !define FILES_METAFILE2EPS "${FILES_DEPS}\metafile2eps" -!define FILES_PSPRINTER "${FILES_DEPS}\metafile2eps\PSPrinter" !define FILES_QT "${FILES_DEPS}\qt-4" !define FILES_ASPELLDATA "${FILES_DEPS}\aspell" diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh index 1f89d8c9ac..ab9cf5c3da 100644 --- a/development/Win32/packaging/installer/include/filelist.nsh +++ b/development/Win32/packaging/installer/include/filelist.nsh @@ -291,14 +291,7 @@ Lists of files to include in the installer !macro FileListMetaFile2EPS COMMAND DIRECTORY ${FILE}metafile2eps.exe" - -!macroend - -!macro FileListPSPrinter COMMAND DIRECTORY - - ${FILE}metafile2eps.inf" - ${FILE}metafile2eps.ppd" - ${FILE}metafile2eps.dat" + ${FILE}metafile2eps.dat" !macroend diff --git a/development/Win32/packaging/installer/include/langlist.nsh b/development/Win32/packaging/installer/include/langlist.nsh index f952f4a2c2..108d864c20 100644 --- a/development/Win32/packaging/installer/include/langlist.nsh +++ b/development/Win32/packaging/installer/include/langlist.nsh @@ -38,6 +38,7 @@ List of langauges supported by the LyX ${COMMAND} "Suomi" fi_FI 1035 # ${COMMAND} "Svenska" sv_SE 1053 # ${COMMAND} "Türkçe" tr_TR 1055 + ${COMMAND} "Ukrainian" uk_UK 1058 # ${COMMAND} "Walon" wa_BE 1055 !macroend diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh index 1e754fb9ed..2b6f2ce25b 100644 --- a/development/Win32/packaging/installer/setup/configure.nsh +++ b/development/Win32/packaging/installer/setup/configure.nsh @@ -51,6 +51,7 @@ Section -InstallData # Start Menu shortcut # There is only one shortcut to the application, so it should be in the main group + SetOutPath "$INSTDIR\bin" CreateShortCut "$SMPROGRAMS\${SHORTCUT} # Uninstaller information @@ -163,15 +164,10 @@ Section -PSPrinter # Delete printer ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"' - - # Delete printer driver - ExecWait '$PrinterConf /q /dd /m "Metafile to EPS Converter"' - # Install printer and driver - ExecWait '$PrinterConf /if /f "$INSTDIR\PSPrinter\metafile2eps.inf" /r "FILE:" /m "Metafile to EPS Converter"' - + ExecWait '$PrinterConf /if /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\PSPrinter\metafile2eps.dat" g' + ExecWait '$PrinterConf /q /Sr /n "Metafile to EPS Converter" /a "$INSTDIR\bin\metafile2eps.dat" g' ${EndIf} @@ -208,7 +204,7 @@ FunctionEnd Function CreateDesktopShortcut # Desktop icon creation is an option on the finish page - + SetOutPath "$INSTDIR\bin" CreateShortCut "$DESKTOP\${SHORTCUT} FunctionEnd diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh index b1b926991f..987bcfc974 100644 --- a/development/Win32/packaging/installer/setup/install.nsh +++ b/development/Win32/packaging/installer/setup/install.nsh @@ -120,10 +120,6 @@ Section -ProgramFiles SecProgramFiles SetOutPath "$INSTDIR\aiksaurus" !insertmacro FileListAiksaurusData File "${FILES_AIKSAURUS}\" - # Postscript printer for metafile to EPS converter - SetOutPath "$INSTDIR\PSPrinter" - !insertmacro FileListPSPrinter File "${FILES_PSPRINTER}\" - # Create uninstaller WriteUninstaller "$INSTDIR\${SETUP_UNINSTALLER}" @@ -134,7 +130,7 @@ SectionEnd !macro DOWNLOAD_FILE RET ID FILENAME APPEND - # Downloads a file using the InetLoad plug-in (HTTP or FTP) + # Downloads a file using the Inetc plug-in (HTTP or FTP) # RET = Return value (OK if succesful) # ID = Name of the download in settings.nsh @@ -142,12 +138,12 @@ SectionEnd # APPEND = Filename to append to server location in settings.nsh # Try first mirror server - InetLoad::load "${DOWNLOAD_${ID}}${APPEND}" "$PLUGINSDIR\${FILENAME}" /END + Inetc::get "${DOWNLOAD_${ID}}${APPEND}" "$PLUGINSDIR\${FILENAME}" /END Pop ${RET} # Return value (OK if succesful) ${If} ${RET} != "OK" # Download failed, try second mirror server - InetLoad::load "${DOWNLOADALT_${ID}}${APPEND}" "$PLUGINSDIR\${FILENAME}" /END + Inetc::get "${DOWNLOADALT_${ID}}${APPEND}" "$PLUGINSDIR\${FILENAME}" /END Pop ${RET} ${EndIf} diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh index a67e354d7f..b535ebd48e 100644 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ b/development/Win32/packaging/installer/setup/uninstall.nsh @@ -72,10 +72,6 @@ Section "un.Program Files" un.SecProgramFiles !insertmacro FileListAiksaurusData Delete "$INSTDIR\aiksaurus\" RMDir "$INSTDIR\aiksaurus" - # Postscript printer for metafile to EPS converter - !insertmacro FileListPSPrinter Delete "$INSTDIR\PSPrinter\" - RMDir "$INSTDIR\PsPrinter" - # Shortcuts Delete "$SMPROGRAMS\${APP_NAME} ${APP_SERIES_NAME}.lnk" Delete "$DESKTOP\${APP_NAME} ${APP_SERIES_NAME}.lnk" @@ -102,14 +98,11 @@ Section "un.Program Files" un.SecProgramFiles ${EndIf} ${If} $MultiUser.Privileges != "Admin" - ${OrIf} $MultiUser.Privileges != "Power" - - # Delete Postscript printer for metafile o EPS conversion + ${OrIf} $MultiUser.Privileges != "Power" + + # Delete Postscript printer for metafile to EPS conversion ExecWait '$PrinterConf /q /dl /n "Metafile to EPS Converter"' - - # Also delete printer driver - ExecWait '$PrinterConf /q /dd /m "Metafile to EPS Converter"' - + ${EndIf} SectionEnd