correct logic and flow of proxy submodule update script, make it finally work, perform tests

Author: AnastaZIuk

cmake/common.cmake

@@ -1271,6 +1271,12 @@ endmacro()
 
 function(NBL_UPDATE_SUBMODULES)
 	ProcessorCount(_GIT_SUBMODULES_JOBS_AMOUNT_)
+	
+	if(NBL_CI_GIT_SUBMODULES_SHALLOW)
+		set(NBL_SHALLOW "--depth=1")
+	else()
+		set(NBL_SHALLOW "")
+	endif()
 
 	macro(NBL_WRAPPER_COMMAND_EXCLUSIVE GIT_RELATIVE_ENTRY GIT_SUBMODULE_PATH SHOULD_RECURSIVE EXCLUDE_SUBMODULE_PATH)
 		set(SHOULD_RECURSIVE ${SHOULD_RECURSIVE})
@@ -1280,12 +1286,6 @@ function(NBL_UPDATE_SUBMODULES)
 		else()
 			set(NBL_EXCLUDE "-c submodule.\"${EXCLUDE_SUBMODULE_PATH}\".update=none")
 		endif()
-		
-		if(NBL_CI_GIT_SUBMODULES_SHALLOW)
-			set(NBL_SHALLOW "--depth=1")
-		else()
-			set(NBL_SHALLOW "")
-		endif()
 
 		if(SHOULD_RECURSIVE)
 			string(APPEND _NBL_UPDATE_SUBMODULES_COMMANDS_ "\"${GIT_EXECUTABLE}\" ${NBL_EXCLUDE} -C \"${NBL_ROOT_PATH}/${GIT_RELATIVE_ENTRY}\" submodule update --init -j ${_GIT_SUBMODULES_JOBS_AMOUNT_} --recursive ${NBL_SHALLOW} ${GIT_SUBMODULE_PATH}\n")
@@ -1298,8 +1298,19 @@ function(NBL_UPDATE_SUBMODULES)
 	set(_NBL_UPDATE_SUBMODULES_CMD_FILE_ "${NBL_ROOT_PATH_BINARY}/${_NBL_UPDATE_SUBMODULES_CMD_NAME_}.cmd")
 	get_filename_component(_NBL_UPDATE_IMPL_CMAKE_FILE_ "${NBL_ROOT_PATH_BINARY}/${_NBL_UPDATE_SUBMODULES_CMD_NAME_}.cmake" ABSOLUTE)
 
-	set(NBL_IMPL_SCRIPT
+	# Proxy script for inclusive submodule updating
+	string(APPEND NBL_IMPL_SCRIPT "set(NBL_ROOT_PATH \"${NBL_ROOT_PATH}\")\nset(_GIT_SUBMODULES_JOBS_AMOUNT_ ${_GIT_SUBMODULES_JOBS_AMOUNT_})\nset(GIT_EXECUTABLE \"${GIT_EXECUTABLE}\")\nset(NBL_SHALLOW \"${NBL_SHALLOW}\")\n\n")
+	string(APPEND NBL_IMPL_SCRIPT
 [=[
+if(NOT DEFINED GIT_RELATIVE_ENTRY)
+	message(FATAL_ERROR "GIT_RELATIVE_ENTRY must be defined to use this script!")
+endif()
+
+if(NOT DEFINED INCLUDE_SUBMODULE_PATHS)
+	message(FATAL_ERROR "INCLUDE_SUBMODULE_PATHS must be defined to use this script!")
+endif()
+
+# update an inclusive submodule first
 execute_process(COMMAND "${GIT_EXECUTABLE}" -C "${NBL_ROOT_PATH}" submodule update --init "${GIT_RELATIVE_ENTRY}")
 
 if("${INCLUDE_SUBMODULE_PATHS}" STREQUAL "")
@@ -1309,34 +1320,31 @@ else()
 		OUTPUT_VARIABLE NBL_OUTPUT_VARIABLE
 	)
 
-	string(REGEX MATCH "submodule\\.(.*)\\.path" extracted_content "${original_string}")
-
 	string(REGEX REPLACE "\n" ";" NBL_SUBMODULE_CONFIG_LIST "${NBL_OUTPUT_VARIABLE}")
 
 	foreach(NBL_SUBMODULE_NAME ${NBL_SUBMODULE_CONFIG_LIST})
 		string(REGEX MATCH "submodule\\.(.*)\\.path" NBL_SUBMODULE_NAME "${NBL_SUBMODULE_NAME}")
+		list(APPEND NBL_ALL_SUBMODULES "${CMAKE_MATCH_1}")
+	endforeach()
+	
+	foreach(NBL_SUBMODULE_NAME ${NBL_ALL_SUBMODULES})		
 		list(FIND INCLUDE_SUBMODULE_PATHS "${NBL_SUBMODULE_NAME}" NBL_FOUND)
-
+		
 		if("${NBL_FOUND}" STREQUAL "-1")
-			list(APPEND NBL_CONFIG_SETUP_CMD "-c")
-			list(APPEND NBL_CONFIG_SETUP_CMD "submodule.\"${CMAKE_MATCH_1}\".update=none") # if a submodule is not on the INCLUDE_SUBMODULE_PATHS list of a currently handedled submodule - do not let it to be updated
+			list(APPEND NBL_CONFIG_SETUP_CMD "-c;submodule.${NBL_SUBMODULE_NAME}.update=none") # filter submodules - only those on the INCLUDE_SUBMODULE_PATHS list will be updated when recursive update is requested, all left will be skipped
 		endif()
 	endforeach()
 endif()
 
-if(NBL_CI_GIT_SUBMODULES_SHALLOW)
-	set(NBL_SHALLOW "--depth=1")
-else()
-	set(NBL_SHALLOW "")
-endif()
-
-execute_process(COMMAND "${GIT_EXECUTABLE}" -C "${NBL_ROOT_PATH}/${GIT_RELATIVE_ENTRY}" ${NBL_CONFIG_SETUP_CMD} submodule update --init -j ${_GIT_SUBMODULES_JOBS_AMOUNT_} --recursive ${NBL_SHALLOW} ./)
+execute_process(COMMAND "${GIT_EXECUTABLE}" ${NBL_CONFIG_SETUP_CMD} submodule update --init -j ${_GIT_SUBMODULES_JOBS_AMOUNT_} --recursive ${NBL_SHALLOW}
+	WORKING_DIRECTORY "${NBL_ROOT_PATH}/${GIT_RELATIVE_ENTRY}"
+)
 ]=]
 )
 	file(WRITE "${_NBL_UPDATE_IMPL_CMAKE_FILE_}" "${NBL_IMPL_SCRIPT}")
 
 	macro(NBL_WRAPPER_COMMAND_INCLUSIVE GIT_RELATIVE_ENTRY INCLUDE_SUBMODULE_PATHS)
