Reverting relative Java/Cpp directories in build targets, added include property to Cpp configurations

Author: MaXFeeD

toolchain/toolchain/python/icmtoolchain/java_build.py

@@ -14,21 +14,12 @@
 from .language import get_language_directories
 from .shell import abort, debug, error, info, warn
 from .utils import (RuntimeCodeError, copy_directory, copy_file,
-                    ensure_directory, get_all_files, get_next_filename,
-                    remove_tree, request_executable_version, request_tool,
-                    walk_all_files)
+                    ensure_directory, ensure_file, get_all_files,
+                    get_next_filename, remove_tree, request_executable_version,
+                    request_tool, walk_all_files)
 
 BuildTarget = namedtuple("BuildTarget", "directory relative_directory output_directory manifest classpath")
 
-def prepare_directory_order(directory: str) -> List[str]:
-	directories = os.listdir(directory)
-	if "order.txt" in directories:
-		with open(join(directory, "order.txt"), encoding="utf-8") as order:
-			directories = order.readlines()
-	else:
-		directories = list(filter(lambda name: isdir(join(directory, name)), directories))
-	return directories
-
 def collect_classpath_files(directories: Optional[Collection[str]]) -> List[str]:
 	classpath = list()
 	if not directories:
@@ -460,10 +451,9 @@ def get_java_build_targets(directories: Dict[str, BaseConfig]) -> List[BuildTarg
 	targets = list()
 
 	for directory, config in directories.items():
-		# TODO: Maybe move logic to relative directory instead of hashed one.
-		# relative_directory = config.get_value("directory")
-		# assert relative_directory, "Internal error, relative directory cannot be empty."
-		relative_directory = GLOBALS.MAKE_CONFIG.unique_folder_name(directory)
+		relative_directory = basename(directory)
+		output_directory = GLOBALS.MOD_STRUCTURE.new_build_target("java", relative_directory)
+		ensure_directory(output_directory)
 
 		with open(join(directory, "manifest"), encoding="utf-8") as manifest:
 			try:
@@ -473,8 +463,6 @@ def get_java_build_targets(directories: Dict[str, BaseConfig]) -> List[BuildTarg
 			except json.JSONDecodeError as exc:
 				raise RuntimeCodeError(2, f"* Malformed java directory {directory!r} manifest, you should fix it: {exc.msg}.")
 
-		output_directory = GLOBALS.MOD_STRUCTURE.new_build_target("java", relative_directory)
-		ensure_directory(output_directory)
 		classpath = collect_classpath_files(config.get_value("classpath"))
 		target = BuildTarget(directory, relative_directory, output_directory, config, classpath)
 		targets.append(target)
@@ -569,16 +557,14 @@ def compile_java(tool: str = "gradle") -> int:
 	except RuntimeCodeError as exc:
 		error(exc)
 		return exc.code
-	if len(directories) == 0:
-		GLOBALS.MOD_STRUCTURE.update_build_config_list("javaDirs")
-		return 0
 
 	overall_result = build_java_directories(tool, directories, target_directory)
 
 	GLOBALS.MOD_STRUCTURE.update_build_config_list("javaDirs")
-	startup_millis = time() - startup_millis
-	if overall_result == 0:
-		print(f"Completed java build in {startup_millis:.2f}s!")
-	else:
-		error(f"Failed java build in {startup_millis:.2f}s with result {overall_result}.")
+	if len(directories) != 0:
+		startup_millis = time() - startup_millis
+		if overall_result == 0:
+			print(f"Completed java build in {startup_millis:.2f}s!")
+		else:
+			error(f"Failed java build in {startup_millis:.2f}s with result {overall_result}.")
 	return overall_result

toolchain/toolchain/python/icmtoolchain/native_build.py

@@ -116,10 +116,9 @@ def get_native_build_targets(directories: Dict[str, BaseConfig]) -> List[BuildTa
 	targets = list()
 
 	for directory, config in directories.items():
-		# TODO: Maybe move logic to relative directory instead of hashed one.
-		# relative_directory = config.get_value("directory")
-		# assert relative_directory, "Internal error, relative directory cannot be empty."
-		relative_directory = GLOBALS.MAKE_CONFIG.unique_folder_name(directory)
+		relative_directory = basename(directory)
+		output_directory = GLOBALS.MOD_STRUCTURE.new_build_target("native", relative_directory)
+		ensure_directory(output_directory)
 
 		# Apply global configurations to preserve keepIncludes, etc. in builds.
 		configurations = config.get_config("configurations")
@@ -139,8 +138,6 @@ def get_native_build_targets(directories: Dict[str, BaseConfig]) -> List[BuildTa
 			except json.JSONDecodeError as exc:
 				raise RuntimeCodeError(2, f"* Malformed native directory {directory!r} manifest, you should fix it: {exc.msg}.")
 
-		output_directory = GLOBALS.MOD_STRUCTURE.new_build_target("native", relative_directory)
-		ensure_directory(output_directory)
 		stdincludes = collect_stdincludes_directories(config.get_value("stdincludes"))
 		target = BuildTarget(directory, relative_directory, output_directory, config, stdincludes)
 		targets.append(target)
@@ -152,6 +149,7 @@ def build_native_with_ndk(directory: str, output_directory: str, target_director
 	library_name = manifest.get_value("shared.name", basename(directory))
 	if len(library_name) == 0 or library_name.isspace() or (manifest.get_value("shared") and library_name == "unnamed"):
 		abort(f"Library directory {directory} uses illegal name {library_name!r}!", code=CODE_FAILED_INVALID_MANIFEST)
+
 	soname = "lib" + library_name + ".so"
 	if manifest.get_value("library.version", -1) < 0 and manifest.get_value("library"):
 		abort(f"Library directory {directory} shares library with illegal version!", code=CODE_FAILED_INVALID_MANIFEST)
@@ -252,6 +250,8 @@ def build_native_with_ndk(directory: str, output_directory: str, target_director
 						pass
 			else:
 				warn(f"* Dependency directory {dependency} is not found, it will be skipped.")
+		for include in manifest_abi.get_list("include"):
+			includes.append("-I" + join(directory, include))
 
 		# Collect files and prepare output cache directories.
 		source_files = get_all_files(directory, extensions=(".cpp", ".c"))