* Custom NSIS plug-ins will be included in the dependency packages

* New Console plug-in with support for restricted users
* Warning message if no PDF viewer is installed

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

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index 080de517c922c5c1d66a073b3fe8cdba89d2a361..a796ee37874d588198dc368cd360e566f4e91ab2 100644 (file)
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -44,10 +44,6 @@ Creating the Installer
        To create an installer with LyX and all related components, download
        and install the latest NSIS from http://nsis.sourceforge.net
        
-       Also download the InetLoad plug-in from
-       http://nsis.sourceforge.net/InetLoad_plug-in and save InetLoad.dll in
-       the NSIS Plugins directory.
-       
        Open development\Win32\packaging\installer\setttings.user.nsh and modify
        the settings depending on your build environment.
        

diff --git a/development/Win32/launcher/launcher.nsi b/development/Win32/launcher/launcher.nsi
index 16b0c3c169c15ac340e3a4df575fd002041f1504..a20c7ee82b5c0227c5102db9b13ce7ad37591862 100644 (file)
--- a/development/Win32/launcher/launcher.nsi
+++ b/development/Win32/launcher/launcher.nsi
@@ -123,7 +123,7 @@ Section -Launch
   ;Start LyX and capture the command line output\r
   \r
   Push '"$EXEDIR\lyxc.exe" $Parameters'\r
-  CallInstDLL "$EXEDIR\nsExec.dll" ExecToLog\r
+  CallInstDLL "$EXEDIR\Console.dll" ExecToLog\r
   Pop $ReturnValue ;Return value\r
   \r
 SectionEnd\r

diff --git a/development/Win32/packaging/installer/components/core.nsh b/development/Win32/packaging/installer/components/core.nsh
index 75a9142dcc4427f80a707fe2d0416fd8bac32fb1..189d5a9b7f856cc9fcb8eb80653830ff3a37fa95 100644 (file)
--- a/development/Win32/packaging/installer/components/core.nsh
+++ b/development/Win32/packaging/installer/components/core.nsh
@@ -77,7 +77,8 @@ Section -Core SecCore
   ;Helper DLLs for NSIS-based tools\r
   \r
   SetOutPath "$INSTDIR\bin"\r
-  !insertmacro FileListNSISDll File "${NSISDIR}\Plugins\"\r
+  !insertmacro FileListNSISPluginsStandard File "${NSISDIR}\Plugins\"\r
+  !insertmacro FileListNSISPlugins File "${FILES_NSISPLUGINS}\"\r
   \r
   ;Create uninstaller\r
   WriteUninstaller "$INSTDIR\${SETUP_UNINSTALLER}"\r

diff --git a/development/Win32/packaging/installer/components/uninstall.nsh b/development/Win32/packaging/installer/components/uninstall.nsh
index e5749aad0455511ae70e05c849f1cc55ccc85945..8a57e0d3502e326fdbf0239fbc9e1cf77dd1e2f8 100644 (file)
--- a/development/Win32/packaging/installer/components/uninstall.nsh
+++ b/development/Win32/packaging/installer/components/uninstall.nsh
@@ -44,8 +44,9 @@ Section "un.Program Files" un.SecProgramFiles
   RMDir "$INSTDIR\aiksaurus"\r
   \r
   ;Helper DLLs for NSIS-based tools\r
-  \r
-  !insertmacro FileListNSISDll Delete "$INSTDIR\bin\"    \r
+\r
+  !insertmacro FileListNSISPluginsStandard Delete "$INSTDIR\bin\"\r
+  !insertmacro FileListNSISPlugins Delete "$INSTDIR\bin\"   \r
   \r
   ;Shortcuts\r
   \r

diff --git a/development/Win32/packaging/installer/include/filelists.nsh b/development/Win32/packaging/installer/include/filelists.nsh
index de04771fc75efc17d07fbcbe2d7b63a7c483998b..8b932edf68aaf9209ed55f6492a80b12500a9892 100644 (file)
--- a/development/Win32/packaging/installer/include/filelists.nsh
+++ b/development/Win32/packaging/installer/include/filelists.nsh
@@ -273,9 +273,14 @@ Lists of files to include in the installer
   \r
 !macroend\r
 \r
