correct all issues & compile errors regarding builtin resources targets, perform tests and make it works with aliases. Have default abs path for archive entry generated by CMake, rstrip each python string and have declaration of an explicit template specialization in bs header. Update examples_tests submodule

Author: AnastaZIuk

examples_tests

@@ -19,9 +19,9 @@
     resourcesNamespace = sys.argv[4]
     correspondingHeaderFile = sys.argv[5]
 
-    with open(resourcesFile, "r") as f:
-        resourcePaths = f.read().rstrip().readlines()
-       
+    file = open(resourcesFile, 'r')
+    resourcePaths = file.readlines()
+
     #opening a file
     outp = open(outputFilename,"w+")
 
@@ -34,7 +34,7 @@
     # writing binary  data of all files in a loop
     for z in resourcePaths:
         itemData = z.split(',')
-        x = itemData[0]
+        x = itemData[0].rstrip()
 
         outp.write('\n\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>()' % x)
         outp.write('\n\t{')
@@ -58,28 +58,28 @@
 
         outp.write('\n\t\t};')
         outp.write('\n\t\treturn { data, sizeof(data) };')
-        outp.write('\n\t}')
+        outp.write('\n\t}\n')
 
         if len(itemData) > 1:
-            for alias in range(1, len(itemData)):
-                outp.write('\n\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>()' % alias)
+            for i in range(1, len(itemData)):
+                outp.write('\n\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>()' % itemData[i].rstrip())
                 outp.write('\n\t{')
                 outp.write('\n\t\treturn get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
-                outp.write('\n\t{')
+                outp.write('\n\t}\n')
 
     outp.write("\tstd::pair<const uint8_t*, size_t> get_resource_runtime(const std::string& filename) {\n")
     outp.write("\t\tstatic std::unordered_map<std::string, int> resourcesByFilename( {\n")
     counter = 1
 
     for z in resourcePaths:
         itemData = z.split(',')
-        x = itemData[0]
+        x = itemData[0].rstrip()
 
         outp.write("\t\t\t{\"%s\", %d},\n" % (x,counter))
 
         if len(itemData) > 1:
-            for alias in range(1, len(itemData)):
-                outp.write("\t\t\t{\"%s\", %d},\n" % (alias,counter))
+            for i in range(1, len(itemData)):
+                outp.write("\t\t\t{\"%s\", %d},\n" % (itemData[i].rstrip(),counter))
 
         counter+= 1
 
@@ -91,7 +91,7 @@
 
     for z in resourcePaths:
         itemData = z.split(',')
-        x = itemData[0]
+        x = itemData[0].rstrip()
 
         outp.write("\t\t\tcase %d:\n\t\t\t\t\treturn get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE(\"%s\")>();\n" % (counter,x))
         counter+= 1

src/nbl/builtin/builtinDataGen.py

@@ -19,8 +19,8 @@
     resourcesNamespace = sys.argv[4]
     guardSuffix = sys.argv[5]
 
-    with open(resourcesFile, "r") as f:
-        resourcePaths = f.read().rstrip().readlines()
+    file = open(resourcesFile, 'r')
+    resourcePaths = file.readlines()
 
     #opening a file
     outp = open(outputFilename,"w+")
@@ -39,13 +39,13 @@
     #Iterating through input list
     for z in resourcePaths:
         itemData = z.split(',')
-        x = itemData[0]
+        x = itemData[0].rstrip()
 
-        outp.write('\n\t\textern template const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
+        outp.write('\n\t\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
 
         if len(itemData) > 1:
-            for alias in range(1, len(itemData)):
-                outp.write('\n\t\textern template const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % alias)
+            for i in range(1, len(itemData)):
+                outp.write('\n\t\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % itemData[i].rstrip())
 
     outp.write("\n\t}")
     outp.write("\n#endif // _" + guardSuffix + "_BUILTINRESOURCEDATA_H_")

src/nbl/builtin/builtinHeaderGen.py

@@ -15,7 +15,7 @@ namespace @_NAMESPACE_@
 	{
 		public:
 			inline CArchive(nbl::system::logger_opt_smart_ptr&& logger)
-				: nbl::system::CFileArchive(nbl::system::path(pathPrefix.data()),std::move(logger), getItemList()) {}
+				: nbl::system::CFileArchive(nbl::system::path("@_DEFAULT_ABSOLUTE_BUNDLE_SEARCH_DIRECTORY_@"),std::move(logger), getItemList()) {}
 
 		protected:
 			file_buffer_t getFileBuffer(const nbl::system::IFileArchive::SListEntry* item) override

src/nbl/builtin/template/CArchive.h.in

@@ -69,6 +69,7 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
 			unset(_ITEM_ALIASES_)
 		endif()
 
+		set(_DEFAULT_ABSOLUTE_BUNDLE_SEARCH_DIRECTORY_ "${_BUNDLE_SEARCH_DIRECTORY_}")
 		set(NBL_BUILTIN_RESOURCE_ABS_PATH "${_BUNDLE_SEARCH_DIRECTORY_}/${_CURRENT_PATH_}") # an absolute path to a builtin resource
 		list(APPEND NBL_BUILTIN_RESOURCES "${NBL_BUILTIN_RESOURCE_ABS_PATH}")