installer:

- assure that every PC user has its own Aspell personal word list - update for beta3 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25111 a592a061-630c-0410-9148-cb99ea01b6c8
2024-11-22 10:00:33 +00:00 · 2008-06-04 01:26:56 +00:00 · 2008-06-04 01:26:56 +00:00 · 9d469100d0
commit 9d469100d0
parent 923442a591
10 changed files with 78 additions and 116 deletions
--- a/development/Win32/packaging/AltInstaller/Aspell.nsh
+++ b/development/Win32/packaging/AltInstaller/Aspell.nsh
@ -11,6 +11,11 @@ Function InstallAspell
   File /r "${PRODUCT_SOURCEDIR}\${AspellInstall}"
   # copy the files and register Aspell
   CopyFiles "$INSTDIR\${AspellInstall}" "$APPDATA"
+   # finally copy the Aspell personal files to the Application folder of all users
+   # this assures that every user can have its own word list
+   StrCpy $AppSubfolder "Aspell"
+   StrCpy $AppFiles "$APPDATA\Aspell\Personal"
+   Call CreateAppPathSub # function from LyXUtils.nsh
   
   WriteRegStr HKLM "SOFTWARE\Aspell" "Base Path" "${AspellDir}"
   WriteRegStr HKLM "SOFTWARE\Aspell" "Dictionary Path" "${AspellDictPath}"
@ -245,6 +250,12 @@ Function InstallAspellDictionary
 DownloadNow:
  ExecShell "open" "${AspellLocationExact}"
 DownloadLater:
+
+ # finally copy the Aspell dictionary files to the Application folder of all users
+ # this assures that every user can have its own word list
+ StrCpy $AppSubfolder "Aspell"
+ StrCpy $AppFiles "$APPDATA\Aspell\Dictionaries"
+ Call CreateAppPathSub # function from LyXUtils.nsh
 	 
 FunctionEnd

@ -258,6 +269,9 @@ Function un.UninstAspell
    ReadRegStr $1 SHCTX "Software\Aspell" "Base Path"
    # delete Aspells' install folder
    RMDir /r $1
+    # remove LyX's config files
+    StrCpy $AppSubfolder "Aspell"
+    Call un.DelAppPathSub # function from LyXUtils.nsh
    # unregister Aspell and its dictionaries
    DeleteRegKey SHCTX "Software\Aspell"
    DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aspell"
--- a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
+++ b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
@ -56,7 +56,7 @@ Function ConfigureLyX
  ${if} $Acrobat == "Yes" # used for Acrobat / Adobe Reader
    # writes settings to the preferences file
    ${LineFind} "$INSTDIR\Resources\preferences" "$INSTDIR\Resources\preferences" "75" "AcroPref"
-    # ${LineFind} macro from TextFunc.nsh # calls Function AcroPref
+    # ${LineFind} is a macro from TextFunc.nsh # calls Function AcroPref
  ${endif}
  
  # if a SVG to PDF converter ws found (e.g. Inkscape) define it in the preferences
@ -121,7 +121,10 @@ Function ConfigureLyX
  # 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
+  StrCpy $AppSubfolder ${PRODUCT_SUBFOLDER}
+  StrCpy $AppFiles "$INSTDIR\Resources\session"
  Call CreateAppPathSub # function from LyXUtils.nsh
+  Delete "$INSTDIR\Resources\session" # delete the session file in the INSTDIR because it is unneeded there
  
  # delete unnecessary files
  ${if} $DelPythonFiles == "True"
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
@ -56,37 +56,7 @@ Var InstallGSview
 Var InstallJabRef
 Var SVGPath
 # Variables used by all installer versions
