From f354b05df5da3cb5794124ff71dd072ebf31cda4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Mon, 7 Dec 2009 23:31:35 +0000
Subject: [PATCH] installer: sync with branch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32422 a592a061-630c-0410-9148-cb99ea01b6c8
---
 .../packaging/AltInstaller/ConfigLyX.nsh      |  7 ++--
 .../AltInstaller/InstallActions-update.nsh    | 33 +++++++++++++++++--
 .../AltInstaller/LyXInstaller-complete.nsi    |  2 +-
 .../AltInstaller/LyXInstaller-small.nsi       |  2 +-
 .../AltInstaller/MissingPrograms.nsh          |  2 +-
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
index 5665459814..9792b53cae 100644
--- a/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
+++ b/development/Win32/packaging/AltInstaller/ConfigLyX.nsh
@@ -48,7 +48,8 @@ Function ConfigureLyX
   Delete "$INSTDIR\Resources\lyxrc.dist"
   FileOpen $R1 "$INSTDIR\Resources\lyxrc.dist" w
   # set some general things
-  FileWrite $R1 '\screen_zoom "120"$\r$\n'
+  FileWrite $R1 '\screen_zoom "120"$\r$\n\
+                 \accept_compound true$\r$\n'
   ${if} "$PathPrefix" != ""
    FileWrite $R1 '\path_prefix "$PathPrefix"$\r$\n'
   ${endif}
@@ -62,8 +63,8 @@ Function ConfigureLyX
   ${if} $SVGPath != ""
    FileWrite $R1 '\format "svg" "svg" "SVG" "" "inkscape --file=$$$$i" "inkscape --file=$$$$i" "vector"$\r$\n\
    		  \converter "svg" "png" "inkscape --without-gui --file=$$$$i --export-png=$$$$o" ""$\r$\n\
-		  \converter "svg" "pdf" "inkscape --file=$$$$i --export-area-drawing --without-gui --export-pdf=$$$$o" ""$\r$\n\
-		  \converter "svg" "pdf2" "inkscape --file=$$$$i --export-area-drawing --without-gui --export-pdf=$$$$o" ""'
+		  \converter "svg" "pdf" "inkscape --file=$$$$p/$$$$i --export-area-drawing --without-gui --export-pdf=$$$$p/$$$$o" ""$\r$\n\
+		  \converter "svg" "eps" "inkscape --file=$$$$p/$$$$i --export-area-drawing --without-gui --export-eps=$$$$p/$$$$o" ""'
   ${endif}
   FileClose $R1
   IfErrors 0 +2
diff --git a/development/Win32/packaging/AltInstaller/InstallActions-update.nsh b/development/Win32/packaging/AltInstaller/InstallActions-update.nsh
index 846711e246..4087cab2de 100644
--- a/development/Win32/packaging/AltInstaller/InstallActions-update.nsh
+++ b/development/Win32/packaging/AltInstaller/InstallActions-update.nsh
@@ -214,8 +214,37 @@ Function RefreshRegUninst
    WriteRegStr HKLM "SOFTWARE\Aspell" "OnlyWithLyX" "Yes${PRODUCT_VERSION_SHORT}"
   ${endif}
   
-  # install eLyXer as Python module
-  Call eLyXer # function from InstallThirdPartyProgs.nsh
+  # eLyXer
+  # first test if Python is installed
+  ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" ""
+  ${if} $PythonPath == ""
+   ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.6\InstallPath" ""
+  ${endif}
+  ${if} $PythonPath == ""
+   ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\3.0\InstallPath" ""
+  ${endif}
+  ${if} $PythonPath == ""
+   ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\3.1\InstallPath" ""
+  ${endif}
+  ${if} $PythonPath != ""
+   StrCpy $PythonPath $PythonPath -1 # remove the "\" at the end
+  ${endif}
+  # now install eLyXer as Python module
+  ${if} $PythonPath != ""
+   # a Python module cannot simply started with
+   # ExecWait '$PythonPath\python.exe "$INSTDIR\bin\setup.py" install'
+   # therefore run a script
+   StrCpy $1 $INSTDIR 2 # get drive letter
+   FileOpen $R1 "$INSTDIR\bin\eLyXer.bat" w
+   FileWrite $R1 '$1$\r$\n\
+		  cd "$INSTDIR\bin"$\r$\n\
+		  "$PythonPath\python.exe" setup.py install'
+   FileClose $R1
+   ExecWait '"$INSTDIR\bin\eLyXer.bat"'
+   Delete "$INSTDIR\bin\eLyXer.bat"
+  ${else}
+   ExecWait '"$INSTDIR\bin\python.exe" "$INSTDIR\bin\setup.py" install'
+  ${endif}
   
   # Metafile2eps
   Var /GLOBAL RegLocation
diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
index 6622f9c101..8df75970c6 100644
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
@@ -88,7 +88,7 @@ Var WMFPath
 # Function to configure LyX
 !include "ConfigLyX.nsh"
 
-# Function to configure needed third-party programs
+# Functions to configure needed third-party programs
 !include "InstallThirdPartyProgs.nsh"
 
 # Function for page to install Aspell dictionaries
diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
index ebc8058598..086bebd1a4 100644
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
@@ -89,7 +89,7 @@ Var WMFPath
 # Function to configure LyX
 !include "ConfigLyX.nsh"
 
-# Function to configure needed third-party programs
+# Functions to configure needed third-party programs
 !include "InstallThirdPartyProgs.nsh"
 
 # Function for page to install Aspell dictionaries
diff --git a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
index df20299146..5156b2feba 100644
--- a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
+++ b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
@@ -86,7 +86,7 @@ Function MissingPrograms
 
   # test if Python is installed
   # 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
+  # older 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" ""