X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=INSTALL.Win32;h=e74e3b2794d208cd73960a393a12af2811674c04;hb=b58c75b8da1934721c8887f0941f7fa6bdba0728;hp=592d5e913fd5dcbe799bee349facc37ee87edc14;hpb=949818959aa2a4ac57548a7ec13a4de0a5a76c50;p=lyx.git

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index 592d5e913f..e74e3b2794 100644
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -28,6 +28,10 @@ Compiling with Microsoft Visual C++ (MSVC)
 	(either selecting Python-Development workload or just Python 3 in the individual components tab)
 	in the Visual Studio installer, so that you don't have to install it separately
 
+	You may also want to install following extensions:
+	- Qt Visual Studio Tools: enables preview of some Qt variables, like QString, while debugging
+	- Concurrency Visualizer for Visual Studio: graphically shows which thread does what and when
+
 2	Install Qt
 
 	Download the latest Qt online installer for Open Source development on Windows
@@ -56,9 +60,10 @@ Compiling with Microsoft Visual C++ (MSVC)
 5	Download dependencies
 
 	Download the LyX for Windows build dependencies from
-	ftp.lyx.de/LyXWinInstaller/lyx-windows-deps-msvc2017.zip
+	http://ftp.lyx.org/pub/lyx/devel/win_deps/
+	there are 64 (lyx-windows-deps-msvc2019_64.zip) and 32 (lyx-windows-deps-msvc2019_32.zip) bit dependencies
 	and extract it e.g. to 
-	C:\LyX\lyx-windows-deps-msvc2017
+	C:\LyX
 	This is the later needed GNUWIN32 directory
 
 6	Configure
@@ -74,7 +79,7 @@ Compiling with Microsoft Visual C++ (MSVC)
 	
 	- You will now get an error about missing GNUWIN32 directory.
 
-	- Set GNUWIN32_DIR to the folder that contains the dependencies.
+	- Set GNUWIN32_DIR to the folder that contains the dependencies (keep the bit version in mind).
 	  (This alternative does currently not work:
 	   Enable LYX_DEPENDENCIES_DOWNLOAD and click Configure.
 	   Pre-compiled dependencies will automatically be downloaded.)
@@ -85,6 +90,8 @@ Compiling with Microsoft Visual C++ (MSVC)
 	  e.g. to C:\Qt\5.12.6\msvc2017_64 or C:\Qt\5.12.6\msvc2017 depending on which platform you have chosen
 	  If you cant find this option, simply add a new entry of type "path" manually
 
+	- Disable the LYX_EXTERNAL_DTL option
+
 	- Enable the LYX_INSTALL option and click Configure.
 
 	- Click Generate.
@@ -170,6 +177,8 @@ Debugging
 	  normal view active will start LyX.exe located in e.g. C:\LyX\build\bin\Debug, it won't find the dependencies
 	  and will therefore fail. Once debugging has started you can switch back to normal view of the Solution Explorer)
 
+	- Don't forget to build the INSTALL project each time you change the source code.
+
 
 Creating a patch file containing a bugfix
 =========================================
@@ -179,18 +188,22 @@ Creating a patch file containing a bugfix
 
 	- Make sure you are working on the newest versions, pull from git before you start bugfixing.
 
-	- After fixing a bug create a commit (it will be on your local repo and not on server), if there is a bugreport for it
-	  put the Ticket nr. as description.
+	- After fixing a bug create a commit (it will be on your local repo and not on server), choose an approproate description, 
+	  e.g. the ticket nr. if there is a bugreport for it
 
 	- Use this command in git bash:
 	git format-patch -1 HEAD
 	it will create a patch file in your repository folder, this is what you share.
 
+	Another usefull command is
+	git diff --cached > file.diff
+	which will create a .diff file of staged changes. There is no option for the description with it though.
+
 
 Creating the Installer
 ======================
 
-	- Get NSIS from http://nsis.sourceforge.net
+	- The installer is done with NSIS from http://nsis.sourceforge.net
 	- In the LyX source directory, go to development\Win32\packaging\installer
 	- Follow the steps in the file Readme.txt