-Var AspellInstallYes
-Var AspellBaseReg
-Var AspellMessage
-Var ImageMagickPath
-Var JabRefInstalled
-Var LatexPath
-Var MiKTeXInstalled
-Var PythonPath
-Var Answer
-Var AppPre
-Var AppSuff
-Var AppPath
-Var CreateDesktopIcon
-Var CreateFileAssociations
-Var DictCode
-Var FileName
-Var LangCode
-Var LangCodeSys
-Var LangName
-Var LangNameSys
-Var NewString
-Var OldString
-Var PathPrefix
-Var Pointer
-Var ProductRootKey
-Var RunNumber
-Var StartmenuFolder
-Var String
-Var Search
-Var UserList
-Var UserName
+!include "Variables.nsh"

 #--------------------------------
 # load some NSIS libraries
@ -184,6 +154,7 @@ Page custom MissingProgramsPage MissingProgramsPage_LeaveFunction
 !insertmacro MUI_LANGUAGE "Galician"
 !insertmacro MUI_LANGUAGE "Hungarian"
 !insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Japanese"
 !insertmacro MUI_LANGUAGE "Norwegian"
 !insertmacro MUI_LANGUAGE "Polish"
 !insertmacro MUI_LANGUAGE "Portuguese"
@ -202,6 +173,7 @@ Page custom MissingProgramsPage MissingProgramsPage_LeaveFunction
 !include "lyx_languages\galician.nsh"
 !include "lyx_languages\hungarian.nsh"
 !include "lyx_languages\italian.nsh"
+!include "lyx_languages\japanese.nsh"
 !include "lyx_languages\norwegian.nsh"
 !include "lyx_languages\polish.nsh"
 !include "lyx_languages\portuguese.nsh"
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
@ -54,37 +54,7 @@ Var MiKTeXUser
 Var State
 Var SVGPath
 # Variables used by all installer versions
-Var AspellInstallYes
-Var AspellBaseReg
-Var AspellMessage
-Var ImageMagickPath
-Var JabRefInstalled
-Var LatexPath
-Var MiKTeXInstalled
-Var PythonPath
-Var Answer
-Var AppPre
-Var AppSuff
-Var AppPath
-Var CreateDesktopIcon
-Var CreateFileAssociations
-Var DictCode
-Var FileName
-Var LangCode
-Var LangCodeSys
-Var LangName
-Var LangNameSys
-Var NewString
-Var OldString
-Var PathPrefix
-Var Pointer
-Var ProductRootKey
-Var RunNumber
-Var StartmenuFolder
-Var String
-Var Search
-Var UserList
-Var UserName
+!include "Variables.nsh"

 #--------------------------------
 # load some NSIS libraries
@ -188,6 +158,7 @@ Page custom MissingProgramsPage MissingProgramsPage_LeaveFunction
 !insertmacro MUI_LANGUAGE "Galician"
 !insertmacro MUI_LANGUAGE "Hungarian"
 !insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Japanese"
 !insertmacro MUI_LANGUAGE "Norwegian"
 !insertmacro MUI_LANGUAGE "Polish"
 !insertmacro MUI_LANGUAGE "Portuguese"
@ -206,6 +177,7 @@ Page custom MissingProgramsPage MissingProgramsPage_LeaveFunction
 !include "lyx_languages\galician.nsh"
 !include "lyx_languages\hungarian.nsh"
 !include "lyx_languages\italian.nsh"
+!include "lyx_languages\japanese.nsh"
 !include "lyx_languages\norwegian.nsh"
 !include "lyx_languages\polish.nsh"
 !include "lyx_languages\portuguese.nsh"
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi
@ -38,37 +38,7 @@ SetCompressor lzma
 Var INSTDIR_NEW
 Var INSTDIR_OLD
 # Variables used by all installer versions
-Var AspellInstallYes
-Var AspellBaseReg
-Var AspellMessage
-Var ImageMagickPath
-Var JabRefInstalled
-Var LatexPath
-Var MiKTeXInstalled
-Var PythonPath
-Var Answer
-Var AppPre
-Var AppSuff
-Var AppPath
-Var CreateDesktopIcon
-Var CreateFileAssociations
-Var DictCode
-Var FileName
-Var LangCode
-Var LangCodeSys
-Var LangName
-Var LangNameSys
-Var NewString
-Var OldString
-Var PathPrefix
-Var Pointer
-Var ProductRootKey
-Var RunNumber
-Var StartmenuFolder
-Var String
-Var Search
-Var UserList
-Var UserName
+!include "Variables.nsh"

 #--------------------------------
 # load some NSIS libraries
