From a6cdff13c7d8f9dc49a606b68221b8b93d43199b Mon Sep 17 00:00:00 2001 From: Joost Verburg Date: Thu, 17 Feb 2011 16:41:29 +0000 Subject: [PATCH] delete old Aspell/Aiksaurus setup code git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37713 a592a061-630c-0410-9148-cb99ea01b6c8 --- .../installer/include/declarations.nsh | 3 - .../packaging/installer/include/dictlist.nsh | 60 ----------- .../packaging/installer/include/filelist.nsh | 10 +- .../Win32/packaging/installer/license.rtf | 3 +- development/Win32/packaging/installer/lyx.nsi | 1 - .../packaging/installer/setup/install.nsh | 102 ------------------ .../packaging/installer/setup/uninstall.nsh | 4 - 7 files changed, 2 insertions(+), 181 deletions(-) delete mode 100644 development/Win32/packaging/installer/include/dictlist.nsh diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh index 75fad73201..5d484aed66 100644 --- a/development/Win32/packaging/installer/include/declarations.nsh +++ b/development/Win32/packaging/installer/include/declarations.nsh @@ -48,14 +48,12 @@ SetCompressor /SOLID lzma !define FILES_GHOSTSCRIPT "${FILES_DEPS}\ghostscript" !define FILES_NETPBM "${FILES_DEPS}\netpbm" !define FILES_DTL "${FILES_DEPS}\dtl" -!define FILES_AIKSAURUS "${FILES_DEPS}\aiksaurus\" !define FILES_DVIPOST "${FILES_DEPS}\dvipost" !define FILES_DVIPOST_PKG "${FILES_DVIPOST}" !define FILES_PDFTOOLS "${FILES_DEPS}\pdftools" !define FILES_METAFILE2EPS "${FILES_DEPS}\metafile2eps" !define FILES_QT "${FILES_DEPS}\qt-4" -!define FILES_ASPELLDATA "${FILES_DEPS}\aspell" !define FILES_NSISPLUGINS "${FILES_DEPS}\nsis" @@ -67,7 +65,6 @@ SetCompressor /SOLID lzma !define DOWNLOAD_LATEX "http://www.ctan.org/get/systems/win32/miktex/setup/${SETUPFILE_LATEX}" !define DOWNLOAD_IMAGEMAGICK "http://downloads.sourceforge.net/imagemagick/${SETUPFILE_IMAGEMAGICK}" !define DOWNLOAD_GHOSTSCRIPT "http://downloads.sourceforge.net/imagemagick/${SETUPFILE_GHOSTSCRIPT}" -!define DOWNLOAD_ASPELLDICTS "ftp://ftp.lyx.org/pub/lyx/contrib/aspell6-windows" #-------------------------------- # Locations of setup files for components (for bundled setup) diff --git a/development/Win32/packaging/installer/include/dictlist.nsh b/development/Win32/packaging/installer/include/dictlist.nsh deleted file mode 100644 index a24269e792..0000000000 --- a/development/Win32/packaging/installer/include/dictlist.nsh +++ /dev/null @@ -1,60 +0,0 @@ -/* - -dictlist.nsh - -List of Aspell dictionaries supported by LyX - -*/ - -!macro Dictionaries DICT - - ${DICT} af-0.50-0 "Afrikaans" af 915 - ${DICT} ar-1.2-0 "Arabic" ar 4352 - ${DICT} ms-0.50-0 "Bahasa Melayu" ms 187 - ${DICT} bg-4.1-0 "Bulgarian" bg 5345 - ${DICT} br-0.50-2 "Brezhoneg" br 375 - ${DICT} be-0.01 "Byelaruskaya mova" be 9229 - ${DICT} ca-20040130-1 "Català" ca 1095 - ${DICT} cs-20040614-1 "Ceština" cs 2069 - ${DICT} da-1.4.42-1 "Dansk" da 3036 - ${DICT} de-20030222-1 "Deutsch" de 2872 - ${DICT} en-6.0-0 "English" en 1130 - ${DICT} es-0.50-2 "Español" es 2953 - ${DICT} eo-2.1.20000225a-2 "Esperanto" eo 3773 - ${DICT} et-0.1.21-1 "Estonian" et 922 - ${DICT} fr-0.50-3 "Français" fr 4331 - ${DICT} gl-0.50-0 "Galego" gl 2974 - ${DICT} el-0.50-3 "Greek" el 3204 - ${DICT} hy-0.10.0-0 "Hayeren" hy 850 - ${DICT} he-1.0-0 "Hebrew" he 2024 - ${DICT} hsb-0.01-1 "Hornjoserbsce" hsb 385 - ${DICT} hr-0.51-0 "Hrvatski" hr 1967 - ${DICT} ia-0.50-1 "Interlingua" ia 610 - ${DICT} is-0.51.1-0 "Íslenska" is 1536 - ${DICT} it-2.2_20050523-0 "Italiano" it 696 - ${DICT} la-20020503-0 "Latin" la 193 - ${DICT} lv-0.5.5-1 "Latviešu Valoda" lv 256 - ${DICT} lt-1.1+cvs20060103-0 "Lietuviu kalba" lt 628 - ${DICT} hu-0.99.4.2-0 "Magyar" hu 1608 - ${DICT} mn-0.01-0 "Mongolian" mn 141 - ${DICT} nl-opentaal200711 "Nederlands" nl 1333 - ${DICT} nb-0.50.1-0 "Norsk (Bokmċl)" nb 3031 - ${DICT} nn-0.50.1-1 "Norsk (Nynorsk)" nn 1930 - ${DICT} fa-0.11-0 "Persian" fa 1667 - ${DICT} pl-6.0_20061121-0 "Polski" pl 1859 - ${DICT} pt_PT-20070510-0 "Português" pt_PT 319 - ${DICT} pt_BR-20080221-1 "Português do Brasil" pt_BR 2453 - ${DICT} ro-0.50-2 "Româna" ro 341 - ${DICT} ru-0.99f7-1 "Russian" ru 1458 - ${DICT} gd-0.1.1-1 "Scottish" gd 194 - ${DICT} sr-0.02 "Serbian" sr 3686 - ${DICT} sk-0.52-0 "Slovencina" sk 4602 - ${DICT} sl-0.50-0 "Slovenšcina" sl 5236 - ${DICT} fi-0.7-0 "Suomi" fi 659 - ${DICT} sv-0.51-0 "Svenska" sv 1029 - ${DICT} tr-0.50-0 "Türkçe" tr 547 - ${DICT} uk-1.4.0-0 "Ukrainian" uk 770 - ${DICT} vi-0.01.1-1 "Vietnamese" vi 115 - ${DICT} cy-0.50-3 "Welsh" cy 1771 - -!macroend diff --git a/development/Win32/packaging/installer/include/filelist.nsh b/development/Win32/packaging/installer/include/filelist.nsh index 9e0b43d40a..c838ee6003 100644 --- a/development/Win32/packaging/installer/include/filelist.nsh +++ b/development/Win32/packaging/installer/include/filelist.nsh @@ -45,8 +45,7 @@ Lists of files to include in the installer ${FILE}iconv.dll" ${FILE}intl.dll" - ${FILE}aspell.dll" - ${FILE}Aiksaurus.dll" + ${FILE}libhunspell.dll" ${FILE}zlib1.dll" !macroend @@ -270,13 +269,6 @@ Lists of files to include in the installer !macroend -!macro FileListAiksaurusData COMMAND DIRECTORY - - ${FILE}words.dat" - ${FILE}meanings.dat" - -!macroend - !macro FileListNSISPluginsStandard COMMAND DIRECTORY ${FILE}System.dll" diff --git a/development/Win32/packaging/installer/license.rtf b/development/Win32/packaging/installer/license.rtf index 2669a214ae..508e99465e 100644 --- a/development/Win32/packaging/installer/license.rtf +++ b/development/Win32/packaging/installer/license.rtf @@ -7,12 +7,11 @@ {\pntext\f2\'B7\tab}Components of Python. You can redistribute Python and/or modify it under the terms of the Python Software Foundation License Version 2.\par {\pntext\f2\'B7\tab}Components of ImageMagick. You can redistribute the BaKoMa fonts under the terms of the ImageMagick license.\par {\pntext\f2\'B7\tab}Components of GPL Ghostscript. You can redistribute Netpbm and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\par -{\pntext\f2\'B7\tab}Components of Aspell. You can redistribute Aspell and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.\par +{\pntext\f2\'B7\tab}Components of Hunspell. You can redistribute Hunspell and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.\par {\pntext\f2\'B7\tab}A modified version of the BaKoMa fonts. You can redistribute the BaKoMa fonts under the terms of the BaKoMa Font License.\par {\pntext\f2\'B7\tab}The wasy font 'wasy10.ttf' from the latex-xft font bundle: http://packages.qa.debian.org/l/latex-xft-fonts.html. You can redistribute the latex-xft font bundle and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\par {\pntext\f2\'B7\tab}Components of Netpbm. You can redistribute Netpbm and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\par {\pntext\f2\'B7\tab}Components of Dvipost. You can redistribute Dvipost and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\par -{\pntext\f2\'B7\tab}Components of Aiksaurus. You can redistribute Aiksaurus and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\par \pard\par This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\par \par diff --git a/development/Win32/packaging/installer/lyx.nsi b/development/Win32/packaging/installer/lyx.nsi index 75b4cc839d..ca2dbb1c52 100644 --- a/development/Win32/packaging/installer/lyx.nsi +++ b/development/Win32/packaging/installer/lyx.nsi @@ -17,7 +17,6 @@ Licence details for all installer scripts can be found in the file COPYING !include include\variables.nsh !include include\nsis.nsh -!include include\dictlist.nsh !include include\filelist.nsh !include include\langlist.nsh diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh index f228ab589e..845d0eb923 100644 --- a/development/Win32/packaging/installer/setup/install.nsh +++ b/development/Win32/packaging/installer/setup/install.nsh @@ -84,25 +84,6 @@ Section -ProgramFiles SecProgramFiles !endif - # Aspell - - # Copy installer to pluginsdir (a temp dir) - File /oname=$PLUGINSDIR\AspellData.exe "${FILES_ASPELLDATA}\AspellData.exe" - - # Silently install AspellData.exe (/S option) - ${If} $MultiUser.InstallMode == "CurrentUser" - ExecWait '"$PLUGINSDIR\AspellData.exe" /S /CurrentUser' - ${Else} - ExecWait '"$PLUGINSDIR\AspellData.exe" /S /AllUsers' - ${EndIf} - - # Remove the installer - Delete "$PLUGINSDIR\AspellData.exe" - - # Aiksarus data - SetOutPath "$INSTDIR\aiksaurus" - !insertmacro FileListAiksaurusData File "${FILES_AIKSAURUS}\" - # Create uninstaller WriteUninstaller "$INSTDIR\${SETUP_UNINSTALLER}" @@ -132,89 +113,6 @@ SectionEnd !macroend -#-------------------------------- -# Aspell dictionaries - -Var DictionaryFile -Var DictionaryLangName -Var DictionaryLangCode -Var DictionaryPath - -Var AspellHive -Var AspellPath - -Var DownloadResult - -Section -AspellDicts - - # Check whether the system or local version of Aspell should be used - # The patched Aspell uses the same logic - - ReadRegStr $AspellPath HKCU "Software\Aspell" "Base Path" - - ${If} $AspellPath == "" - StrCpy $AspellHive HKLM - ${Else} - StrCpy $AspellHive HKCU - ${EndIf} - -SectionEnd - -!macro SECTION_DICT FILE LANGNAME LANGCODE SIZE - - # One section for each dictionary - - Section /o "${LANGNAME}" - - AddSize ${SIZE} - - StrCpy $DictionaryFile "${FILE}" - StrCpy $DictionaryLangName "${LANGNAME}" - StrCpy $DictionaryLangCode ${LANGCODE} - - Call DownloadDictionary - - SectionEnd - -!macroend - -# Include all sections -!insertmacro Dictionaries '!insertmacro SECTION_DICT' - -Function DownloadDictionary - - # Download and install a dictionary - - dict_download: - - !insertmacro DOWNLOAD_FILE $DownloadResult ASPELLDICTS aspell6-$DictionaryFile.exe /aspell6-$DictionaryFile.exe - - ${If} $DownloadResult != "OK" - # Download failed - MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(TEXT_DOWNLOAD_FAILED_DICT) ($DownloadResult)" IDYES dict_download - Goto dict_noinstall - ${EndIf} - - install_dict: - - ExecWait '"$PLUGINSDIR\aspell6-$DictionaryFile.exe" /NoDirChange /AutoClose' - - ${If} $AspellHive == HKLM - ReadRegStr $DictionaryPath HKLM "Software\Aspell\Dictionaries" $DictionaryLangCode - ${Else} - ReadRegStr $DictionaryPath HKCU "Software\Aspell\Dictionaries" $DictionaryLangCode - ${EndIf} - - ${If} $DictionaryPath == "" - MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(TEXT_NOTINSTALLED_DICT)" IDYES install_dict - ${EndIf} - - Delete "$PLUGINSDIR\aspell6-$DictionaryFile.exe" - - dict_noinstall: - -FunctionEnd - #-------------------------------- # Extenral components diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh index cb47a15c72..f902f1306c 100644 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ b/development/Win32/packaging/installer/setup/uninstall.nsh @@ -54,10 +54,6 @@ Section "un.Program Files" un.SecProgramFiles !insertmacro FileListMSVCManifest Delete "$INSTDIR\ghostscript\" RMDir "$INSTDIR\ghostscript" - # Aiksaurus Data - !insertmacro FileListAiksaurusData Delete "$INSTDIR\aiksaurus\" - RMDir "$INSTDIR\aiksaurus" - # Shortcuts Delete "$SMPROGRAMS\${APP_NAME} ${APP_SERIES_NAME}.lnk" Delete "$DESKTOP\${APP_NAME} ${APP_SERIES_NAME}.lnk"