-!macro FileListNSISDll COMMAND DIRECTORY\r
+!macro FileListNSISPluginsStandard COMMAND DIRECTORY\r
 \r
-  ${FILE}nsExec.dll"\r
   ${FILE}System.dll"\r
 \r
 !macroend\r
+\r
+!macro FileListNSISPlugins COMMAND DIRECTORY\r
+\r
+  ${FILE}Console.dll"\r
+\r
+!macroend\r

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 6cc9bd4102da490ba6d0a13906e92aeb2c81d87f..f6c410bbadcc606ee8c6d5a07ea3f73d3c1dfd23 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -26,6 +26,8 @@ Settings for LyX installer
 !define FILES_DVIPOSTDATA "${FILES_DEPS}\dvipost"\r
 !define FILES_ASPELLDATA "${FILES_DEPS}\aspell"\r
 \r
+!define FILES_NSISPLUGINS "${FILES_DEPS}\nsis"\r
+\r
 ;--------------------------------\r
 ;Locations of components to download\r
 \r
@@ -56,7 +58,7 @@ Settings for LyX installer
 ;Locations of setup files for components (for bundled setup)\r
 \r
 !define INSTALL_LATEX "basic-miktex-2.5.2471.exe"\r
-!define INSTALL_IMAGEMAGICK "ImageMagick-6.3.0-0-Q16-windows-dll.exe"\r
+!define INSTALL_IMAGEMAGICK "ImageMagick-6.3.0-2-Q16-windows-dll.exe"\r
 !define INSTALL_GHOSTSCRIPT "gs854w32.exe"\r
 !define INSTALL_VIEWER "gsv48w32.exe"\r
 \r
@@ -106,6 +108,11 @@ Settings for LyX installer
 !define BIN_IMAGEMAGICK "convert.exe"\r
 !define BIN_GHOSTSCRIPT "gswin32c.exe"\r
 \r
+;--------------------------------\r
+;Custom NSIS plug-ins\r
+\r
+!addplugindir "${FILES_NSISPLUGINS}"\r
+\r
 ;--------------------------------\r
 ;Compession\r
 \r

diff --git a/development/Win32/pdfview/pdfview.nsi b/development/Win32/pdfview/pdfview.nsi
index f4aba8cdd64daeec6ce51b479d1f7de28d4b231c..2d86bd5bd11081f80ac2d76058ddfb8dd4d10746 100644 (file)
--- a/development/Win32/pdfview/pdfview.nsi
+++ b/development/Win32/pdfview/pdfview.nsi
@@ -21,6 +21,7 @@ http://magic.aladdin.cs.cmu.edu/2005/07/15/pdfopen-and-pdfclose/
 ;--------------------------------\r
 ;Settings\r
 \r
+Caption "PDF Viewer"\r
 OutFile pdfview.exe\r
 Icon "..\packaging\icons\lyx_32x32.ico"\r
 SilentInstall silent\r
@@ -57,7 +58,7 @@ Var CurrentTimeLow
 !macro HideConsole COMMAND_LINE\r
 \r
   Push `${COMMAND_LINE}`\r
-  CallInstDLL "$EXEDIR\nsExec.dll" Exec\r
+  CallInstDLL "$EXEDIR\Console.dll" Exec\r
   Pop $Dummy\r
   \r
   ${if} $Dummy == "error"\r
@@ -101,7 +102,13 @@ Section "View PDF file"
   !insertmacro SystemCall "shell32::FindExecutable(t s, t '', t .s)"\r
   Call GetFileName\r
   Pop $Viewer\r
-  \r
+\r
+  ${if} $Viewer == ""\r
+    MessageBox MB_OK|MB_ICONEXCLAMATION "No PDF viewer is installed. \\r
+        Please install a PDF viewer such as Adobe Reader."\r
+    Quit        \r
+  ${endif}\r
+\r
   ${if} $Viewer == "AcroRd32.exe"\r
     ${orif} $Viewer == "Acrobat.exe"\r
     \r