* Metafile to EPS conversion on 64-bit Windows

* set start directory for shortcuts

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27301 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Joost Verburg 2008-11-05 23:44:44 +00:00
parent 0e1f67f8ea
commit 8c926c8c2a
5 changed files with 9 additions and 32 deletions

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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}"

View File

@ -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