winbuild include python3

diff --git a/development/Win32/packaging/installer/Readme.txt b/development/Win32/packaging/installer/Readme.txt
index 8875446ece171f28637ea2b145e80c03ffbce24f..1f7f33b055b88d06f33a4788525f1bba4d0d097a 100644 (file)
--- a/development/Win32/packaging/installer/Readme.txt
+++ b/development/Win32/packaging/installer/Readme.txt
@@ -49,15 +49,15 @@ Updating dependencies
   to %%dependencies%%\ghostscript.
 
 - Python
-  download the latest Python 2 release for windows from https://www.python.org/downloads/windows/ (32 or 64 bit),
-  current version is 2.7.17
-  Install it or extract with a tool named lessmsi. If you install it, you will have to find python27.dll in the 
-  Windows\System32 folder. 64-bit dlls on a 64-bit windows are stored in Windows\System32 folder, 32-bit dlls on a 64-bit windows
-  are stored in Windows\SysWOW64. Copy this python27.dll to %%dependencies%%\Python, from the python installation folder copy
-  all files and "DLLs", "Lib" and "libs" subfolders to %%dependencies%%\Python. You can uninstall python afterwards.
-  If you extracted with lessmsi, you will also get visual studio runtime dlls and some executables, which are used during installation,
-  these are not needed. Copy the 2 python executables, the python dll, the 3 textfiles (license, news and readme) and the "DLLs",
-  "Lib" and "libs" subfolders to %%dependencies%%\Python.
+  download the latest Python 3 release for windows from https://www.python.org/downloads/windows/ (embeddable package 64 bit),
+  current version is 3.11.2
+  Extract it and copy to %%dependencies%%\Python.
+  open python3XX._pth file with a text editor, uncomment the "import site" line
+  add following paths after the 2 already existing paths ('.' and python311.zip)
+    ./Scripts
+    ../Resources
+    ../Resources/lyx2lyx
+    ../Resources/scripts
 
 - Visual Studio runtime
   Download the latest Visual C++ Redistributable (if you still haven't), the version should match with your VS C++ compiler

diff --git a/development/Win32/packaging/installer/src/main.nsh b/development/Win32/packaging/installer/src/main.nsh
index d6140ba271ddbf4fb3cfffb0999958f7324de5d4..b3713862d1ae2ff9d95e7b1b1919d49a233753f0 100644 (file)
--- a/development/Win32/packaging/installer/src/main.nsh
+++ b/development/Win32/packaging/installer/src/main.nsh
@@ -719,7 +719,7 @@ Section -CompilePython
 SectionEnd
 
 Section -LyxrcDist
-  StrCpy $pathPrefix "$LatexPath;$$LyXDir\bin;$$LyXDir\Python;$$LyXDir\Python\Lib;$$LyXDir\imagemagick;$$LyXDir\ghostscript\bin"
+  StrCpy $pathPrefix "$LatexPath;$$LyXDir\bin;$$LyXDir\Python;$$LyXDir\Python\Lib;$$LyXDir\Python\Scripts;$$LyXDir\imagemagick;$$LyXDir\ghostscript\bin"
 
   # Find additional software and add their install locations to the path_prefix
   # This list contains all software, which write the string value "InstallLocation" in their corresponding keys in "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"