@ -150,6 +120,7 @@ Var UserName
 !insertmacro MUI_LANGUAGE "Galician"
 !insertmacro MUI_LANGUAGE "Hungarian"
 !insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Japanese"
 !insertmacro MUI_LANGUAGE "Norwegian"
 !insertmacro MUI_LANGUAGE "Polish"
 !insertmacro MUI_LANGUAGE "Portuguese"
@ -168,6 +139,7 @@ Var UserName
 !include "lyx_languages\galician.nsh"
 !include "lyx_languages\hungarian.nsh"
 !include "lyx_languages\italian.nsh"
+!include "lyx_languages\japanese.nsh"
 !include "lyx_languages\norwegian.nsh"
 !include "lyx_languages\polish.nsh"
 !include "lyx_languages\portuguese.nsh"
--- a/development/Win32/packaging/AltInstaller/LyXUtils.nsh
+++ b/development/Win32/packaging/AltInstaller/LyXUtils.nsh
@ -307,13 +307,11 @@ Function un.DelAppPathSub
   StrCpy $UserList $UserList "" $Pointer # cut off the first username in the list
   # generate the string for the current user
   # AppPre and AppSuff are generated in the macro "AppPreSuff"
-   StrCpy $AppPath "$AppPre\$0\$AppSuff\${PRODUCT_SUBFOLDER}"
-   RMDir /r $AppPath # delete the folder
+   RMDir /r "$AppPre\$0\$AppSuff\$AppSubfolder" # delete the folder
  Goto loop
  ready:
  StrCpy $0 $UserList
-  StrCpy $AppPath "$AppPre\$0\$AppSuff\${PRODUCT_SUBFOLDER}"
-  RMDir /r $AppPath # delete the folder
+  RMDir /r "$AppPre\$0\$AppSuff\$AppSubfolder" # delete the folder
  
 FunctionEnd

@ -350,17 +348,14 @@ FunctionEnd
   StrCpy $UserList $UserList "" $Pointer # cut off the first username in the list
   # generate the string for the current user
   # AppPre and AppSuff are generated in the macro "AppPreSuff"
-   StrCpy $AppPath "$AppPre\$0\$AppSuff\${PRODUCT_SUBFOLDER}"
-   CreateDirectory $AppPath # create the folder
-   CopyFiles "$INSTDIR\Resources\session" "$AppPath"
+   CreateDirectory "$AppPre\$0\$AppSuff\$AppSubfolder" # create the folder
+   CopyFiles "$AppFiles" "$AppPre\$0\$AppSuff\$AppSubfolder"
  Goto loop
  ready:
  # now do the same for the last user name
  StrCpy $0 $UserList
-  StrCpy $AppPath "$AppPre\$0\$AppSuff\${PRODUCT_SUBFOLDER}"
-  CreateDirectory $AppPath # create the folder
-  CopyFiles "$INSTDIR\Resources\session" "$AppPath"
-  Delete "$INSTDIR\Resources\session" # delete the session file in the INSTDIR because it is unneeded there
+  CreateDirectory "$AppPre\$0\$AppSuff\$AppSubfolder" # create the folder
+  CopyFiles "$AppFiles" "$AppPre\$0\$AppSuff\$AppSubfolder"
  
 FunctionEnd

--- a/development/Win32/packaging/AltInstaller/Settings.nsh
+++ b/development/Win32/packaging/AltInstaller/Settings.nsh
@ -3,8 +3,8 @@

 !define PRODUCT_DIR "D:\LyXPackage1.6"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.6.0beta1"
