Fix relative paths in reccmp-build.yml

isledecomp · Oct 29, 2024 · 5201985 · 5201985
1 parent 7e9f2f9
commit 5201985
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/reccmp/ghidra_scripts/import_functions_and_types_from_pdb.py b/reccmp/ghidra_scripts/import_functions_and_types_from_pdb.py
@@ -304,6 +304,7 @@ def main():
     import setuptools  # pylint: disable=unused-import # required to fix a distutils issue in Python 3.12
 
     # Packages are imported down here because reccmp's dependencies are only available after the venv was added to the pythonpath
+    reload_module("reccmp.project.detect")
     from reccmp.project.common import RECCMP_BUILD_CONFIG, RECCMP_PROJECT_CONFIG
     from reccmp.project.detect import RecCmpBuiltProject, RecCmpBuiltTarget
     from reccmp.project.error import RecCmpProjectNotFoundException

diff --git a/reccmp/project/detect.py b/reccmp/project/detect.py
@@ -139,7 +139,8 @@ def from_directory(cls, directory: Path) -> "RecCmpBuiltProject":
         yaml_loader = ruamel.yaml.YAML()
         build_data = yaml_loader.load(build_config.open())
 
-        project_directory = Path(build_data["project"])
+        # note that Path.joinpath() will ignore the first path if the second path is absolute
+        project_directory = build_directory.joinpath(Path(build_data["project"]))
         project_config_path = project_directory / RECCMP_PROJECT_CONFIG
         if not project_config_path.is_file():
             raise InvalidRecCmpProjectException(