correct python script, fix and correct CArchive.h.in and update src/nbl/builtin/CMakeLists.txt. Update examples_tests submodule

Author: AnastaZIuk

examples_tests

@@ -250,8 +250,14 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
 	set(NBL_TEMPLATE_APK_RESOURCES_ARCHIVE_HEADER "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/template/CArchive.h.in")
 	set(NBL_BUILTIN_HEADER_GEN_PY "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/builtinHeaderGen.py")
 	set(NBL_BUILTIN_DATA_GEN_PY "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/builtinDataGen.py")
+	set(NBL_BS_HEADER_FILENAME "builtinResources.h")
+	set(NBL_BS_DATA_SOURCE_FILENAME "builtinResourceData.cpp")
 
 	string(REPLACE "::" "/" _PATH_PREFIX_ "${_NAMESPACE_}")
+	string(REPLACE "::" "_" _GUARD_SUFFIX_ "${_NAMESPACE_}")
+	string(REGEX REPLACE "^[0-9]+\." "" _GUARD_SUFFIX_ ${_GUARD_SUFFIX_})
+	string(TOUPPER ${_GUARD_SUFFIX_} _GUARD_SUFFIX_)
+	string(MAKE_C_IDENTIFIER ${_GUARD_SUFFIX_} _GUARD_SUFFIX_)
 
 	set(_ITR_ 0)
 	foreach(X IN LISTS _LBR_${_BUNDLE_NAME_}_)
@@ -284,8 +290,6 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
 	file(MAKE_DIRECTORY "${NBL_ROOT_PATH_BINARY}/include/nbl/builtin")
 	file(WRITE "${NBL_RESOURCES_LIST_FILE}" "${RESOURCES_ARGS}")
 
-	set(NBL_BS_HEADER_FILENAME "builtinResources.h")
-	set(NBL_BS_DATA_SOURCE_FILENAME "builtinResourceData.cpp")
 	set(NBL_BUILTIN_RESOURCES_HEADER "${_OUTPUT_DIRECTORY_}/${NBL_BS_HEADER_FILENAME}")
 	set(NBL_BUILTIN_RESOURCE_DATA_SOURCE "${_OUTPUT_DIRECTORY_}/${NBL_BS_DATA_SOURCE_FILENAME}")
 
@@ -296,8 +300,8 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
 
 	add_custom_command(
 		OUTPUT "${NBL_BUILTIN_RESOURCES_HEADER}" "${NBL_BUILTIN_RESOURCE_DATA_SOURCE}"
-		COMMAND "${PYTHON_EXECUTABLE}" "${NBL_BUILTIN_HEADER_GEN_PY}" "${NBL_BUILTIN_RESOURCES_HEADER}" "${NBL_ROOT_PATH}/include" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}"
-		COMMAND "${PYTHON_EXECUTABLE}" "${NBL_BUILTIN_DATA_GEN_PY}" "${NBL_BUILTIN_RESOURCE_DATA_SOURCE}" "${NBL_ROOT_PATH}/include" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}" "${NBL_BS_HEADER_FILENAME}"
+		COMMAND "${PYTHON_EXECUTABLE}" "${NBL_BUILTIN_HEADER_GEN_PY}" "${NBL_BUILTIN_RESOURCES_HEADER}" "${_BUNDLE_SEARCH_DIRECTORY_}" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}" "${_GUARD_SUFFIX_}"
+		COMMAND "${PYTHON_EXECUTABLE}" "${NBL_BUILTIN_DATA_GEN_PY}" "${NBL_BUILTIN_RESOURCE_DATA_SOURCE}" "${_BUNDLE_SEARCH_DIRECTORY_}" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}" "${NBL_BS_HEADER_FILENAME}"
 		COMMENT "Generating built-in resources"
 		DEPENDS ${NBL_DEPENDENCY_FILES}
 		VERBATIM  

src/nbl/builtin/CMakeLists.txt

@@ -17,15 +17,16 @@
     cmakeSourceDir = sys.argv[2]
     resourcesFile  = sys.argv[3]
     resourcesNamespace = sys.argv[4]
+    guardSuffix = sys.argv[5]
 
     with open(resourcesFile, "r") as f:
         resourcePaths = f.read().rstrip().split(',')
 
     #opening a file
     outp = open(outputFilename,"w+")
 
-    outp.write("#ifndef BUILTINRESOURCEDATA_H\n")
-    outp.write("#define BUILTINRESOURCEDATA_H\n")
+    outp.write("#ifndef _" + guardSuffix + "_BUILTINRESOURCEDATA_H_\n")
+    outp.write("#define _" + guardSuffix + "_BUILTINRESOURCEDATA_H\n")
     outp.write("#include <stdlib.h>\n")
     outp.write("#include <cstdint>\n")
     outp.write("#include <string>\n")
@@ -40,6 +41,6 @@
         outp.write('\n\t\textern template const std::pair<const uint8_t*, size_t> get_resource<typename NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
 
     outp.write("\n\t}")
-    outp.write("\n#endif")
+    outp.write("\n#endif // _" + guardSuffix + "_BUILTINRESOURCEDATA_H_")
 
     outp.close()

src/nbl/builtin/builtinHeaderGen.py

@@ -1,29 +1,32 @@
-#ifndef _NBL_C_ARCHIVE_H_
-#define _NBL_C_ARCHIVE_H_
+#ifndef _@_GUARD_SUFFIX_@_C_ARCHIVE_H_
+#define _@_GUARD_SUFFIX_@_C_ARCHIVE_H_
 
 #include <nbl/system/CFileArchive.h>
+#include "@NBL_BS_HEADER_FILENAME@"
 
 namespace @_NAMESPACE_@
 {
 	constexpr std::string_view pathPrefix = "@_PATH_PREFIX_@";
 	constexpr bool hasPathPrefix(std::string_view str) { return str.find(pathPrefix) == 0ull; }
+	
+	std::pair<const uint8_t*, size_t> get_resource_runtime(const std::string& filename);
 
-	class CArchive final : public system::CFileArchive
+	class CArchive final : public nbl::system::CFileArchive
 	{
 		public:
-			inline CArchive(system::path _path, system::logger_opt_smart_ptr&& logger)
-				: system::CFileArchive(std::move(_path),std::move(logger), getItemList()) {}
+			inline CArchive(nbl::system::path _path, nbl::system::logger_opt_smart_ptr&& logger)
+				: nbl::system::CFileArchive(std::move(_path),std::move(logger), getItemList()) {}
 
 		protected:
-			file_buffer_t getFileBuffer(const system::IFileArchive::SListEntry* item) override
+			file_buffer_t getFileBuffer(const nbl::system::IFileArchive::SListEntry* item) override
 			{
 					auto found = get_resource_runtime(item->pathRelativeToArchive.string());
 					return { const_cast<uint8_t*>(found.first), found.second, nullptr };
 			}
 
-			core::vector<system::IFileArchive::SListEntry> getItemList()
+			nbl::core::vector<nbl::system::IFileArchive::SListEntry> getItemList()
 			{
-				static core::vector<system::IFileArchive::SListEntry> resources
+				static nbl::core::vector<nbl::system::IFileArchive::SListEntry> resources
 				{
 @_RESOURCES_INIT_LIST_@
 				};
@@ -33,6 +36,6 @@ namespace @_NAMESPACE_@
 	};
 }
 
-#endif // _NBL_C_ARCHIVE_H_
+#endif // _@_GUARD_SUFFIX_@_C_ARCHIVE_H_