add argparse for builtin generators

Author: tad1

src/nbl/builtin/builtinDataGen.py

@@ -1,20 +1,26 @@
 # Creates a c++ file for builtin resources that contains binary data of all resources
 
-# TODO: use argparse not this by-hand-shit
-
-import sys, os, subprocess, json
+import argparse, os, subprocess, json
 from datetime import datetime, timezone
 
-if  len(sys.argv) < 8 :
-    print(sys.argv[0] + " - Incorrect argument count")
-else:
-    outputBuiltinPath = sys.argv[1]
-    outputArchivePath = sys.argv[2]
-    bundleAbsoluteEntryPath = sys.argv[3]
-    resourcesFile  = sys.argv[4]
-    resourcesNamespace = sys.argv[5]
-    correspondingHeaderFile = sys.argv[6]
-    xxHash256Exe = sys.argv[7]
+
+parser = argparse.ArgumentParser(description="Creates a c++ file for builtin resources that contains binary data of all resources")
+parser.add_argument('--outputBuiltinPath', required=True, help="output path of generated C++ builtin data source")
+parser.add_argument('--outputArchivePath', required=True, help="output path of generated C++ archive data source")
+parser.add_argument('--bundleAbsoluteEntryPath', required=True, help="\"absolute path\" for an archive which will store a given bundle of builtin resources")
+parser.add_argument('--resourcesFile', required=True, help="path to file containing resources list")
+parser.add_argument('--resourcesNamespace', required=True, help="a C++ namespace builtin resources will be wrapped into")
+parser.add_argument('--correspondingHeaderFile', required=True, help="filename of previosly generated header (via buitinHeaderGen.py)")
+parser.add_argument('--xxHash256Exe', default="", nargs='?', help="path to xxHash256 executable")
+
+def execute(args):
+    outputBuiltinPath = args.outputBuiltinPath
+    outputArchivePath = args.outputArchivePath
+    bundleAbsoluteEntryPath = args.bundleAbsoluteEntryPath
+    resourcesFile = args.resourcesFile
+    resourcesNamespace = args.resourcesNamespace
+    correspondingHeaderFile = args.correspondingHeaderFile
+    xxHash256Exe = args.xxHash256Exe
 
     forceConstexprHash = True if not xxHash256Exe else False
 
@@ -196,4 +202,9 @@
 
     outp = open(outputArchivePath, "w+")
     outp.write(archiveSource)
-    outp.close()
+    outp.close()
+
+
+if __name__ == "__main__":
+    args: argparse.Namespace = parser.parse_args()
+    execute(args)

src/nbl/builtin/builtinHeaderGen.py

@@ -1,19 +1,25 @@
 # Creates a header file for builtin resources
 
-# TODO: use argparse not this by-hand-shit
-
-import sys, os
-
-if  len(sys.argv) < 8 :
-    print(sys.argv[0] + " - Incorrect argument count")
-else:
-    outputBuiltinPath = sys.argv[1]
-    outputArchivePath = sys.argv[2]
-    archiveBundlePath = sys.argv[3]
-    resourcesFile  = sys.argv[4]
-    resourcesNamespace = sys.argv[5]
-    guardSuffix = sys.argv[6]
-    isSharedLibrary = True if sys.argv[7] == "True" else False
+import argparse, sys, os
+
+
+parser = argparse.ArgumentParser(description="Creates a c++ file for builtin resources that contains binary data of all resources")
+parser.add_argument('--outputBuiltinPath', required=True, help="output path of generated C++ builtin header source")
+parser.add_argument('--outputArchivePath', required=True, help="output path of generated C++ archive header source")
+parser.add_argument('--archiveBundlePath', required=True, help="path for an archive which will store a given bundle of builtin resources")
+parser.add_argument('--resourcesFile', required=True, help="path for a file which containins list of resources")
+parser.add_argument('--resourcesNamespace', required=True, help="a C++ namespace builtin resources will be wrapped into")
+parser.add_argument('--guardSuffix', required=True, help="include guard suffix name, for C header files")
+parser.add_argument('--isSharedLibrary', required=True, choices=["True", "False"])
+
+def execute(args):
+    outputBuiltinPath = args.outputBuiltinPath
+    outputArchivePath = args.outputArchivePath
+    archiveBundlePath = args.archiveBundlePath
+    resourcesFile = args.resourcesFile
+    resourcesNamespace = args.resourcesNamespace
+    guardSuffix = args.guardSuffix
+    isSharedLibrary = True if args.isSharedLibrary == "True" else False
 
     NBL_BR_API = "NBL_BR_API" if isSharedLibrary else ""
 
