From: Uwe Stöhr Date: Thu, 12 Apr 2007 20:18:08 +0000 (+0000) Subject: LyXWinInstaller: X-Git-Tag: 1.6.10~10282 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2075849b5d51c8d86e65595c869b365a50847fce;p=lyx.git LyXWinInstaller: - avoid uninstalling stuff that was installed by a previous LyX-Version - renaming Readme-files - drop PDFViewWin7.exe and go back to the pdfopen/pdfclos method for Adobe Reader 7. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17787 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-complete.nsh b/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-complete.nsh index c1ce3c8182..373687eea9 100644 --- a/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-complete.nsh +++ b/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-complete.nsh @@ -1,20 +1,20 @@ -# The '-' makes the section invisible. -# Sections are entered in order, so the settings above are all -# available to SecInstallation +; The '-' makes the section invisible. +; Sections are entered in order, so the settings above are all +; available to SecInstallation Section "-Installation actions" SecInstallation - # extract all files + ; extract all files SetOutPath "$INSTDIR" File /r "${PRODUCT_SOURCEDIR}\bin" File /r "${PRODUCT_SOURCEDIR}\etc" File /r "${PRODUCT_SOURCEDIR}\Resources" File /r "${PRODUCT_SOURCEDIR}\external" - # install MiKTeX if not already installed + ; install MiKTeX if not already installed ${if} $LatexPath == "" - # launch MiKTeX's installer + ; launch MiKTeX's installer MessageBox MB_OK|MB_ICONINFORMATION "$(LatexInfo)" ExecWait ${MiKTeXInstall} - # test if MiKTeX is installed + ; test if MiKTeX is installed ReadRegStr $String HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "Path" StrCpy $Search "miktex" Call LaTeXCheck @@ -25,12 +25,12 @@ Section "-Installation actions" SecInstallation Call LaTeXCheck ${endif} ${if} $LatexPath != "" - # set package repository (MiKTeX's primary package repository) - WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes" ; special entry to tell the uninstaller that it was installed with LyX + ; set package repository (MiKTeX's primary package repository) + WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" ; special entry to tell the uninstaller that it was installed with LyX StrCpy $MiKTeXInstalled "yes" ${if} $MiKTeXUser != "HKCU" StrCpy $MiKTeXPath "$LatexPath" -11 - #MessageBox MB_OK|MB_ICONINFORMATION "$(MiKTeXPathInfo)" ; info that MiKTeX's installation folder must have write permissions for all users to work properly + ;MessageBox MB_OK|MB_ICONINFORMATION "$(MiKTeXPathInfo)" ; info that MiKTeX's installation folder must have write permissions for all users to work properly ${endif} ${else} MessageBox MB_OK|MB_ICONSTOP "$(LatexError1)" @@ -41,19 +41,19 @@ Section "-Installation actions" SecInstallation ${endif} ${if} $GhostscriptPath == "" - # register Ghostscript + ; register Ghostscript WriteRegStr HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion}" "GS_DLL" "${GhostscriptDir}\bin\gsdll32.dll" WriteRegStr HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion}" "GS_LIB" "${GhostscriptDir}\lib;${GhostscriptDir}\fonts;${GhostscriptDir}\Resource" - WriteRegStr HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" "Yes" ; special entry to tell the uninstaller that it was installed with LyX + WriteRegStr HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" ; special entry to tell the uninstaller that it was installed with LyX StrCpy $GhostscriptPath "${GhostscriptDir}\bin" ${else} - # delete unnecessary files + ; delete unnecessary files RMDir /r ${GhostscriptDir} ${endif} ${if} $ImageMagickPath == "" - # register ImageMagick + ; register ImageMagick WriteRegStr HKLM "SOFTWARE\Classes\Applications" "AutoRun" "${ImageMagickDir}\convert.exe $$" WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "BinPath" "${ImageMagickDir}" WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "CoderModulesPath" "${ImageMagickDir}\modules\coders" @@ -69,25 +69,25 @@ Section "-Installation actions" SecInstallation WriteRegDWORD HKLM "SOFTWARE\ImageMagick\Current" "QuantumDepth" 0x00000010 WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "Version" "${ImageMagickVersion}" - WriteRegStr HKLM "Software\ImageMagick" "OnlyWithLyX" "Yes" ; special entry to tell the uninstaller that it was installed with LyX + WriteRegStr HKLM "Software\ImageMagick" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" ; special entry to tell the uninstaller that it was installed with LyX StrCpy $ImageMagickPath ${ImageMagickDir} ${else} - # delete unnecessary files + ; delete unnecessary files RMDir /r ${ImageMagickDir} ${endif} ${if} $AspellPath == "" - # extract Aspell's program files + ; extract Aspell's program files SetOutPath "$INSTDIR\external" File /r "${PRODUCT_SOURCEDIR}\${AspellInstall}" - # copy the files and register Aspell + ; copy the files and register Aspell CopyFiles "$INSTDIR\${AspellInstall}" "$APPDATA" WriteRegStr HKLM "SOFTWARE\Aspell" "Base Path" "${AspellDir}" WriteRegStr HKLM "SOFTWARE\Aspell" "Dictionary Path" "${AspellDictPath}" WriteRegStr HKLM "SOFTWARE\Aspell" "Personal Path" "${AspellPersonalPath}" - WriteRegStr HKLM "Software\Aspell" "OnlyWithLyX" "Yes" ; special entry to tell the uninstaller that it was installed with LyX + WriteRegStr HKLM "Software\Aspell" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" ; special entry to tell the uninstaller that it was installed with LyX WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Aspell" "DisplayName" "${AspellDisplay}" WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Aspell" "NoModify" 0x00000001 @@ -96,21 +96,21 @@ Section "-Installation actions" SecInstallation ${endif} ${if} $AiksaurusPath == "" - # extract Aiksaurus' program files + ; extract Aiksaurus' program files SetOutPath "$INSTDIR\external" File /r "${PRODUCT_SOURCEDIR}\${AiksaurusInstall}" - # copy the files and register Aiksaurus + ; copy the files and register Aiksaurus CopyFiles "$INSTDIR\${AiksaurusInstall}" "$APPDATA" -# WriteRegStr HKLM "Software\Aiksaurus" "OnlyWithLyX" "Yes" ; special entry to tell the uninstaller that it was installed with LyX -# WriteRegStr HKLM "Software\Aiksaurus" "Data Path" "${AiksaurusDir}" +; WriteRegStr HKLM "Software\Aiksaurus" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" ; special entry to tell the uninstaller that it was installed with LyX +; WriteRegStr HKLM "Software\Aiksaurus" "Data Path" "${AiksaurusDir}" ${endif} ${if} $PSVPath == "" ${if} $InstallGSview == "true" - # launch installer + ; launch installer MessageBox MB_OK|MB_ICONINFORMATION "$(GSviewInfo)" ExecWait "$INSTDIR\${GSviewInstall}" - # test if GSview is installed + ; test if GSview is installed StrCpy $PSVPath "" ReadRegStr $PSVPath HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gsview32.exe" "Path" ${if} $PSVPath == "" @@ -121,21 +121,21 @@ Section "-Installation actions" SecInstallation ${if} $BibTeXEditorPath == "" ${if} $InstallJabRef == "true" - # launch installer + ; launch installer MessageBox MB_OK|MB_ICONINFORMATION "$(JabRefInfo)" ExecWait "$INSTDIR\${JabRefInstall}" - # test if JabRef is installed + ; test if JabRef is installed StrCpy $BibTeXEditorPath "" ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${JabRefVersion}" "UninstallString" ${if} $BibTeXEditorPath == "" MessageBox MB_OK|MB_ICONEXCLAMATION "$(JabRefError)" ${else} - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${JabRefVersion}" "OnlyWithLyX" "Yes" ; special entry to tell the uninstaller that it was installed with LyX + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${JabRefVersion}" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" ; special entry to tell the uninstaller that it was installed with LyX ${endif} ${endif} ${endif} - # create the PathPrefix + ; create the PathPrefix StrCpy $PathPrefix "$INSTDIR\bin" ${if} $PythonPath != "" StrCpy $PathPrefix "$PathPrefix;$PythonPath" @@ -159,8 +159,8 @@ Section "-Installation actions" SecInstallation StrCpy $PathPrefix "$PathPrefix;$ImageEditorPath" ${endif} - # install the LaTeX class files that are delivered with LyX - # and enable MiKTeX's automatic package installation + ; install the LaTeX class files that are delivered with LyX + ; and enable MiKTeX's automatic package installation StrCpy $String $LatexPath StrCpy $Search "miktex\bin" StrLen $3 $String @@ -168,7 +168,7 @@ Section "-Installation actions" SecInstallation ${if} $Pointer != "-1" ; if something was found IntOp $Pointer $Pointer - 1 ; jump before the first "\" of "\miktex\bin" StrCpy $String $String "$Pointer" ; $String is now the part before "\miktex\bin" - # install LaTeX class files + ; install LaTeX class files SetOutPath "$String\tex\latex" File "${ClassFileDir}\cv.cls" CreateDirectory "$String\tex\latex\lyx" @@ -184,52 +184,52 @@ Section "-Installation actions" SecInstallation CreateDirectory "$String\tex\latex\broadway" SetOutPath "$String\tex\latex\broadway" File "${ClassFileDir}\broadway.cls" - # install LaTeX-package dvipost (dvipost is not available for MiKTeX) + ; install LaTeX-package dvipost (dvipost is not available for MiKTeX) SetOutPath "$String\tex\latex\" File /r "${DVIPostFileDir}" ${if} $MiKTeXVersion == "2.4" - # refresh MiKTeX's file name database + ; refresh MiKTeX's file name database ExecWait "$String\miktex\bin\initexmf --update-fndb" - # delete MiKTeX 2.4's dvipng executable as it is an old broken version. Then install a working one. + ; delete MiKTeX 2.4's dvipng executable as it is an old broken version. Then install a working one. Delete "$String\miktex\bin\dvipng.exe" - # Install a new one + ; Install a new one SetOutPath "$String\miktex\bin" File "${PRODUCT_DIR}\LyX\external\dvipng.exe" - # enable package installation without asking (1=Yes, 0=No, 2=Always Ask Before Installing) + ; enable package installation without asking (1=Yes, 0=No, 2=Always Ask Before Installing) WriteRegStr HKCU "SOFTWARE\MiK\MiKTeX\CurrentVersion\MiKTeX" "InstallPackagesOnTheFly" "1" WriteRegStr HKCU "SOFTWARE\MiK\MiKTeX\CurrentVersion\MPM\Settings" "" "" - # Setting package repository (MiKTeX's primary package repository) + ; Setting package repository (MiKTeX's primary package repository) WriteRegStr HKCU "SOFTWARE\MiK\MiKTeX\CurrentVersion\MPM" "RemotePackageRepository" "${MiKTeXRepo}" ${else} ; if MiKTeX 2.5 - # refresh MiKTeX's file name database + ; refresh MiKTeX's file name database ExecWait "$LaTeXPath\initexmf --update-fndb" - # enable package installation without asking (t = Yes, f = No) + ; enable package installation without asking (t = Yes, f = No) WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\2.5\MPM" "AutoInstall" "1" ; if only for curent user WriteRegStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "MIKTEX_AUTOINSTALL" "t" - # set package repository (MiKTeX's primary package repository) + ; set package repository (MiKTeX's primary package repository) WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\2.5\MPM" "RemoteRepository" "${MiKTeXRepo}" ; if only for curent user WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\2.5\MPM" "RepositoryType" "remote" ; if only for curent user WriteRegStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "MIKTEX_REPOSITORY" "${MiKTeXRepo}" ${endif} - # enable MiKTeX's automatic package installation + ; enable MiKTeX's automatic package installation ExecWait '$LaTeXPath\mpm.com --update-fndb' -# the following feature is planned to be used for a possible CD-version -# ; copy LaTeX-packages needed by LyX -# SetOutPath "$INSTDIR" -# File /r "${LaTeXPackagesDir}" +; the following feature is planned to be used for a possible CD-version +; ; copy LaTeX-packages needed by LyX +; SetOutPath "$INSTDIR" +; File /r "${LaTeXPackagesDir}" ${endif} ; end ${if} $Pointer - # install Aspell dictionaries + ; install Aspell dictionaries ${if} $LangCode == "nb_NO" StrCpy $LangCode "no_NO" ; we only have a norwegian dictionary available ${endif} Call InstallAspellDictionary ; function from aspell.nsh - # configure LyX - # Set a path prefix in lyxrc.dist + ; configure LyX + ; Set a path prefix in lyxrc.dist ClearErrors ${if} "$PathPrefix" != "" Delete "$INSTDIR\Resources\lyxrc.dist" @@ -240,7 +240,7 @@ Section "-Installation actions" SecInstallation MessageBox MB_OK|MB_ICONEXCLAMATION "$(ModifyingConfigureFailed)" ${endif} - # Create a batch file to start LyX with the environment variables set + ; Create a batch file to start LyX with the environment variables set ClearErrors Delete "${PRODUCT_BAT}" FileOpen $R1 "${PRODUCT_BAT}" w @@ -252,17 +252,17 @@ Section "-Installation actions" SecInstallation IfErrors 0 +2 MessageBox MB_OK|MB_ICONEXCLAMATION "$(CreateCmdFilesFailed)" - # set the preferences file - # having one preferences file that is modified to fit the needs isn't possible because the command - # ${LineFind} "$INSTDIR\Resources\preferences" "" "-16:-11" "DeleteLines" ; macro from TextFunc.nsh - # removes the file permissions for Users, so that it can later not be read (bug in ${LineFind} of TextFunc.nsh) - # if not Acrobat or Adobe Reader is used + ; set the preferences file + ; having one preferences file that is modified to fit the needs isn't possible because the command + ; ${LineFind} "$INSTDIR\Resources\preferences" "" "-16:-11" "DeleteLines" ; macro from TextFunc.nsh + ; removes the file permissions for Users, so that it can later not be read (bug in ${LineFind} of TextFunc.nsh) + ; if not Acrobat or Adobe Reader is used ${if} $Acrobat == "None" ; clear the entries in the preferences file that define PDFViewWin7 or 8 as viewer Rename "$INSTDIR\Resources\preferencesGSview" "$INSTDIR\Resources\preferences" Delete "$INSTDIR\Resources\preferences7" Delete "$INSTDIR\Resources\preferences8" ${endif} - # if Acrobat or Adobe Reader is used + ; if Acrobat or Adobe Reader is used ${if} $Acrobat == "7" ; clear the entries in the preferences file that define PDFViewWin8 as viewer Rename "$INSTDIR\Resources\preferences7" "$INSTDIR\Resources\preferences" Delete "$INSTDIR\Resources\preferences8" @@ -274,7 +274,7 @@ Section "-Installation actions" SecInstallation Delete "$INSTDIR\Resources\preferencesGSview" ${endif} - # register LyX + ; register LyX WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "${PRODUCT_EXE}" WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "RootKey" "$ProductRootKey" WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${PRODUCT_NAME} ${PRODUCT_VERSION}" @@ -300,18 +300,18 @@ Section "-Installation actions" SecInstallation CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}" ${endif} - # register the extension .lyx + ; register the extension .lyx ${if} $CreateFileAssociations == "true" ${CreateApplicationAssociation} "${PRODUCT_NAME}" "${PRODUCT_NAME}" "$(FileTypeTitle)" "${PRODUCT_EXE}" "${PRODUCT_BAT}" ${CreateFileAssociation} "${PRODUCT_EXT}" "${PRODUCT_NAME}" "${PRODUCT_MIME_TYPE}" ${endif} - # create the LyX Application Data folder for all users - # this folder is automatically created by LyX when it is first started but we want to start LyX with a specific session file, - # so we create this folder before LyX starts and copy there the session file + ; create the LyX Application Data folder for all users + ; this folder is automatically created by LyX when it is first started but we want to start LyX with a specific session file, + ; so we create this folder before LyX starts and copy there the session file Call CreateAppPathSub ; function from LyXUtils.nsh - # delete unnecessary files + ; delete unnecessary files ${if} $DelPythonFiles == "True" Delete $INSTDIR\bin\python.exe Delete $INSTDIR\bin\python25.dll @@ -321,16 +321,16 @@ Section "-Installation actions" SecInstallation ${endif} RMDir /r $INSTDIR\external - # create Uninstaller + ; create Uninstaller WriteUninstaller "${PRODUCT_UNINSTALL_EXE}" - # run LyX's configure script - # create a bat-file to start configure in a console window so that the user see the progress - # of the configuration and to have a signal when the configuration is ready to start LyX - # this is important when LyX is installed together with MiKTeX or when LyX is installed for the first - # time on a computer, because the installation of missing LaTeX-files required by LyX could last minutes - # a batch file is needed because simply calling ExecWait '"$INSTDIR\bin\python.exe" "$INSTDIR\Resources\configure.py"' - # creates the config files in $INSTDIR\bin + ; run LyX's configure script + ; create a bat-file to start configure in a console window so that the user see the progress + ; of the configuration and to have a signal when the configuration is ready to start LyX + ; this is important when LyX is installed together with MiKTeX or when LyX is installed for the first + ; time on a computer, because the installation of missing LaTeX-files required by LyX could last minutes + ; a batch file is needed because simply calling ExecWait '"$INSTDIR\bin\python.exe" "$INSTDIR\Resources\configure.py"' + ; creates the config files in $INSTDIR\bin StrCpy $1 $INSTDIR 2 ; get drive letter FileOpen $R1 "$INSTDIR\Resources\configLyX.bat" w FileWrite $R1 'cd $INSTDIR\Resources\$\r$\n\ @@ -341,7 +341,7 @@ Section "-Installation actions" SecInstallation ExecWait '"$INSTDIR\Resources\configLyX.bat"' Delete "$INSTDIR\Resources\configLyX.bat" - # ask to update MiKTeX + ; ask to update MiKTeX ${if} $MiKTeXInstalled == "yes" MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" IDYES UpdateNow IDNO UpdateLater UpdateNow: @@ -350,7 +350,7 @@ Section "-Installation actions" SecInstallation UpdateLater: ${endif} - # save MiKTeX's install path to be able to remove LyX's LaTeX-files in the uninstaller + ; save MiKTeX's install path to be able to remove LyX's LaTeX-files in the uninstaller FileOpen $R1 "$INSTDIR\Resources\uninstallPaths.dat" w FileWrite $R1 '$LaTeXPath' FileClose $R1 diff --git a/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-small.nsh b/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-small.nsh index 3f2236aea6..e5279b7156 100644 --- a/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-small.nsh +++ b/development/Win32/packaging/installer/LyXWinInstaller/InstallActions-small.nsh @@ -1,27 +1,27 @@ -# The '-' makes the section invisible. -# Sections are entered in order, so the settings above are all -# available to SecInstallation +; The '-' makes the section invisible. +; Sections are entered in order, so the settings above are all +; available to SecInstallation Section "-Installation actions" SecInstallation - # extract all files + ; extract all files SetOutPath "$INSTDIR" File /r "${PRODUCT_SOURCEDIR}\bin" File /r "${PRODUCT_SOURCEDIR}\etc" File /r "${PRODUCT_SOURCEDIR}\Resources" ${if} $GhostscriptPath == "" - # register Ghostscript + ; register Ghostscript WriteRegStr HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion}" "GS_DLL" "${GhostscriptDir}\bin\gsdll32.dll" WriteRegStr HKLM "SOFTWARE\GPL Ghostscript\${GhostscriptVersion}" "GS_LIB" "${GhostscriptDir}\lib;${GhostscriptDir}\fonts;${GhostscriptDir}\Resource" - WriteRegStr HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" "Yes" ; special entry to tell the uninstaller that it was installed with LyX + WriteRegStr HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" ; special entry to tell the uninstaller that it was installed with LyX StrCpy $GhostscriptPath "${GhostscriptDir}\bin" ${else} - # delete unnecessary files + ; delete unnecessary files RMDir /r ${GhostscriptDir} ${endif} ${if} $ImageMagickPath == "" - # register ImageMagick + ; register ImageMagick WriteRegStr HKLM "SOFTWARE\Classes\Applications" "AutoRun" "${ImageMagickDir}\convert.exe $$" WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "BinPath" "${ImageMagickDir}" WriteRegStr HKLM "SOFTWARE\ImageMagick\${ImageMagickVersion}\Q:16" "CoderModulesPath" "${ImageMagickDir}\modules\coders" @@ -37,25 +37,25 @@ Section "-Installation actions" SecInstallation WriteRegDWORD HKLM "SOFTWARE\ImageMagick\Current" "QuantumDepth" 0x00000010 WriteRegStr HKLM "SOFTWARE\ImageMagick\Current" "Version" "${ImageMagickVersion}" - WriteRegStr HKLM "Software\ImageMagick" "OnlyWithLyX" "Yes" ; special entry to tell the uninstaller that it was installed with LyX + WriteRegStr HKLM "Software\ImageMagick" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" ; special entry to tell the uninstaller that it was installed with LyX StrCpy $ImageMagickPath ${ImageMagickDir} ${else} - # delete unnecessary files + ; delete unnecessary files RMDir /r ${ImageMagickDir} ${endif} ${if} $AspellPath == "" - # extract Aspell's program files + ; extract Aspell's program files SetOutPath "$INSTDIR\external" File /r "${PRODUCT_SOURCEDIR}\${AspellInstall}" - # copy the files and register Aspell + ; copy the files and register Aspell CopyFiles "$INSTDIR\${AspellInstall}" "$APPDATA" WriteRegStr HKLM "SOFTWARE\Aspell" "Base Path" "${AspellDir}" WriteRegStr HKLM "SOFTWARE\Aspell" "Dictionary Path" "${AspellDictPath}" WriteRegStr HKLM "SOFTWARE\Aspell" "Personal Path" "${AspellPersonalPath}" - WriteRegStr HKLM "Software\Aspell" "OnlyWithLyX" "Yes" ; special entry to tell the uninstaller that it was installed with LyX + WriteRegStr HKLM "Software\Aspell" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" ; special entry to tell the uninstaller that it was installed with LyX WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Aspell" "DisplayName" "${AspellDisplay}" WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Aspell" "NoModify" 0x00000001 @@ -64,16 +64,16 @@ Section "-Installation actions" SecInstallation ${endif} ${if} $AiksaurusPath == "" - # extract Aiksaurus' program files + ; extract Aiksaurus' program files SetOutPath "$INSTDIR\external" File /r "${PRODUCT_SOURCEDIR}\${AiksaurusInstall}" - # copy the files and register Aiksaurus + ; copy the files and register Aiksaurus CopyFiles "$INSTDIR\${AiksaurusInstall}" "$APPDATA" -# WriteRegStr HKLM "Software\Aiksaurus" "OnlyWithLyX" "Yes" ; special entry to tell the uninstaller that it was installed with LyX -# WriteRegStr HKLM "Software\Aiksaurus" "Data Path" "${AiksaurusDir}" +; WriteRegStr HKLM "Software\Aiksaurus" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}" ; special entry to tell the uninstaller that it was installed with LyX +; WriteRegStr HKLM "Software\Aiksaurus" "Data Path" "${AiksaurusDir}" ${endif} - # create the PathPrefix + ; create the PathPrefix StrCpy $PathPrefix "$INSTDIR\bin" ${if} $PythonPath != "" StrCpy $PathPrefix "$PathPrefix;$PythonPath" @@ -97,8 +97,8 @@ Section "-Installation actions" SecInstallation StrCpy $PathPrefix "$PathPrefix;$ImageEditorPath" ${endif} - # install the LaTeX class files that are delivered with LyX - # and enable MiKTeX's automatic package installation + ; install the LaTeX class files that are delivered with LyX + ; and enable MiKTeX's automatic package installation StrCpy $String $LatexPath StrCpy $Search "miktex\bin" StrLen $3 $String @@ -106,7 +106,7 @@ Section "-Installation actions" SecInstallation ${if} $Pointer != "-1" ; if something was found IntOp $Pointer $Pointer - 1 ; jump before the first "\" of "\miktex\bin" StrCpy $String $String "$Pointer" ; $String is now the part before "\miktex\bin" - # install LaTeX class files + ; install LaTeX class files SetOutPath "$String\tex\latex" File "${ClassFileDir}\cv.cls" CreateDirectory "$String\tex\latex\lyx" @@ -122,48 +122,48 @@ Section "-Installation actions" SecInstallation CreateDirectory "$String\tex\latex\broadway" SetOutPath "$String\tex\latex\broadway" File "${ClassFileDir}\broadway.cls" - # install LaTeX-package dvipost (dvipost is not available for MiKTeX) + ; install LaTeX-package dvipost (dvipost is not available for MiKTeX) SetOutPath "$String\tex\latex\" File /r "${DVIPostFileDir}" ${if} $MiKTeXVersion == "2.4" - # refresh MiKTeX's file name database + ; refresh MiKTeX's file name database ExecWait "$String\miktex\bin\initexmf --update-fndb" - # delete MiKTeX 2.4's dvipng executable as it is an old broken version. Then install a working one. + ; delete MiKTeX 2.4's dvipng executable as it is an old broken version. Then install a working one. Delete "$String\miktex\bin\dvipng.exe" - # Install a new one + ; Install a new one SetOutPath "$String\miktex\bin" File "${PRODUCT_DIR}\LyX\external\dvipng.exe" - # enable package installation without asking (1=Yes, 0=No, 2=Always Ask Before Installing) + ; enable package installation without asking (1=Yes, 0=No, 2=Always Ask Before Installing) WriteRegStr HKCU "SOFTWARE\MiK\MiKTeX\CurrentVersion\MiKTeX" "InstallPackagesOnTheFly" "1" WriteRegStr HKCU "SOFTWARE\MiK\MiKTeX\CurrentVersion\MPM\Settings" "" "" - # Setting package repository (MiKTeX's primary package repository) + ; Setting package repository (MiKTeX's primary package repository) WriteRegStr HKCU "SOFTWARE\MiK\MiKTeX\CurrentVersion\MPM" "RemotePackageRepository" "${MiKTeXRepo}" ${else} ; if MiKTeX 2.5 - # refresh MiKTeX's file name database + ; refresh MiKTeX's file name database ExecWait "$LaTeXPath\initexmf --update-fndb" - # enable package installation without asking (t = Yes, f = No) + ; enable package installation without asking (t = Yes, f = No) WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\2.5\MPM" "AutoInstall" "1" ; if only for curent user WriteRegStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "MIKTEX_AUTOINSTALL" "t" - # set package repository (MiKTeX's primary package repository) + ; set package repository (MiKTeX's primary package repository) WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\2.5\MPM" "RemoteRepository" "${MiKTeXRepo}" ; if only for curent user WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\2.5\MPM" "RepositoryType" "remote" ; if only for curent user WriteRegStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "MIKTEX_REPOSITORY" "${MiKTeXRepo}" ${endif} - # enable MiKTeX's automatic package installation + ; enable MiKTeX's automatic package installation ExecWait '$LaTeXPath\mpm.com --update-fndb' ${endif} ; end ${if} $Pointer - # install Aspell dictionaries + ; install Aspell dictionaries ${if} $LangCode == "nb_NO" StrCpy $LangCode "no_NO" ; we only have a norwegian dictionary available ${endif} Call InstallAspellDictionary ; function from aspell.nsh - # configure LyX - # Set a path prefix in lyxrc.dist + ; configure LyX + ; Set a path prefix in lyxrc.dist ClearErrors ${if} "$PathPrefix" != "" Delete "$INSTDIR\Resources\lyxrc.dist" @@ -174,7 +174,7 @@ Section "-Installation actions" SecInstallation MessageBox MB_OK|MB_ICONEXCLAMATION "$(ModifyingConfigureFailed)" ${endif} - # Create a batch file to start LyX with the environment variables set + ; Create a batch file to start LyX with the environment variables set ClearErrors Delete "${PRODUCT_BAT}" FileOpen $R1 "${PRODUCT_BAT}" w @@ -186,17 +186,17 @@ Section "-Installation actions" SecInstallation IfErrors 0 +2 MessageBox MB_OK|MB_ICONEXCLAMATION "$(CreateCmdFilesFailed)" - # set the preferences file - # having one preferences file that is modified to fit the needs isn't possible because the command - # ${LineFind} "$INSTDIR\Resources\preferences" "" "-16:-11" "DeleteLines" ; macro from TextFunc.nsh - # removes the file permissions for Users, so that it can later not be read (bug in ${LineFind} of TextFunc.nsh) - # if not Acrobat or Adobe Reader is used + ; set the preferences file + ; having one preferences file that is modified to fit the needs isn't possible because the command + ; ${LineFind} "$INSTDIR\Resources\preferences" "" "-16:-11" "DeleteLines" ; macro from TextFunc.nsh + ; removes the file permissions for Users, so that it can later not be read (bug in ${LineFind} of TextFunc.nsh) + ; if not Acrobat or Adobe Reader is used ${if} $Acrobat == "None" ; clear the entries in the preferences file that define PDFViewWin7 or 8 as viewer Rename "$INSTDIR\Resources\preferencesGSview" "$INSTDIR\Resources\preferences" Delete "$INSTDIR\Resources\preferences7" Delete "$INSTDIR\Resources\preferences8" ${endif} - # if Acrobat or Adobe Reader is used + ; if Acrobat or Adobe Reader is used ${if} $Acrobat == "7" ; clear the entries in the preferences file that define PDFViewWin8 as viewer Rename "$INSTDIR\Resources\preferences7" "$INSTDIR\Resources\preferences" Delete "$INSTDIR\Resources\preferences8" @@ -208,7 +208,7 @@ Section "-Installation actions" SecInstallation Delete "$INSTDIR\Resources\preferencesGSview" ${endif} - # register LyX + ; register LyX WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "${PRODUCT_EXE}" WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "RootKey" "$ProductRootKey" WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${PRODUCT_NAME} ${PRODUCT_VERSION}" @@ -234,18 +234,18 @@ Section "-Installation actions" SecInstallation CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "${PRODUCT_BAT}" "" "${PRODUCT_EXE}" ${endif} - # register the extension .lyx + ; register the extension .lyx ${if} $CreateFileAssociations == "true" ${CreateApplicationAssociation} "${PRODUCT_NAME}" "${PRODUCT_NAME}" "$(FileTypeTitle)" "${PRODUCT_EXE}" "${PRODUCT_BAT}" ${CreateFileAssociation} "${PRODUCT_EXT}" "${PRODUCT_NAME}" "${PRODUCT_MIME_TYPE}" ${endif} - # create the LyX Application Data folder for all users - # this folder is automatically created by LyX when it is first started but we want to start LyX with a specific session file, - # so we create this folder before LyX starts and copy there the session file + ; create the LyX Application Data folder for all users + ; this folder is automatically created by LyX when it is first started but we want to start LyX with a specific session file, + ; so we create this folder before LyX starts and copy there the session file Call CreateAppPathSub ; function from LyXUtils.nsh - # delete unnecessary files + ; delete unnecessary files ${if} $DelPythonFiles == "True" Delete $INSTDIR\bin\python.exe Delete $INSTDIR\bin\python25.dll @@ -255,16 +255,16 @@ Section "-Installation actions" SecInstallation ${endif} RMDir /r $INSTDIR\external - # create Uninstaller + ; create Uninstaller WriteUninstaller "${PRODUCT_UNINSTALL_EXE}" - # run LyX's configure script - # create a bat-file to start configure in a console window so that the user see the progress - # of the configuration and to have a signal when the configuration is ready to start LyX - # this is important when LyX is installed together with MiKTeX or when LyX is installed for the first - # time on a computer, because the installation of missing LaTeX-files required by LyX could last minutes - # a batch file is needed because simply calling ExecWait '"$INSTDIR\bin\python.exe" "$INSTDIR\Resources\configure.py"' - # creates the config files in $INSTDIR\bin + ; run LyX's configure script + ; create a bat-file to start configure in a console window so that the user see the progress + ; of the configuration and to have a signal when the configuration is ready to start LyX + ; this is important when LyX is installed together with MiKTeX or when LyX is installed for the first + ; time on a computer, because the installation of missing LaTeX-files required by LyX could last minutes + ; a batch file is needed because simply calling ExecWait '"$INSTDIR\bin\python.exe" "$INSTDIR\Resources\configure.py"' + ; creates the config files in $INSTDIR\bin StrCpy $1 $INSTDIR 2 ; get drive letter FileOpen $R1 "$INSTDIR\Resources\configLyX.bat" w FileWrite $R1 'cd $INSTDIR\Resources\$\r$\n\ @@ -275,7 +275,7 @@ Section "-Installation actions" SecInstallation ExecWait '"$INSTDIR\Resources\configLyX.bat"' Delete "$INSTDIR\Resources\configLyX.bat" - # ask to update MiKTeX + ; ask to update MiKTeX ${if} $MiKTeXInstalled == "yes" MessageBox MB_YESNO|MB_ICONINFORMATION "$(MiKTeXInfo)" IDYES UpdateNow IDNO UpdateLater UpdateNow: @@ -284,7 +284,7 @@ Section "-Installation actions" SecInstallation UpdateLater: ${endif} - # save MiKTeX's install path to be able to remove LyX's LaTeX-files in the uninstaller + ; save MiKTeX's install path to be able to remove LyX's LaTeX-files in the uninstaller FileOpen $R1 "$INSTDIR\Resources\uninstallPaths.dat" w FileWrite $R1 '$LaTeXPath' FileClose $R1 diff --git a/development/Win32/packaging/installer/LyXWinInstaller/LyX-Installer-Complete.nsi b/development/Win32/packaging/installer/LyXWinInstaller/LyX-Installer-Complete.nsi index e219b2402f..511f9b99aa 100644 --- a/development/Win32/packaging/installer/LyXWinInstaller/LyX-Installer-Complete.nsi +++ b/development/Win32/packaging/installer/LyXWinInstaller/LyX-Installer-Complete.nsi @@ -26,7 +26,7 @@ CRCCheck force !define PRODUCT_DIR "D:\LyXPackage1.5" !define PRODUCT_NAME "LyX" -!define PRODUCT_VERSION "1.5svn-09-04-2007" +!define PRODUCT_VERSION "1.5svn-xx-04-2007" !define PRODUCT_VERSION_SHORT "150svn" !define PRODUCT_SUBFOLDER "lyx15" !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt" @@ -40,10 +40,10 @@ CRCCheck force !define PRODUCT_ABOUT_URL "http://www.lyx.org/about/" !define PRODUCT_INFO_URL "http://www.lyx.org/" -BrandingText "LyXWinInstaller v3.11 - Complete" +BrandingText "LyXWinInstaller v3.12 - Complete" !define INSTALLER_VERSION "Complete" -!define INSTALLER_EXE "LyXWin150svnComplete-3-11.exe" -!define INSTALLER2_EXE "LyXWin150svnSmall-3-11.exe" ; to check later if this installer version is running at the same time +!define INSTALLER_EXE "LyXWin150svnComplete-3-12.exe" +!define INSTALLER2_EXE "LyXWin150svnSmall-3-12.exe" ; to check later if this installer version is running at the same time !define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp" ; Replaced by HKLM or HKCU depending on SetShellVarContext. @@ -415,7 +415,7 @@ Function un.onInit ; test if Aspell was installed together with LyX ReadRegStr $0 HKLM "Software\Aspell" "OnlyWithLyX" ; special entry to test if it was installed with LyX - ${if} $0 == "Yes" + ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" SectionSetText 2 "Aspell" ; names the corersponding uninstaller section (has the index "2" as it is the third section in Uninstall.nsh) StrCpy $AspellInstallYes "Aspell" ${else} @@ -424,7 +424,7 @@ Function un.onInit ; test if MiKTeX was installed together with LyX ReadRegStr $0 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" - ${if} $0 == "Yes" + ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" SectionSetText 3 "MiKTeX" ; names the corersponding uninstaller section StrCpy $MiKTeXInstalled "MiKTeX" ${else} @@ -433,7 +433,7 @@ Function un.onInit ; test if JabRef was installed together with LyX ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${JabRefVersion}" "OnlyWithLyX" - ${if} $0 == "Yes" + ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" SectionSetText 4 "JabRef" ; names the corersponding uninstaller section StrCpy $JabRefInstalled "JabRef" ${else} diff --git a/development/Win32/packaging/installer/LyXWinInstaller/LyX-Installer-Small.nsi b/development/Win32/packaging/installer/LyXWinInstaller/LyX-Installer-Small.nsi index ab19b45f5d..34e1dd31ef 100644 --- a/development/Win32/packaging/installer/LyXWinInstaller/LyX-Installer-Small.nsi +++ b/development/Win32/packaging/installer/LyXWinInstaller/LyX-Installer-Small.nsi @@ -26,7 +26,7 @@ CRCCheck force !define PRODUCT_DIR "D:\LyXPackage1.5" !define PRODUCT_NAME "LyX" -!define PRODUCT_VERSION "1.5svn-09-04-2007" +!define PRODUCT_VERSION "1.5svn-xx-04-2007" !define PRODUCT_VERSION_SHORT "150svn" !define PRODUCT_SUBFOLDER "lyx15" !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt" @@ -40,10 +40,10 @@ CRCCheck force !define PRODUCT_ABOUT_URL "http://www.lyx.org/about/" !define PRODUCT_INFO_URL "http://www.lyx.org/" -BrandingText "LyXWinInstaller v3.11 - Small" +BrandingText "LyXWinInstaller v3.12 - Small" !define INSTALLER_VERSION "Small" -!define INSTALLER_EXE "LyXWin150svnSmall-3-11.exe" -!define INSTALLER2_EXE "LyXWin150svnComplete-3-11.exe" ; to check later if this installer version is running at the same time +!define INSTALLER_EXE "LyXWin150svnSmall-3-12.exe" +!define INSTALLER2_EXE "LyXWin150svnComplete-3-12.exe" ; to check later if this installer version is running at the same time !define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp" ; Replaced by HKLM or HKCU depending on SetShellVarContext. @@ -399,7 +399,7 @@ Function un.onInit ; test if Aspell was installed together with LyX ReadRegStr $0 HKLM "Software\Aspell" "OnlyWithLyX" ; special entry to test if it was installed with LyX - ${if} $0 == "Yes" + ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" SectionSetText 2 "Aspell" ; names the corersponding uninstaller section (has the index "2" as it is the third section in Uninstall.nsh) StrCpy $AspellInstallYes "Aspell" ${else} @@ -408,7 +408,7 @@ Function un.onInit ; test if MiKTeX was installed together with LyX ReadRegStr $0 HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" - ${if} $0 == "Yes" + ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" SectionSetText 3 "MiKTeX" ; names the corersponding uninstaller section StrCpy $MiKTeXInstalled "MiKTeX" ${else} diff --git a/development/Win32/packaging/installer/LyXWinInstaller/ReadmeComplete.txt b/development/Win32/packaging/installer/LyXWinInstaller/ReadmeComplete.txt deleted file mode 100644 index 1d9af76318..0000000000 --- a/development/Win32/packaging/installer/LyXWinInstaller/ReadmeComplete.txt +++ /dev/null @@ -1,96 +0,0 @@ -Description - -This is the readme of the variant "complete" of the LyXWinInstaller. Please read -this file carefully to prevent troubles with the installer. -The LyXWinInstaller installs a complete LaTeX-environment together with the -wordprocessor "LyX" (www.lyx.org) and needed programs on Windows 2000/XP/XPx64. -! Win95, Win98, and WinME are NOT supported. ! - ---- -Prerequisites - -To use the installer you need administrator privileges. - -An open internet connection is recommended as several LaTeX-packages and -spellchecker dictionaris can than be downloaded and installed automatically. - -It is not essential but would be an advantage if you have the PDF-viewer -"Adobe Reader" installed before running the installer. - -If you want to use a LaTeX-distribution from a network drive or a live-CD/DVD -then use the installer version "small". - ---- -Installed Applications - -The variant "complete" of the LyXWinInstaller analyses your system and installs, -if needed, a fully functional version of: - -- MiKTeX, a LaTeX-distribution -- Aspell, a spellchecker -- Ghostscript, an interpreter for Postscript and PDF -- ImageMagick, an image converter -- (optional) GSview, a viewer for Postscript and PDF-documents -- (optional) JabRef, an editor for BibTeX database files - -ImageMagick and Ghostscript won't appear in the list of the installed programs -in Window's system control because they are installed in a special version to -use them with LyX. But if you decide to install another version of the programs -you can do this without problems and without uninstalling LyX. -If you want to install GSview manually later you can do this without a new -installation of Ghostscript. - ---- -After the Installation - -To view/edit external files like images LyX uses the default program set in the registry -for a file extension. This installer checks for many programs so that you only need to type -the name of their executables in LyX's preferences to change this. -For example the default viewer for PNG-images on Windows is "Paint". To change it to Gimp, -set "gimp-2.2" as viewer/editor for the PNG file format in LyX's preferences. - ---- -Known Problems - -You can't install LyX to a folder that has accents or umlauts in its name. - -If you use LyX with a computer user account that has accents or umlauts in its name, -change LyX's paths in the menu Edit -> Preferences so that they don't contain accents -and restart LyX. - -The live-variant of TeX-Live don't work together with LyX due to incompatible Ghostscript -and dv2dt/dt2dv versions. -TeX-Live will only work together with LyX when it is installed without Ghostscript. - ---- -The Uninstaller - -LyXWinInstall's uninstaller uninstalls LyX. Aspell, Ghostscript, GSview, ImageMagick, JabRef, -and MiKTeX are only uninstalled when they were installed together with LyX. You can uninstall -Aspell, GSview, JabRef, and MiKTeX also separately via Window's Software menu in the system -control. - ---- -Internationalization - -The installer language string files can be found in the subfolder -"lyx_languages" of the sourcecode package: -https://developer.berlios.de/project/showfiles.php?group_id=5117 - -If you want to help the project you can translate them or create a new language -string file based on the file "english.nsh". -Please send the modified files as patch to -http://developer.berlios.de/patch/?group_id=5117 -or to -uwestoehrweb.de. - ---- -License - -The scripts of the LyXWinInstaller are released under the GNU General Public -License (GPL). A package with the sourcecode can be found -in the section "LyxWinInstallerSource" of -http://developer.berlios.de/project/showfiles.php?group_id=5117 - -The license files of all used pgrograms can be found in the subdirectory "bin" -of LyX's installation folder. diff --git a/development/Win32/packaging/installer/LyXWinInstaller/ReadmeComplete1.5.txt b/development/Win32/packaging/installer/LyXWinInstaller/ReadmeComplete1.5.txt new file mode 100644 index 0000000000..c7493775f8 --- /dev/null +++ b/development/Win32/packaging/installer/LyXWinInstaller/ReadmeComplete1.5.txt @@ -0,0 +1,96 @@ +Description + +This is the readme of the variant "complete" of the LyXWinInstaller. Please read +this file carefully to prevent troubles with the installer. +The LyXWinInstaller installs a complete LaTeX-environment together with the +wordprocessor "LyX" (www.lyx.org) and needed programs on Windows 2000/XP/XPx64/Vista. +! Win95, Win98, and WinME are NOT supported. ! + +--- +Prerequisites + +To use the installer you need administrator privileges. + +An open internet connection is recommended as several LaTeX-packages and +spellchecker dictionaris can than be downloaded and installed automatically. + +It is not essential but would be an advantage if you have the PDF-viewer +"Adobe Reader" installed before running the installer. + +If you want to use a LaTeX-distribution from a network drive or a live-CD/DVD +then use the installer version "small". + +--- +Installed Applications + +The variant "complete" of the LyXWinInstaller analyses your system and installs, +if needed, a fully functional version of: + +- MiKTeX, a LaTeX-distribution +- Aspell, a spellchecker +- Ghostscript, an interpreter for Postscript and PDF +- ImageMagick, an image converter +- (optional) GSview, a viewer for Postscript and PDF-documents +- (optional) JabRef, an editor for BibTeX database files + +ImageMagick and Ghostscript won't appear in the list of the installed programs +in Window's system control because they are installed in a special version to +use them with LyX. But if you decide to install another version of the programs +you can do this without problems and without uninstalling LyX. +If you want to install GSview manually later you can do this without a new +installation of Ghostscript. + +--- +After the Installation + +To view/edit external files like images LyX uses the default program set in the registry +for a file extension. This installer checks for many programs so that you only need to type +the name of their executables in LyX's preferences to change this. +For example the default viewer for PNG-images on Windows is "Paint". To change it to Gimp, +set "gimp-2.2" as viewer/editor for the PNG file format in LyX's preferences. + +--- +Known Problems + +You can't install LyX to a folder that has accents or umlauts in its name. + +If you use LyX with a computer user account that has accents or umlauts in its name, +change LyX's paths in the menu Edit -> Preferences so that they don't contain accents +and restart LyX. + +The live-variant of TeX-Live don't work together with LyX due to incompatible Ghostscript +and dv2dt/dt2dv versions. +TeX-Live will only work together with LyX when it is installed without Ghostscript. + +--- +The Uninstaller + +LyXWinInstall's uninstaller uninstalls LyX. Aspell, Ghostscript, GSview, ImageMagick, JabRef, +and MiKTeX are only uninstalled when they were installed together with LyX. You can uninstall +Aspell, GSview, JabRef, and MiKTeX also separately via Window's Software menu in the system +control. + +--- +Internationalization + +The installer language string files can be found in the subfolder +"lyx_languages" of the sourcecode package: +https://developer.berlios.de/project/showfiles.php?group_id=5117 + +If you want to help the project you can translate them or create a new language +string file based on the file "english.nsh". +Please send the modified files as patch to +http://developer.berlios.de/patch/?group_id=5117 +or to +uwestoehrweb.de. + +--- +License + +The scripts of the LyXWinInstaller are released under the GNU General Public +License (GPL). A package with the sourcecode can be found +in the section "LyxWinInstallerSource" of +http://developer.berlios.de/project/showfiles.php?group_id=5117 + +The license files of all used pgrograms can be found in the subdirectory "bin" +of LyX's installation folder. diff --git a/development/Win32/packaging/installer/LyXWinInstaller/ReadmePackage.txt b/development/Win32/packaging/installer/LyXWinInstaller/ReadmePackage.txt deleted file mode 100644 index 7ce91c8b28..0000000000 --- a/development/Win32/packaging/installer/LyXWinInstaller/ReadmePackage.txt +++ /dev/null @@ -1,89 +0,0 @@ -Description - -This is the readme of the complete installer package. -The file LyXPackageComplete-x-x.rar contains the NSIS (Nullsoft Install System) scripts and -all used program files. It is needed if you want to build the LyXWinInstaller by yourself. -You can download the file for every release from: -http://developer.berlios.de/projects/lyxwininstall/ - ---- -General -To compile the installer scripts you need at least NSIS version 2.25. -The installer scripts need the plugins "FindProc" and "InetLoad". To use it copy the files "FindProcDLL.dll" and "InetLoad.dll" from the "LyXPackage" folder to NSIS'"Plugins" directory. - ---- -Internationalization - -The subfolder "lyx_languages" -contains the language string files. If you want to help the project then -translate them or create a new language string file based on the file -"english.nsh". Please send the modified files as patch of the category -"Language" to -http://developer.berlios.de/patch/?group_id=5117 -or to -uwestoehrweb.de. - ---- -License - -The scripts are released under the GNU General Public License (GPL), -see the license file. -The licenses of all used programs can be found in the folder ~\LyX\bin of this package. - ---- -ImageMagick - -License: ImageMagick license - -The folder ~\LyX\etc\ImageMagick contains all used files from ImageMagick 6.3.3 - ---- -Ghostscript - -License: GPL - -The folder ~\LyX\etc\Ghostscript contains all used files from GPL Ghostscript 8.56 - ---- -Aspell - -License: GPL - -The files of Aspell 0.60-4 are in the folder ~\LyX\external\Aspell -Dictionaries will be downloaded at runtime, the different licenses of the dictionaries -will be displayed before they are installed. - ---- -Python - -License: Python license - -The following files from Python 2.5 are used: - -python.exe and python25.dll are in the folder ~\LyX\bin. - -The subfolders of ~\LyX\bin contain all other used python files. - ---- -MiKTeX - -License: GPL - -The small version of MiKTeX is included together with its installer. MiKTeX will be -installed and uninstalled using its own installer. - ---- -GSview - -License: AFPL - -GSview is included completely. It will be installed and uninstalled using its own -installer. - ---- -JabRef - -License: GPL - -GSview is included completely. It will be installed and uninstalled using its own -installer. diff --git a/development/Win32/packaging/installer/LyXWinInstaller/ReadmePackage1.5.txt b/development/Win32/packaging/installer/LyXWinInstaller/ReadmePackage1.5.txt new file mode 100644 index 0000000000..7ce91c8b28 --- /dev/null +++ b/development/Win32/packaging/installer/LyXWinInstaller/ReadmePackage1.5.txt @@ -0,0 +1,89 @@ +Description + +This is the readme of the complete installer package. +The file LyXPackageComplete-x-x.rar contains the NSIS (Nullsoft Install System) scripts and +all used program files. It is needed if you want to build the LyXWinInstaller by yourself. +You can download the file for every release from: +http://developer.berlios.de/projects/lyxwininstall/ + +--- +General +To compile the installer scripts you need at least NSIS version 2.25. +The installer scripts need the plugins "FindProc" and "InetLoad". To use it copy the files "FindProcDLL.dll" and "InetLoad.dll" from the "LyXPackage" folder to NSIS'"Plugins" directory. + +--- +Internationalization + +The subfolder "lyx_languages" +contains the language string files. If you want to help the project then +translate them or create a new language string file based on the file +"english.nsh". Please send the modified files as patch of the category +"Language" to +http://developer.berlios.de/patch/?group_id=5117 +or to +uwestoehrweb.de. + +--- +License + +The scripts are released under the GNU General Public License (GPL), +see the license file. +The licenses of all used programs can be found in the folder ~\LyX\bin of this package. + +--- +ImageMagick + +License: ImageMagick license + +The folder ~\LyX\etc\ImageMagick contains all used files from ImageMagick 6.3.3 + +--- +Ghostscript + +License: GPL + +The folder ~\LyX\etc\Ghostscript contains all used files from GPL Ghostscript 8.56 + +--- +Aspell + +License: GPL + +The files of Aspell 0.60-4 are in the folder ~\LyX\external\Aspell +Dictionaries will be downloaded at runtime, the different licenses of the dictionaries +will be displayed before they are installed. + +--- +Python + +License: Python license + +The following files from Python 2.5 are used: + +python.exe and python25.dll are in the folder ~\LyX\bin. + +The subfolders of ~\LyX\bin contain all other used python files. + +--- +MiKTeX + +License: GPL + +The small version of MiKTeX is included together with its installer. MiKTeX will be +installed and uninstalled using its own installer. + +--- +GSview + +License: AFPL + +GSview is included completely. It will be installed and uninstalled using its own +installer. + +--- +JabRef + +License: GPL + +GSview is included completely. It will be installed and uninstalled using its own +installer. diff --git a/development/Win32/packaging/installer/LyXWinInstaller/ReadmeScripts1.5.txt b/development/Win32/packaging/installer/LyXWinInstaller/ReadmeScripts1.5.txt new file mode 100644 index 0000000000..07985ffec9 --- /dev/null +++ b/development/Win32/packaging/installer/LyXWinInstaller/ReadmeScripts1.5.txt @@ -0,0 +1,30 @@ +Description + +This is the readme of the script source code. +The file LyXPackageScripts-x-x.rar contains the NSIS (Nullsoft Install System) scripts and +used plugins. +You can download the file for every release from: +http://developer.berlios.de/projects/lyxwininstall/ + +--- +General +To compile the installer scripts you need at least NSIS version 2.25. +The installer scripts need the plugins "FindProc" and "InetLoad". To use it copy the files "FindProcDLL.dll" and "InetLoad.dll" from the "LyXPackage" folder to NSIS'"Plugins" directory. + +--- +Internationalization + +The subfolder "lyx_languages" +contains the language string files. If you want to help the project then +translate them or create a new language string file based on the file +"english.nsh". Please send the modified files as patch of the category +"Language" to +http://developer.berlios.de/patch/?group_id=5117 +or to +uwestoehrweb.de. + +--- +License + +The scripts are released under the GNU General Public License (GPL), +see the license file. diff --git a/development/Win32/packaging/installer/LyXWinInstaller/ReadmeSmall.txt b/development/Win32/packaging/installer/LyXWinInstaller/ReadmeSmall.txt deleted file mode 100644 index 78c1bb359c..0000000000 --- a/development/Win32/packaging/installer/LyXWinInstaller/ReadmeSmall.txt +++ /dev/null @@ -1,100 +0,0 @@ -Description - -This is the readme of the variant "small" of the LyXWinInstaller. Please read -this file carefully to prevent troubles with the installer. -The LyXWinInstaller installs the wordprocessor "LyX" (www.lyx.org) and some -needed programs on Windows 2000/XP/XPx64. -! Win95, Win98, and WinME are NOT supported. ! - ---- -General - -The installer variant "small" has the same functionality as the "complete" version -but doesn't include the LaTeX-distribution MiKTeX. It checks your system for an -installed version of MiKTeX (www.miktex.org) or TeXLive (http://www.tug.org/texlive/). - -The installer provides an option to to choose a LaTeX-distribution from a network -drive or a live-CD/DVD and an option to not use LyX with LaTeX. - ---- -Prerequisites - -To use the installer you need administrator privileges. -An open internet connection is recommended as several LaTeX-packages and -spellchecker dictionaris can than be downloaded and installed automatically. - -It is not essential but would be an advantage if you have the PDF-viewer -"Adobe Reader" installed before running the installer. - ---- -Installed Applications - -The variant "small" of the LyXWinInstaller analyses your system and installs, -if needed, a fully functional version of: - -- Aspell, a spellchecker -- Ghostscript, an interpreter for Postscript and PDF -- ImageMagick, an image converter -- (optional) GSview, a viewer for Postscript and PDF-documents - -ImageMagick and Ghostscript won't appear in the list of the installed programs -in Window's system control because they are installed in a special version to -use them with LyX. But if you decide to install another version of the programs -you can do this without problems and without uninstalling LyX. -If you want to install GSview manually later you can do this without a new -installation of Ghostscript. - ---- -After the Installation - -To view/edit external files like images LyX uses the default program set in the registry -for a file extension. This installer checks for many programs so that you only need to type -the name of their executables in LyX's preferences to change this. -For example the default viewer for PNG-images on Windows is "Paint". To change it to Gimp, -set "gimp-2.2" as viewer/editor for the PNG file format in LyX's preferences. - ---- -Known Problems - -You can't install LyX to a folder that has accents or umlauts in its name. - -If you use LyX with a computer user account that has accents or umlauts in its name, -change LyX's paths in the menu Edit -> Preferences so that they don't contain accents -and restart LyX. - -The live-variant of TeX-Live don't work together with LyX due to incompatible Ghostscript -and dv2dt/dt2dv versions. -TeX-Live will only work together with LyX when it is installed without Ghostscript. - ---- -The Uninstaller - -LyXWinInstall's uninstaller uninstalls LyX. Aspell, Ghostscript, GSview, ImageMagick, JabRef, -and MiKTeX are only uninstalled when they were installed together with LyX. You can uninstall -Aspell, GSview, JabRef, and MiKTeX also separately via Window's Software menu in the system -control. - ---- -Internationalization - -The installer language string files can be found in the subfolder -"lyx_languages" of the sourcecode package: -https://developer.berlios.de/project/showfiles.php?group_id=5117 - -If you want to help the project you can translate them or create a new language -string file based on the file "english.nsh". -Please send the modified files as patch to -http://developer.berlios.de/patch/?group_id=5117 -or to -uwestoehrweb.de. - ---- -License - -The scripts of the LyXWinInstaller are released under the GNU General Public -License (GPL). A package with the sourcecode can be found -in the section "LyxWinInstallerSource" of -http://developer.berlios.de/project/showfiles.php?group_id=5117 - -The license files of all used pgrograms can be found in the subdirectory "bin" -of LyX's installation folder. diff --git a/development/Win32/packaging/installer/LyXWinInstaller/ReadmeSmall1.5.txt b/development/Win32/packaging/installer/LyXWinInstaller/ReadmeSmall1.5.txt new file mode 100644 index 0000000000..e15f69ca0e --- /dev/null +++ b/development/Win32/packaging/installer/LyXWinInstaller/ReadmeSmall1.5.txt @@ -0,0 +1,100 @@ +Description + +This is the readme of the variant "small" of the LyXWinInstaller. Please read +this file carefully to prevent troubles with the installer. +The LyXWinInstaller installs the wordprocessor "LyX" (www.lyx.org) and some +needed programs on Windows 2000/XP/XPx64/Vista. +! Win95, Win98, and WinME are NOT supported. ! + +--- +General + +The installer variant "small" has the same functionality as the "complete" version +but doesn't include the LaTeX-distribution MiKTeX. It checks your system for an +installed version of MiKTeX (www.miktex.org) or TeXLive (http://www.tug.org/texlive/). + +The installer provides an option to to choose a LaTeX-distribution from a network +drive or a live-CD/DVD and an option to not use LyX with LaTeX. + +--- +Prerequisites + +To use the installer you need administrator privileges. +An open internet connection is recommended as several LaTeX-packages and +spellchecker dictionaris can than be downloaded and installed automatically. + +It is not essential but would be an advantage if you have the PDF-viewer +"Adobe Reader" installed before running the installer. + +--- +Installed Applications + +The variant "small" of the LyXWinInstaller analyses your system and installs, +if needed, a fully functional version of: + +- Aspell, a spellchecker +- Ghostscript, an interpreter for Postscript and PDF +- ImageMagick, an image converter +- (optional) GSview, a viewer for Postscript and PDF-documents + +ImageMagick and Ghostscript won't appear in the list of the installed programs +in Window's system control because they are installed in a special version to +use them with LyX. But if you decide to install another version of the programs +you can do this without problems and without uninstalling LyX. +If you want to install GSview manually later you can do this without a new +installation of Ghostscript. + +--- +After the Installation + +To view/edit external files like images LyX uses the default program set in the registry +for a file extension. This installer checks for many programs so that you only need to type +the name of their executables in LyX's preferences to change this. +For example the default viewer for PNG-images on Windows is "Paint". To change it to Gimp, +set "gimp-2.2" as viewer/editor for the PNG file format in LyX's preferences. + +--- +Known Problems + +You can't install LyX to a folder that has accents or umlauts in its name. + +If you use LyX with a computer user account that has accents or umlauts in its name, +change LyX's paths in the menu Edit -> Preferences so that they don't contain accents +and restart LyX. + +The live-variant of TeX-Live don't work together with LyX due to incompatible Ghostscript +and dv2dt/dt2dv versions. +TeX-Live will only work together with LyX when it is installed without Ghostscript. + +--- +The Uninstaller + +LyXWinInstall's uninstaller uninstalls LyX. Aspell, Ghostscript, GSview, ImageMagick, JabRef, +and MiKTeX are only uninstalled when they were installed together with LyX. You can uninstall +Aspell, GSview, JabRef, and MiKTeX also separately via Window's Software menu in the system +control. + +--- +Internationalization + +The installer language string files can be found in the subfolder +"lyx_languages" of the sourcecode package: +https://developer.berlios.de/project/showfiles.php?group_id=5117 + +If you want to help the project you can translate them or create a new language +string file based on the file "english.nsh". +Please send the modified files as patch to +http://developer.berlios.de/patch/?group_id=5117 +or to +uwestoehrweb.de. + +--- +License + +The scripts of the LyXWinInstaller are released under the GNU General Public +License (GPL). A package with the sourcecode can be found +in the section "LyxWinInstallerSource" of +http://developer.berlios.de/project/showfiles.php?group_id=5117 + +The license files of all used pgrograms can be found in the subdirectory "bin" +of LyX's installation folder. diff --git a/development/Win32/packaging/installer/LyXWinInstaller/Uninstall.nsh b/development/Win32/packaging/installer/LyXWinInstaller/Uninstall.nsh index b1c53efbed..11261e78d2 100644 --- a/development/Win32/packaging/installer/LyXWinInstaller/Uninstall.nsh +++ b/development/Win32/packaging/installer/LyXWinInstaller/Uninstall.nsh @@ -1,10 +1,10 @@ -# Uninstall sections +; Uninstall sections Section "un.LyX" un.SecUnProgramFiles SectionIn RO - # delete LaTeX class files that were installed together with LyX + ; delete LaTeX class files that were installed together with LyX FileOpen $R5 "$INSTDIR\Resources\uninstallPaths.dat" r FileRead $R5 $LatexPath FileClose $R5 @@ -23,54 +23,54 @@ Section "un.LyX" un.SecUnProgramFiles ExecWait "$LatexPath\initexmf --update-fndb" ${endif} - # delete LyX's installation folder + ; delete LyX's installation folder RMDir /r $INSTDIR - # delete start menu folder + ; delete start menu folder ReadRegStr $0 ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "StartMenu" RMDir /r "$0" - # delete desktop icon + ; delete desktop icon Delete "$DESKTOP\${PRODUCT_NAME}.lnk" - # delete registry entries + ; delete registry entries DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}" DeleteRegKey ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" DeleteRegKey HKCR "Applications\lyx.exe" DeleteRegKey HKCR "Applications\lyx.bat" - # Aiksaurus + ; Aiksaurus !insertmacro FileCheck $5 "meanings.dat" "${AiksaurusDir}" ; macro from LyXUtils.nsh ${if} $5 == "True" RMDir /r "${AiksaurusDir}" ${endif} -# StrCpy $0 "" -# ReadRegStr $0 HKLM "Software\Aiksaurus" "OnlyWithLyX" ; special entry to test if it was installed with LyX -# ${if} $0 == "Yes" -# ; unregister Aiksaurus -# ReadRegStr $1 HKLM "Software\Aiksaurus" "Data Path" -# RMDir /r "$1" -# DeleteRegKey HKLM "SOFTWARE\Aiksaurus" -# ${endif} - - # ImageMagick +; StrCpy $0 "" +; ReadRegStr $0 HKLM "Software\Aiksaurus" "OnlyWithLyX" ; special entry to test if it was installed with LyX +; ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" +; ; unregister Aiksaurus +; ReadRegStr $1 HKLM "Software\Aiksaurus" "Data Path" +; RMDir /r "$1" +; DeleteRegKey HKLM "SOFTWARE\Aiksaurus" +; ${endif} + + ; ImageMagick StrCpy $0 "" ReadRegStr $0 HKLM "Software\ImageMagick" "OnlyWithLyX" ; special entry to test if it was installed with LyX - ${if} $0 == "Yes" - # unregister ImageMagick + ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" + ; unregister ImageMagick DeleteRegValue HKLM "SOFTWARE\Classes\Applications" "AutoRun" DeleteRegKey HKLM "SOFTWARE\ImageMagick" ${endif} - # Ghostscript and GSview + ; Ghostscript and GSview StrCpy $0 "" StrCpy $5 "" ReadRegStr $0 HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" ; special entry to test if it was installed with LyX - ${if} $0 == "Yes" - # unregister Ghostscript + ${if} $0 == "Yes${PRODUCT_VERSION_SHORT}" + ; unregister Ghostscript DeleteRegKey HKLM "SOFTWARE\GPL Ghostscript" - # test if GSview is installed + ; test if GSview is installed EnumRegValue $5 HKLM "Software\Ghostgum\GSview" 0 ${if} $5 != "" - # unregister GSview + ; unregister GSview MessageBox MB_ICONINFORMATION|MB_OK "$(UnGSview)" ReadRegStr $3 HKLM "Software\Ghostgum\GSview" "$5" ReadRegStr $4 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\GSview $5" "UninstallString" @@ -78,34 +78,29 @@ Section "un.LyX" un.SecUnProgramFiles ${endif} ${endif} - # MiKTeX specific LyX setting + ; MiKTeX specific LyX setting DeleteRegValue HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "MIKTEX_AUTOINSTALL" DeleteRegValue HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "MIKTEX_REPOSITORY" - # remove extension .lyx + ; remove extension .lyx ${RemoveFileAssociation} "${PRODUCT_EXT}" "${PRODUCT_NAME}" DeleteRegKey HKCR "${PRODUCT_NAME}" - # clear info that programs were installed together with LyX - DeleteRegValue HKLM "SOFTWARE\MiKTeX.org\MiKTeX" "OnlyWithLyX" - DeleteRegValue HKLM "Software\Aspell" "OnlyWithLyX" - DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${JabRefVersion}" "OnlyWithLyX" - SetAutoClose true SectionEnd -#--------------------------------- -# user preferences +;--------------------------------- +; user preferences Section "un.$(UnLyXPreferencesTitle)" un.SecUnPreferences - # remove LyX's config files + ; remove LyX's config files Call un.DelAppPathSub ; function from LyXUtils.nsh SectionEnd -#--------------------------------- -# Aspell +;--------------------------------- +; Aspell Section "un.Aspell" un.SecUnAspell ${if} $AspellInstallYes == "Aspell" ; only uninstall Aspell when it was installed together with LyX @@ -114,8 +109,8 @@ Section "un.Aspell" un.SecUnAspell SectionEnd -#--------------------------------- -# MiKTeX +;--------------------------------- +; MiKTeX Section "un.MiKTeX" un.SecUnMiKTeX ${if} $MiKTeXInstalled == "MiKTeX" ; only uninstall MiKTeX when it was installed together with LyX @@ -125,8 +120,8 @@ Section "un.MiKTeX" un.SecUnMiKTeX SectionEnd -#--------------------------------- -# JabRef +;--------------------------------- +; JabRef Section "un.JabRef" un.SecUnJabRef ${if} $JabRefInstalled == "JabRef" ; only uninstall JabRef when it was installed together with LyX @@ -136,8 +131,8 @@ Section "un.JabRef" un.SecUnJabRef SectionEnd -#--------------------------------- -# Section descriptions +;--------------------------------- +; Section descriptions !insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnAspell} "$(SecUnAspellDescription)" !insertmacro MUI_DESCRIPTION_TEXT ${un.SecUnMiKTeX} "$(SecUnMiKTeXDescription)" diff --git a/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin7.cfg b/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin7.cfg deleted file mode 100644 index e9c1cc14ee..0000000000 --- a/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin7.cfg +++ /dev/null @@ -1,38 +0,0 @@ --$A8 --$B- --$C+ --$D+ --$E- --$F- --$G+ --$H+ --$I+ --$J- --$K- --$L+ --$M- --$N+ --$O+ --$P+ --$Q- --$R- --$S- --$T- --$U- --$V+ --$W- --$X+ --$YD --$Z1 --cg --AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; --H+ --W+ --M --$M16384,1048576 --K$00400000 --LE"c:\program files (x86)\borland\delphi7\Projects\Bpl" --LN"c:\program files (x86)\borland\delphi7\Projects\Bpl" --w-UNSAFE_TYPE --w-UNSAFE_CODE --w-UNSAFE_CAST diff --git a/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin7.dof b/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin7.dof deleted file mode 100644 index b1bb997708..0000000000 --- a/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin7.dof +++ /dev/null @@ -1,136 +0,0 @@ -[FileVersion] -Version=7.0 -[Compiler] -A=8 -B=0 -C=1 -D=1 -E=0 -F=0 -G=1 -H=1 -I=1 -J=0 -K=0 -L=1 -M=0 -N=1 -O=1 -P=1 -Q=0 -R=0 -S=0 -T=0 -U=0 -V=1 -W=0 -X=1 -Y=1 -Z=1 -ShowHints=1 -ShowWarnings=1 -UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; -NamespacePrefix= -SymbolDeprecated=1 -SymbolLibrary=1 -SymbolPlatform=1 -UnitLibrary=1 -UnitPlatform=1 -UnitDeprecated=1 -HResultCompat=1 -HidingMember=1 -HiddenVirtual=1 -Garbage=1 -BoundsError=1 -ZeroNilCompat=1 -StringConstTruncated=1 -ForLoopVarVarPar=1 -TypedConstVarPar=1 -AsgToTypedConst=1 -CaseLabelRange=1 -ForVariable=1 -ConstructingAbstract=1 -ComparisonFalse=1 -ComparisonTrue=1 -ComparingSignedUnsigned=1 -CombiningSignedUnsigned=1 -UnsupportedConstruct=1 -FileOpen=1 -FileOpenUnitSrc=1 -BadGlobalSymbol=1 -DuplicateConstructorDestructor=1 -InvalidDirective=1 -PackageNoLink=1 -PackageThreadVar=1 -ImplicitImport=1 -HPPEMITIgnored=1 -NoRetVal=1 -UseBeforeDef=1 -ForLoopVarUndef=1 -UnitNameMismatch=1 -NoCFGFileFound=1 -MessageDirective=1 -ImplicitVariants=1 -UnicodeToLocale=1 -LocaleToUnicode=1 -ImagebaseMultiple=1 -SuspiciousTypecast=1 -PrivatePropAccessor=1 -UnsafeType=0 -UnsafeCode=0 -UnsafeCast=0 -[Linker] -MapFile=0 -OutputObjs=0 -ConsoleApp=1 -DebugInfo=0 -RemoteSymbols=0 -MinStackSize=16384 -MaxStackSize=1048576 -ImageBase=4194304 -ExeDescription= -[Directories] -OutputDir= -UnitOutputDir= -PackageDLLOutputDir= -PackageDCPOutputDir= -SearchPath= -Packages= -Conditionals= -DebugSourceDirs= -UsePackages=0 -[Parameters] -RunParams= -HostApplication= -Launcher= -UseLauncher=0 -DebugCWD= -[Language] -ActiveLang= -ProjectLang= -RootDir= -[Version Info] -IncludeVerInfo=0 -AutoIncBuild=0 -MajorVer=1 -MinorVer=0 -Release=0 -Build=0 -Debug=0 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1031 -CodePage=1252 -[Version Info Keys] -CompanyName= -FileDescription= -FileVersion=1.0.0.0 -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion=1.0.0.0 -Comments= diff --git a/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin7.dpr b/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin7.dpr deleted file mode 100644 index 5d142dabb9..0000000000 --- a/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin7.dpr +++ /dev/null @@ -1,90 +0,0 @@ -program PDFViewWin7; -// this program opens and closes PDF-files with Acrobat 5, 6, or 7 -// and with Acrobat Reader 5 and Adobe Reader 6, or 7 - -{The problematic is the following: - A PDF-file should be modified while it is opened with Acrobat. - This is not possible because Acrobat understands itself as editor, not as - reader and therefore opens PDFs always with write access, so that other - programs cannot modifiy them. - The idea to solve the problem is the following: - The file that should be shown in Acrobat is copied and then renamed - - the suffix "-preview" is attached. The renamed copy is opened by Acrobat - while the unrenamed version can be modified. When the modified version should - be displayed, the eventually opened renamed version is closed in Acrobat and - the modified version is copied, renamed and opened in Acrobat. - To open/close files in Acrobat, OLE-Objects are used because the latest - manual "Developing Applications Using Interapplication Communication" from - Adobe Acrobat SDK Version 8 states: - "Although DDE is supported, you should use OLE automation instead of DDE - whenever possible because DDE is not a COM technology."} - -{$APPTYPE CONSOLE} - -uses - Windows,SysUtils,ShellApi,Forms,ComObj,Variants; - -var Input,InputNew : string; - FileTest : boolean; - App, AVDoc : Variant; - CoInitFlags : Integer = -1; - VarTest : IDispatch; - test : PVariant; - - -function RenameFile(const OldName, NewName: string): boolean; -//renames files, taken from -//http://www.dsdt.info/tipps/?id=128&search=RenameFile -var - sh: TSHFileOpStruct; -begin - sh.Wnd := Application.Handle; - sh.wFunc := fo_Rename; - //terminate with null byte to set list ending - sh.pFrom := PChar(OldName + #0); - sh.pTo := PChar(NewName + #0); - sh.fFlags := fof_Silent or fof_MultiDestFiles; - Result:=ShFileOperation(sh)=0; -end; //end function - - -begin //begin program - - Application.Initialize; - //Read given filename - Input:= ParamStr(1); - //InputNew = original filename with ending "-preview" (e.g. test-preview.pdf) - InputNew:= copy(Input,1,Length(Input)-4); //remove ".pdf" - InputNew:= InputNew+'-preview.pdf'; - //check if renamed file exists - FileTest:= FileExists(InputNew); - //Create OLE-object for the program Acrobat or Adobe Viewer - App:=CreateOleObject('AcroExch.App'); - //test if given file already exists - if FileTest = true then - begin - //close old file - AVDoc:=App.GetActiveDoc; //handle of the active document - VarTest:=AVDoc; - test:= PVariant(VarTest); - if test <> PVariant(0) then //when handle is existing - begin - try - AVDoc.Close(true); - except - Application.Terminate; - end; - end; - //delete old file - DeleteFile(InputNew); - end; //end if FileTest - //rename file - RenameFile(Input,InputNew); - //open renamed file in Acobat or Adobe Viewer - App.Show; //show window - App.Restore(true); //restore window size to make window active - App.Maximize(true); //maximize window - AVDoc:=CreateOleObject('AcroExch.AVDoc'); //create OLE object for file - AVDoc.Open(''+InputNew+'',''); //open file - -end. //end program diff --git a/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin7.exe b/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin7.exe deleted file mode 100644 index ed4834c60b..0000000000 Binary files a/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFViewWin7.exe and /dev/null differ diff --git a/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFview.cmd b/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFview.cmd new file mode 100644 index 0000000000..46fa712f12 --- /dev/null +++ b/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/PDFview.cmd @@ -0,0 +1,7 @@ +if not exist "%~dpn1~%~x1" goto :go +pdfclose --file "%~dpn1~%~x1" +del "%~dpn1~%~x1" +:go +copy %1 "%~dpn1~%~x1" +pdfopen --file "%~dpn1~%~x1" +exit \ No newline at end of file diff --git a/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/pdfclose.exe b/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/pdfclose.exe new file mode 100644 index 0000000000..80b8b26d72 Binary files /dev/null and b/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/pdfclose.exe differ diff --git a/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/pdfopen.exe b/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/pdfopen.exe new file mode 100644 index 0000000000..80b8b26d72 Binary files /dev/null and b/development/Win32/packaging/installer/LyXWinInstaller/specials/PDFViewWin/pdfopen.exe differ diff --git a/development/Win32/packaging/installer/LyXWinInstaller/specials/preferences7 b/development/Win32/packaging/installer/LyXWinInstaller/specials/preferences7 index 39b09aae92..7cb15e7d8e 100644 --- a/development/Win32/packaging/installer/LyXWinInstaller/specials/preferences7 +++ b/development/Win32/packaging/installer/LyXWinInstaller/specials/preferences7 @@ -72,9 +72,9 @@ # FORMATS SECTION ########################## # -\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "PDFViewWin7" "" "document,vector" -\format "pdf2" "pdf" "PDF (pdflatex)" "F" "PDFViewWin7" "" "document,vector" -\format "pdf" "pdf" "PDF (ps2pdf)" "P" "PDFViewWin7" "" "document,vector" +\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "PDFView" "" "document,vector" +\format "pdf2" "pdf" "PDF (pdflatex)" "F" "PDFView" "" "document,vector" +\format "pdf" "pdf" "PDF (ps2pdf)" "P" "PDFView" "" "document,vector" # # CONVERTERS SECTION ##########################