3 files changed, 28 insertions, 9 deletions
diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat
index 662e68f7..8431cf5b 100644
--- a/src/Signing/sign.bat
+++ b/src/Signing/sign.bat
@@ -1,5 +1,11 @@
 PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
 
+set SIGNINGPATH=%~dp0
+
+call "..\..\..\doc\chm\create_chm.bat"
+
+cd %SIGNINGPATH%
+
 rem sign using SHA-1
 signtool sign /v /a /n IDRIX /i Thawte /ac thawte_Primary_MS_Cross_Cert.cer /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\veracrypt.sys" "..\Release\Setup Files\veracrypt-x64.sys"
 signtool sign /v /a /n IDRIX /i Thawte /ac Thawt_CodeSigning_CA.crt /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe"
@@ -14,7 +20,7 @@ cd "..\Release\Setup Files\"
 copy ..\..\LICENSE .
 copy ..\..\License.txt .
 copy ..\..\NOTICE .
-copy "..\..\..\doc\VeraCrypt User Guide.pdf" .
+copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" .
 
 del *.xml
 copy /V /Y ..\..\..\Translations\*.xml .
@@ -31,13 +37,13 @@ del docs.zip
 del LICENSE
 del License.txt
 del NOTICE
-del "VeraCrypt User Guide.pdf"
+del "VeraCrypt User Guide.chm"
 
 del *.xml
 del docs.zip
 rmdir /S /Q docs
 
-cd "..\..\Signing"
+cd %SIGNINGPATH%
 
 rem sign using SHA-1
 signtool sign /v /a /n IDRIX /i Thawte /ac Thawt_CodeSigning_CA.crt /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.20-BETA2.exe"
diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat
index 477233fe..14d6888b 100644
--- a/src/Signing/sign_test.bat
+++ b/src/Signing/sign_test.bat
@@ -7,6 +7,13 @@ set SHA256PFXNAME=TestCertificate\idrix_Sha256CodeSign.pfx
 set SHA256PFXPASSWORD=idrix
 set SHA256PFXCA=TestCertificate\idrix_SHA256TestRootCA.crt
 
+set SIGNINGPATH=%~dp0
+cd %SIGNINGPATH%
+
+call "..\..\doc\chm\create_chm.bat"
+
+cd %SIGNINGPATH%
+
 rem sign using SHA-1
 signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\veracrypt.sys" "..\Release\Setup Files\veracrypt-x64.sys" "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe"
 
@@ -18,7 +25,7 @@ cd "..\Release\Setup Files\"
 copy ..\..\LICENSE .
 copy ..\..\License.txt .
 copy ..\..\NOTICE .
-copy "..\..\..\doc\VeraCrypt User Guide.pdf" .
+copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" .
 
 del *.xml
 copy /V /Y ..\..\..\Translations\*.xml .
@@ -35,13 +42,13 @@ del docs.zip
 del LICENSE
 del License.txt
 del NOTICE
-del "VeraCrypt User Guide.pdf"
+del "VeraCrypt User Guide.chm"
 
 del *.xml
 del docs.zip
 rmdir /S /Q docs
 
-cd "..\..\Signing"
+cd %SIGNINGPATH%
 
 rem sign using SHA-1
 signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.20-BETA2.exe"
diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat
index eeb85958..79329283 100644
--- a/src/Signing/sign_test_debug.bat
+++ b/src/Signing/sign_test_debug.bat
@@ -7,6 +7,12 @@ set SHA256PFXNAME=TestCertificate\idrix_Sha256CodeSign.pfx
 set SHA256PFXPASSWORD=idrix
 set SHA256PFXCA=TestCertificate\idrix_SHA256TestRootCA.crt
 
+set SIGNINGPATH=%~dp0
+
+call "..\..\..\doc\chm\create_chm.bat"
+
+cd %SIGNINGPATH%
+
 rem sign using SHA-1
 signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Debug\Setup Files\veracrypt.sys" "..\Debug\Setup Files\veracrypt-x64.sys" "..\Debug\Setup Files\VeraCrypt.exe" "..\Debug\Setup Files\VeraCrypt Format.exe" "..\Debug\Setup Files\VeraCryptExpander.exe" "..\Debug\Setup Files\VeraCrypt-x64.exe" "..\Debug\Setup Files\VeraCrypt Format-x64.exe" "..\Debug\Setup Files\VeraCryptExpander-x64.exe"
 
@@ -18,7 +24,7 @@ cd "..\Debug\Setup Files\"
 copy ..\..\LICENSE .
 copy ..\..\License.txt .
 copy ..\..\NOTICE .
-copy "..\..\..\doc\VeraCrypt User Guide.pdf" .
+copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" .
 
 del *.xml
 copy /V /Y ..\..\..\Translations\*.xml .
@@ -35,13 +41,13 @@ del docs.zip
 del LICENSE
 del License.txt
 del NOTICE
-del "VeraCrypt User Guide.pdf"
+del "VeraCrypt User Guide.chm"
 
 del *.xml
 del docs.zip
 rmdir /S /Q docs
 
-cd "..\..\Signing"
+cd %SIGNINGPATH%
 
 rem sign using SHA-1
 signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Debug\Setup Files\VeraCrypt Setup 1.20-BETA2.exe"