-!define PRODUCT_VERSION_SHORT "16beta1"
+!define PRODUCT_VERSION "1.6.0beta3"
+!define PRODUCT_VERSION_SHORT "16beta3"
 !define PRODUCT_SUBFOLDER "lyx16"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
 !define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX"
@ -19,13 +19,13 @@
 !define PRODUCT_INFO_URL "http://www.lyx.org/"
 !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"

-BrandingText "LyXWinInstaller v4.04 - ${INSTALLER_VERSION}"
+BrandingText "LyXWinInstaller v4.05 - ${INSTALLER_VERSION}"

 # to check later if this installer version is running at the same time
-!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-04-AltInstaller-${INSTALLER_VERSION}.exe"
-!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-04-AltInstaller-${INSTALLER2_VERSION}.exe"
-!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-04-AltInstaller-${INSTALLER3_VERSION}.exe"
-!define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert16svn.bmp"
+!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-05-AltInstaller-${INSTALLER_VERSION}.exe"
+!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-05-AltInstaller-${INSTALLER2_VERSION}.exe"
+!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-05-AltInstaller-${INSTALLER3_VERSION}.exe"
+!define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp"

 # Replaced by HKLM or HKCU depending on SetShellVarContext.
 !define PRODUCT_ROOT_KEY "SHCTX"
@ -40,11 +40,11 @@ BrandingText "LyXWinInstaller v4.04 - ${INSTALLER_VERSION}"
 # definitions for the Update installer
 !if ${INSTALLER_VERSION} == "Update"
 !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX16svn3"
- !define PRODUCT_VERSION_OLD "LyX 1.6.0alpha2"
- !define PRODUCT_VERSION_SHORT_OLD "16svn3"
+ !define PRODUCT_VERSION_OLD "LyX 1.6.0beta1"
+ !define PRODUCT_VERSION_SHORT_OLD "16beta1"
 !define JabRefVersion "2.3.1" # could be an older version
- !define ImageMagickVersion_Old "6.4.0" # could be an older version
- !define GhostscriptVersion_Old "8.61" # could be an older version
+ !define ImageMagickVersion_Old "6.4.1" # could be an older version
+ !define GhostscriptVersion_Old "8.62" # could be an older version
 !define MiKTeXDeliveredVersion "2.7" # could be an older version
 !endif

--- a/development/Win32/packaging/AltInstaller/Uninstall.nsh
+++ b/development/Win32/packaging/AltInstaller/Uninstall.nsh
@ -190,6 +190,7 @@ SectionEnd
 Section "un.$(UnLyXPreferencesTitle)" un.SecUnPreferences

 # remove LyX's config files
+ StrCpy $AppSubfolder ${PRODUCT_SUBFOLDER}
 Call un.DelAppPathSub # function from LyXUtils.nsh
  
 SectionEnd
--- a/development/Win32/packaging/AltInstaller/Variables.nsh
+++ b/development/Win32/packaging/AltInstaller/Variables.nsh
@ -0,0 +1,33 @@
+# Variables used by all installer versions
+Var AspellInstallYes
+Var AspellBaseReg
+Var AspellMessage
+Var ImageMagickPath
+Var JabRefInstalled
+Var LatexPath
+Var MiKTeXInstalled
+Var PythonPath
+Var Answer
+Var AppFiles
+Var AppPre
+Var AppSubfolder
+Var AppSuff
+Var CreateDesktopIcon
+Var CreateFileAssociations
+Var DictCode
+Var FileName
+Var LangCode
+Var LangCodeSys
+Var LangName
+Var LangNameSys
+Var NewString
+Var OldString
+Var PathPrefix
+Var Pointer
+Var ProductRootKey
+Var RunNumber
+Var StartmenuFolder
+Var String
+Var Search
+Var UserList
+Var UserName
--- a/development/Win32/packaging/AltInstaller/icons/lyx_logo_vert16beta3.bmp
+++ b/development/Win32/packaging/AltInstaller/icons/lyx_logo_vert16beta3.bmp