From 3dd5945186f1b7a8ff1070bd2bb09c49d62c42cd Mon Sep 17 00:00:00 2001
From: hunbernd <hunbernd@outlook.com>
Date: Mon, 1 Jun 2020 00:53:31 +0200
Subject: [PATCH] Deep channel and file indexing support

---
 build_scripts/Windows-msys2/build/build.bat    |  5 ++++-
 build_scripts/Windows-msys2/build/env-base.bat | 10 +++++++++-
 retroshare.pri                                 |  8 ++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/build_scripts/Windows-msys2/build/build.bat b/build_scripts/Windows-msys2/build/build.bat
index c83583180..51eb804a0 100644
--- a/build_scripts/Windows-msys2/build/build.bat
+++ b/build_scripts/Windows-msys2/build/build.bat
@@ -18,7 +18,7 @@ if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
 :: Install needed things
-%EnvMSYS2Cmd% "pacman --noconfirm --needed -S make git mingw-w64-%RsMSYS2Architecture%-toolchain mingw-w64-%RsMSYS2Architecture%-qt5 mingw-w64-%RsMSYS2Architecture%-miniupnpc mingw-w64-%RsMSYS2Architecture%-sqlcipher mingw-w64-%RsMSYS2Architecture%-xapian-core mingw-w64-%RsMSYS2Architecture%-cmake"
+%EnvMSYS2Cmd% "pacman --noconfirm --needed -S make git mingw-w64-%RsMSYS2Architecture%-toolchain mingw-w64-%RsMSYS2Architecture%-qt5 mingw-w64-%RsMSYS2Architecture%-miniupnpc mingw-w64-%RsMSYS2Architecture%-sqlcipher mingw-w64-%RsMSYS2Architecture%-cmake"
 
 :: Webui
 if "%ParamWebui%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-doxygen mingw-w64-%RsMSYS2Architecture%-rapidjson"
@@ -29,6 +29,9 @@ if "%ParamPlugins%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64
 :: Clang
 if "%ParamClang%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-clang"
 
+:: Indexing
+if "%ParamIndexing%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-xapian-core mingw-w64-%RsMSYS2Architecture%-libvorbis mingw-w64-%RsMSYS2Architecture%-flac mingw-w64-%RsMSYS2Architecture%-taglib"
+
 :: Initialize environment
 call "%~dp0env.bat" %*
 if errorlevel 2 exit /B 2
diff --git a/build_scripts/Windows-msys2/build/env-base.bat b/build_scripts/Windows-msys2/build/env-base.bat
index 6f910649c..27f4efcf0 100644
--- a/build_scripts/Windows-msys2/build/env-base.bat
+++ b/build_scripts/Windows-msys2/build/env-base.bat
@@ -8,6 +8,7 @@ set ParamPlugins=0
 set ParamTor=0
 set ParamWebui=0
 set ParamClang=0
+set ParamIndexing=0
 set CoreCount=%NUMBER_OF_PROCESSORS%
 set RS_QMAKE_CONFIG=
 
@@ -34,6 +35,8 @@ if "%~1" NEQ "" (
 			set CoreCount=1
 		) else if "%%~a"=="clang" (
 			set ParamClang=1
+		) else if "%%~a"=="indexing" (
+			set ParamIndexing=1
 		) else if "%%~a"=="CONFIG+" (
 			set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% %1
 		) else (
@@ -92,11 +95,15 @@ if "%ParamWebui%"=="1" (
 	set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_jsonapi" "CONFIG+=rs_webui"
 )
 
+if "%ParamIndexing%"=="1" (
+	set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_deep_channels_index" "CONFIG+=rs_deep_files_index" "CONFIG+=rs_deep_files_index_ogg" "CONFIG+=rs_deep_files_index_flac" "CONFIG+=rs_deep_files_index_taglib"
+)
+
 exit /B 0
 
 :usage
 echo.
-echo Usage: 32^|64 release^|debug [autologin plugins webui singlethread clang]
+echo Usage: 32^|64 release^|debug [autologin plugins webui singlethread clang indexing]
 echo.
 echo Mandatory parameter
 echo 32^|64              32-bit or 64-bit Version
@@ -108,6 +115,7 @@ echo plugins            Build plugins
 echo webui              Enable JsonAPI and pack webui files
 echo singlethread       Use only 1 thread for building
 echo clang              Use clang compiler instead of GCC
+echo indexing           Build with deep channel and file indexing support
 echo.
 echo Parameter for pack
 echo tor                Pack tor version
diff --git a/retroshare.pri b/retroshare.pri
index 09030de8a..2f693086c 100644
--- a/retroshare.pri
+++ b/retroshare.pri
@@ -141,12 +141,12 @@ CONFIG *= no_rs_jsonapi
 rs_jsonapi:CONFIG -= no_rs_jsonapi
 
 # To enable channel indexing append the following assignation to qmake command
-# line "CONFIG+=rs_deep_channel_index"
-CONFIG *= no_rs_deep_channel_index
-rs_deep_channel_index:CONFIG -= no_rs_deep_channel_index
+# line "CONFIG+=rs_deep_channels_index"
+CONFIG *= no_rs_deep_channels_index
+rs_deep_channels_index:CONFIG -= no_rs_deep_channels_index
 
 # To enable deep files indexing append the following assignation to qmake
-# command line "CONFIG+=rs_files_index"
+# command line "CONFIG+=rs_deep_files_index"
 CONFIG *= no_rs_deep_files_index
 rs_deep_files_index:CONFIG -= no_rs_deep_files_index