From bf13f88ffaef175bb6ff13beca30f76ed12bac6e Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 4 Jun 2017 21:52:16 +0200
Subject: Windows: Move User Guide CHM file under "docs" folder

---
 src/Common/Dlgcode.c            | 6 +++---
 src/Setup/Setup.h               | 2 --
 src/Signing/sign.bat            | 5 +++--
 src/Signing/sign_test.bat       | 2 +-
 src/Signing/sign_test_debug.bat | 5 +++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 8f59dcf0..11b17b10 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -3054,11 +3054,11 @@ void InitHelpFileName (void)
 		if (strcmp (GetPreferredLangId(), "en") == 0
 			|| strlen(GetPreferredLangId()) == 0)
 		{
-			StringCbCatW (szHelpFile, sizeof(szHelpFile), L"VeraCrypt User Guide.chm");
+			StringCbCatW (szHelpFile, sizeof(szHelpFile), L"docs\\VeraCrypt User Guide.chm");
 		}
 		else
 		{
-			StringCbPrintfW (szTemp, sizeof(szTemp), L"VeraCrypt User Guide.%S.chm", GetPreferredLangId());
+			StringCbPrintfW (szTemp, sizeof(szTemp), L"docs\\VeraCrypt User Guide.%S.chm", GetPreferredLangId());
 			StringCbCatW (szHelpFile, sizeof(szHelpFile), szTemp);
 		}
 
@@ -3069,7 +3069,7 @@ void InitHelpFileName (void)
 		{
 			++lpszTmp;
 			*lpszTmp = 0;
-			StringCbCatW (szHelpFile2, sizeof(szHelpFile2), L"VeraCrypt User Guide.chm");
+			StringCbCatW (szHelpFile2, sizeof(szHelpFile2), L"docs\\VeraCrypt User Guide.chm");
 		}
 	}
 }
diff --git a/src/Setup/Setup.h b/src/Setup/Setup.h
index 3c2bea71..1fc2e1b3 100644
--- a/src/Setup/Setup.h
+++ b/src/Setup/Setup.h
@@ -21,7 +21,6 @@ extern "C" {
 // Specifies what files to install, where (determined by the prefix), and in what order
 static wchar_t *szFiles[]=
 {
-	L"AVeraCrypt User Guide.chm",
 	L"ALicense.txt",
 	L"ALICENSE",
 	L"ANOTICE",
@@ -81,7 +80,6 @@ static wchar_t *szFiles[]=
 // Specifies what files are included in self-extracting packages (no other files will be packaged or extracted).
 static wchar_t *szCompressedFiles[]=
 {
-	L"VeraCrypt User Guide.chm",
 	L"License.txt",
 	L"LICENSE",
 	L"NOTICE",
diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat
index 8431cf5b..837c366a 100644
--- a/src/Signing/sign.bat
+++ b/src/Signing/sign.bat
@@ -1,8 +1,9 @@
 PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
 
 set SIGNINGPATH=%~dp0
+cd %SIGNINGPATH%
 
-call "..\..\..\doc\chm\create_chm.bat"
+call "..\..\doc\chm\create_chm.bat"
 
 cd %SIGNINGPATH%
 
@@ -20,7 +21,6 @@ cd "..\Release\Setup Files\"
 copy ..\..\LICENSE .
 copy ..\..\License.txt .
 copy ..\..\NOTICE .
-copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" .
 
 del *.xml
 copy /V /Y ..\..\..\Translations\*.xml .
@@ -28,6 +28,7 @@ copy /V /Y ..\..\..\Translations\*.xml .
 rmdir /S /Q docs
 mkdir docs\html\en
 copy /V /Y ..\..\..\doc\html\* docs\html\en\.
+copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" docs\.
 
 del docs.zip
 7z a -y docs.zip docs
diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat
index 14d6888b..3344d211 100644
--- a/src/Signing/sign_test.bat
+++ b/src/Signing/sign_test.bat
@@ -25,7 +25,6 @@ cd "..\Release\Setup Files\"
 copy ..\..\LICENSE .
 copy ..\..\License.txt .
 copy ..\..\NOTICE .
-copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" .
 
 del *.xml
 copy /V /Y ..\..\..\Translations\*.xml .
@@ -33,6 +32,7 @@ copy /V /Y ..\..\..\Translations\*.xml .
 rmdir /S /Q docs
 mkdir docs\html\en
 copy /V /Y ..\..\..\doc\html\* docs\html\en\.
+copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" docs\.
 
 del docs.zip
 7z a -y docs.zip docs
diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat
index 79329283..92b04c15 100644
--- a/src/Signing/sign_test_debug.bat
+++ b/src/Signing/sign_test_debug.bat
@@ -8,8 +8,9 @@ set SHA256PFXPASSWORD=idrix
 set SHA256PFXCA=TestCertificate\idrix_SHA256TestRootCA.crt
 
 set SIGNINGPATH=%~dp0
+cd %SIGNINGPATH%
 
-call "..\..\..\doc\chm\create_chm.bat"
+call "..\..\doc\chm\create_chm.bat"
 
 cd %SIGNINGPATH%
 
@@ -24,7 +25,6 @@ cd "..\Debug\Setup Files\"
 copy ..\..\LICENSE .
 copy ..\..\License.txt .
 copy ..\..\NOTICE .
-copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" .
 
 del *.xml
 copy /V /Y ..\..\..\Translations\*.xml .
@@ -32,6 +32,7 @@ copy /V /Y ..\..\..\Translations\*.xml .
 rmdir /S /Q docs
 mkdir docs\html\en
 copy /V /Y ..\..\..\doc\html\* docs\html\en\.
+copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" docs\.
 
 del docs.zip
 7z a -y docs.zip docs
-- 
cgit v1.2.3