anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Joost Verburg 2006-11-06 21:51:43 +00:00
parent 52650ef229
commit 129a520bd9
7 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL.Win32
View File

@ -44,10 +44,6 @@ Creating the Installer
To create an installer with LyX and all related components, download To create an installer with LyX and all related components, download
and install the latest NSIS from http://nsis.sourceforge.net 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 Open development\Win32\packaging\installer\setttings.user.nsh and modify
the settings depending on your build environment. the settings depending on your build environment.

2
development/Win32/launcher/launcher.nsi
View File

@ -123,7 +123,7 @@ Section -Launch
;Start LyX and capture the command line output ;Start LyX and capture the command line output
Push '"$EXEDIR\lyxc.exe" $Parameters' Push '"$EXEDIR\lyxc.exe" $Parameters'
CallInstDLL "$EXEDIR\nsExec.dll" ExecToLog CallInstDLL "$EXEDIR\Console.dll" ExecToLog
Pop $ReturnValue ;Return value Pop $ReturnValue ;Return value
SectionEnd SectionEnd

3
development/Win32/packaging/installer/components/core.nsh
View File

@ -77,7 +77,8 @@ Section -Core SecCore
;Helper DLLs for NSIS-based tools ;Helper DLLs for NSIS-based tools
SetOutPath "$INSTDIR\bin" SetOutPath "$INSTDIR\bin"
!insertmacro FileListNSISDll File "${NSISDIR}\Plugins\" !insertmacro FileListNSISPluginsStandard File "${NSISDIR}\Plugins\"
!insertmacro FileListNSISPlugins File "${FILES_NSISPLUGINS}\"
;Create uninstaller ;Create uninstaller
WriteUninstaller "$INSTDIR\${SETUP_UNINSTALLER}" WriteUninstaller "$INSTDIR\${SETUP_UNINSTALLER}"

3
development/Win32/packaging/installer/components/uninstall.nsh
View File

@ -45,7 +45,8 @@ Section "un.Program Files" un.SecProgramFiles
;Helper DLLs for NSIS-based tools ;Helper DLLs for NSIS-based tools
!insertmacro FileListNSISDll Delete "$INSTDIR\bin\" !insertmacro FileListNSISPluginsStandard Delete "$INSTDIR\bin\"
!insertmacro FileListNSISPlugins Delete "$INSTDIR\bin\"
;Shortcuts ;Shortcuts

9
development/Win32/packaging/installer/include/filelists.nsh
View File

@ -273,9 +273,14 @@ Lists of files to include in the installer
!macroend !macroend
!macro FileListNSISDll COMMAND DIRECTORY !macro FileListNSISPluginsStandard COMMAND DIRECTORY
${FILE}nsExec.dll"
${FILE}System.dll" ${FILE}System.dll"
!macroend !macroend
!macro FileListNSISPlugins COMMAND DIRECTORY
${FILE}Console.dll"
!macroend

9
development/Win32/packaging/installer/settings.nsh
View File

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

9
development/Win32/pdfview/pdfview.nsi
View File

@ -21,6 +21,7 @@ http://magic.aladdin.cs.cmu.edu/2005/07/15/pdfopen-and-pdfclose/
;-------------------------------- ;--------------------------------
;Settings ;Settings
Caption "PDF Viewer"
OutFile pdfview.exe OutFile pdfview.exe
Icon "..\packaging\icons\lyx_32x32.ico" Icon "..\packaging\icons\lyx_32x32.ico"
SilentInstall silent SilentInstall silent
@ -57,7 +58,7 @@ Var CurrentTimeLow
!macro HideConsole COMMAND_LINE !macro HideConsole COMMAND_LINE
Push `${COMMAND_LINE}` Push `${COMMAND_LINE}`
CallInstDLL "$EXEDIR\nsExec.dll" Exec CallInstDLL "$EXEDIR\Console.dll" Exec
Pop $Dummy Pop $Dummy
${if} $Dummy == "error" ${if} $Dummy == "error"
@ -102,6 +103,12 @@ Section "View PDF file"
Call GetFileName Call GetFileName
Pop $Viewer Pop $Viewer
${if} $Viewer == ""
MessageBox MB_OK|MB_ICONEXCLAMATION "No PDF viewer is installed. \
Please install a PDF viewer such as Adobe Reader."
Quit
${endif}
${if} $Viewer == "AcroRd32.exe" ${if} $Viewer == "AcroRd32.exe"
${orif} $Viewer == "Acrobat.exe" ${orif} $Viewer == "Acrobat.exe"