* 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

diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index c99958e90b18e3a04f887c6b2f49c8d91c0693da..6e2662858ffab33ff929322e1b79836d9c008ef7 100644 (file)
--- 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 1f89d8c9ac1873ae1394c63fcada9851da158bb9..ab9cf5c3dac20d680326543bd619d2970b8a990b 100644 (file)
--- 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/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 1e754fb9ed042e081374506025eb3329227f92c8..2b6f2ce25b84b6da77646508d8a67d2e925cdc0a 100644 (file)
--- 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 de81eef7a9fc23e381c8e48354b8d5141cf54191..d0e40b64f6792548f771cc6e0f047a0b4b5b7d3b 100644 (file)
--- 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}"
 

diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh
index a67e354d7f24d27e13b1c59831a7a3ef1908da8e..b535ebd48e346142c7ef766b33be5d6b479c42c3 100644 (file)
--- 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