-		string(APPEND _NBL_UPDATE_SUBMODULES_COMMANDS_ "\"${CMAKE_COMMAND}\" \"-DNBL_ROOT_PATH=${NBL_ROOT_PATH}\" \"-D_GIT_SUBMODULES_JOBS_AMOUNT_=${_GIT_SUBMODULES_JOBS_AMOUNT_}\" \"-DNBL_CI_GIT_SUBMODULES_SHALLOW=${NBL_CI_GIT_SUBMODULES_SHALLOW}\" \"-DGIT_RELATIVE_ENTRY=${GIT_RELATIVE_ENTRY}\" \"-DINCLUDE_SUBMODULE_PATHS=${INCLUDE_SUBMODULE_PATHS}\" \"-DGIT_EXECUTABLE=${GIT_EXECUTABLE}\" -P \"${_NBL_UPDATE_IMPL_CMAKE_FILE_}\"\n")
+		string(APPEND _NBL_UPDATE_SUBMODULES_COMMANDS_ "\"${CMAKE_COMMAND}\" \"-DGIT_RELATIVE_ENTRY=${GIT_RELATIVE_ENTRY}\" \"-DINCLUDE_SUBMODULE_PATHS=${INCLUDE_SUBMODULE_PATHS}\" -P \"${_NBL_UPDATE_IMPL_CMAKE_FILE_}\"\n")
 	endmacro()
 
 	if(NBL_UPDATE_GIT_SUBMODULE)
@@ -1349,7 +1357,7 @@ execute_process(COMMAND "${GIT_EXECUTABLE}" -C "${NBL_ROOT_PATH}/${GIT_RELATIVE_
 			NBL_WRAPPER_COMMAND_EXCLUSIVE("" ./3rdparty TRUE 3rdparty/boost/superproject)
 
 			# boost's 3rdaprties, special case
-			set(NBL_BOOST_LIBS_TO_INIT ${NBL_BOOST_LIBS} wave)
+			set(NBL_BOOST_LIBS_TO_INIT ${NBL_BOOST_LIBS} wave numeric_conversion) # wave and all of its deps, numeric_conversion is nested in conversion submodule (for some reason boostdep tool doesn't output it properly)
 			foreach(NBL_TARGET ${NBL_BOOST_LIBS_TO_INIT})
 				list(APPEND NBL_BOOST_SUBMODULES_TO_INIT ${NBL_TARGET})
 			endforeach()
@@ -1384,9 +1392,7 @@ clear
 sleep 1
 clear
 tput setaf 2; echo -e "Submodules have been updated! 
-Created nbl-update-submodules.log in your build directory. 
-This window will be closed in 5 seconds..."
-sleep 5
+Created nbl-update-submodules.log in your build directory."
 ]=]
 				WORKING_DIRECTORY ${NBL_ROOT_PATH_BINARY}
 				OUTPUT_VARIABLE _NBL_TMP_OUTPUT_
@@ -1400,6 +1406,8 @@ sleep 5
 		else()
 			execute_process(COMMAND "${_NBL_UPDATE_SUBMODULES_CMD_FILE_}")
 		endif()
+		
+		message(STATUS "Submodules have been updated! Check \"${NBL_ROOT_PATH_BINARY}/nbl-update-submodules.log\" for more details.")
 	else()
 		execute_process(COMMAND ${CMAKE_COMMAND} -E echo "NBL_UPDATE_GIT_SUBMODULE is turned OFF therefore submodules won't get updated.")
 	endif()