installer: - updated to Python 2.6

           - fix 2 bugs
           - remove unneeded file

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

diff --git a/development/Win32/packaging/AltInstaller/Aspell.nsh b/development/Win32/packaging/AltInstaller/Aspell.nsh
index 4817a173aca242cbf758a72c6bed2b6623a94721..244c20c066ee2c441cedf9d16746e47eafebd0f5 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Aspell.nsh
+++ b/development/Win32/packaging/AltInstaller/Aspell.nsh
@@ -15,7 +15,12 @@ Function InstallAspell
    # 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
+   ${if} $ProductRootKey == "HKLM" # if install for all users
+    Call CreateAppPathSub # function from LyXUtils.nsh
+   ${else}
+    CreateDirectory "$APPDATA\$AppSubfolder"
+    CopyFiles "$AppFiles" "$APPDATA\$AppSubfolder"
+   ${endif}
    
    WriteRegStr HKLM "SOFTWARE\Aspell" "Base Path" "${AspellDir}"
    WriteRegStr HKLM "SOFTWARE\Aspell" "Dictionary Path" "${AspellDictPath}"

diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt
index 13631013c9b0da768023ceea3b57209cf87daa62..73c87e90c86018203dc2177097a189a25a8a188b 100644 (file)
--- a/development/Win32/packaging/AltInstaller/ChangeLog.txt
+++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt
@@ -1,4 +1,13 @@
-Version 4.10
+Version 4.11
+- LyX 1.6rc5
+  (list of current regressions: http://tinyurl.com/yu4the )
+  (list of current crashes and critical bugs: http://tinyurl.com/653prg)
+- fix bug that the installer ignored for some cases when LyX should only
+  installed for the current user
+- updated to Python 2.6
+
+
+Version 4.10
 - LyX 1.6rc4
   (list of current regressions: http://tinyurl.com/yu4the )
   (list of current crashes and critical bugs: http://tinyurl.com/653prg)

diff --git a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
index 8a43e126b2e3f693f6afcee37e0fe322acf12b3c..25a10e9aa8d37063215fd0b127daecbe2317518f 100644 (file)
--- a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
+++ b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
@@ -120,18 +120,10 @@ Function ConfigureLyX
    System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
   ${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
-  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"
    Delete $INSTDIR\bin\python.exe
-   Delete $INSTDIR\bin\python25.dll
+   Delete $INSTDIR\bin\python26.dll
    Delete $INSTDIR\bin\Python-License.txt
    RMDir /r $INSTDIR\bin\Lib
    RMDir /r $INSTDIR\bin\DLLs

diff --git a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
index 03d1d9dd2d665d67e0a59b2ffcb9928eba53997d..e0f4533407632f61ff89bb4081842ebd0e35446f 100644 (file)
--- a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
+++ b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
@@ -85,9 +85,12 @@ Function MissingPrograms
   ${endif}
 
   # test if Python is installed
-  # only use an existing python when it is version 2.5 because many Compaq and Dell PC are delivered
-  # with outdated Python interpreters
+  # only use an existing python when it is version 2.5 or newer because some
+  # Compaq and Dell PCs were delivered with outdated Python interpreters
   ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" ""
+  ${if} $PythonPath == ""
+   ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.6\InstallPath" ""
+  ${endif}
   ${if} $PythonPath != ""
    StrCpy $PythonPath $PythonPath -1 # remove the "\" at the end
    StrCpy $DelPythonFiles "True"

diff --git a/development/Win32/packaging/AltInstaller/specials/preferences b/development/Win32/packaging/AltInstaller/specials/preferences
deleted file mode 100644 (file)
index 57e8458..0000000
--- a/development/Win32/packaging/AltInstaller/specials/preferences
+++ /dev/null
@@ -1,75 +0,0 @@
-# This file is written by LyX, if you want to make your own
-# modifications you should do them from inside LyX and save
-
-
-#
-# MISC SECTION ######################################
-#
-
-\preview_scale_factor 1.0
-
-#
-# SCREEN & FONTS SECTION ############################
-#
-
-\screen_zoom 120
-
-#
-# COLOR SECTION ###################################
-#
-
-
-#
-# PRINTER SECTION ###################################
-#
-
-
-#
-# EXPORT SECTION ####################################
-#
-
-
-#
-# TEX SECTION #######################################
-#
-
-
-#
-# FILE SECTION ######################################
-#
-
-
-#
-# PLAIN TEXT EXPORT SECTION ##############################
-#
-
-
-#
-# SPELLCHECKER SECTION ##############################
-#
-
-
-#
-# LANGUAGE SUPPORT SECTION ##########################
-#
-
-
-#
-# 2nd MISC SUPPORT SECTION ##########################
-#
-
-
-#
-# FORMATS SECTION ##########################
-#
-
-
-#
-# CONVERTERS SECTION ##########################
-#
-
-
-#
-# COPIERS SECTION ##########################
-#
-