@@ -134,3 +140,7 @@ class {NBL_BR_API} CArchive final : public nbl::system::CFileArchive
     outp = open(outputArchivePath, "w+")
     outp.write(archiveHeader)
     outp.close()
+
+if __name__ == "__main__":
+    args: argparse.Namespace = parser.parse_args()
+    execute(args)

src/nbl/builtin/utils.cmake

@@ -133,9 +133,14 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
 		set(_NBL_BR_RUNTIME_HASH_ 1)
 	endif()
 
+	set(NBL_BUILTIN_RESOURCES_COMMON_ARGS
+   		--resourcesFile "${NBL_RESOURCES_LIST_FILE}"
+   		--resourcesNamespace "${_NAMESPACE_}"
+	)
+
 	add_custom_command(OUTPUT "${NBL_BUILTIN_RESOURCES_H}" "${NBL_BUILTIN_RESOURCE_DATA_CPP}" "${NBL_BUILTIN_DATA_ARCHIVE_H}" "${NBL_BUILTIN_DATA_ARCHIVE_CPP}"
-		COMMAND "${_Python3_EXECUTABLE}" "${NBL_BUILTIN_HEADER_GEN_PY}" "${NBL_BUILTIN_RESOURCES_H}" "${NBL_BUILTIN_DATA_ARCHIVE_H}" "${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}" "${_GUARD_SUFFIX_}" "${_SHARED_}"
-		COMMAND "${_Python3_EXECUTABLE}" "${NBL_BUILTIN_DATA_GEN_PY}" "${NBL_BUILTIN_RESOURCE_DATA_CPP}" "${NBL_BUILTIN_DATA_ARCHIVE_CPP}" "${_BUNDLE_SEARCH_DIRECTORY_}/${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}" "${NBL_RESOURCES_LIST_FILE}" "${_NAMESPACE_}" "${NBL_BS_HEADER_FILENAME}" "$<${_NBL_BR_RUNTIME_HASH_}:$<TARGET_FILE:xxHash256>>"
+		COMMAND "${_Python3_EXECUTABLE}" "${NBL_BUILTIN_HEADER_GEN_PY}" ${NBL_BUILTIN_RESOURCES_COMMON_ARGS} --outputBuiltinPath "${NBL_BUILTIN_RESOURCES_H}" --outputArchivePath "${NBL_BUILTIN_DATA_ARCHIVE_H}" --archiveBundlePath "${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}" --guardSuffix "${_GUARD_SUFFIX_}" --isSharedLibrary "${_SHARED_}"
+		COMMAND "${_Python3_EXECUTABLE}" "${NBL_BUILTIN_DATA_GEN_PY}" ${NBL_BUILTIN_RESOURCES_COMMON_ARGS} --outputBuiltinPath "${NBL_BUILTIN_RESOURCE_DATA_CPP}" --outputArchivePath "${NBL_BUILTIN_DATA_ARCHIVE_CPP}" --bundleAbsoluteEntryPath "${_BUNDLE_SEARCH_DIRECTORY_}/${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}" --correspondingHeaderFile "${NBL_BS_HEADER_FILENAME}" --xxHash256Exe "$<${_NBL_BR_RUNTIME_HASH_}:$<TARGET_FILE:xxHash256>>"
 		COMMENT "Generating \"${_TARGET_NAME_}\"'s sources & headers"
 		DEPENDS ${NBL_DEPENDENCY_FILES}
 		VERBATIM