Fix: wrong src path for HPy runtime sources

Author: fangerer

mx.graalpython/mx_graalpython.py

@@ -2068,10 +2068,10 @@ def update_hpy_import_cmd(args):
 
     # do sanity check of the HPy repo
     hpy_repo_include_dir = join(hpy_repo_path, "hpy", "devel", "include")
-    hpy_repo_runtime_dir = join(hpy_repo_path, "hpy", "devel", "src")
+    hpy_repo_src_dir = join(hpy_repo_path, "hpy", "devel", "src")
     hpy_repo_debug_dir = join(hpy_repo_path, "hpy", "debug")
     hpy_repo_test_dir = join(hpy_repo_path, "test")
-    for d in [hpy_repo_path, hpy_repo_include_dir, hpy_repo_runtime_dir, hpy_repo_test_dir]:
+    for d in [hpy_repo_path, hpy_repo_include_dir, hpy_repo_src_dir, hpy_repo_test_dir]:
         if not os.path.isdir(d):
             mx.abort("HPy import repo is missing directory {}".format(d))
 
@@ -2156,11 +2156,11 @@ def exclude_subdir(subdir):
 
     # runtime sources go into 'lib-graalpython/module/hpy/devel/src'
     runtime_files_dest = join(_get_core_home(), "modules", "hpy", "devel", "src")
-    import_files(hpy_repo_runtime_dir, runtime_files_dest)
-    remove_inexistent_files(hpy_repo_runtime_dir, runtime_files_dest)
+    import_files(hpy_repo_src_dir, runtime_files_dest)
+    remove_inexistent_files(hpy_repo_src_dir, runtime_files_dest)
 
     # 'ctx_tracker.c' also goes to 'com.oracle.graal.python.jni/src/ctx_tracker.c'
-    tracker_file_src = join(hpy_repo_runtime_dir, "ctx_tracker.c")
+    tracker_file_src = join(hpy_repo_src_dir, "runtime", "ctx_tracker.c")
     if not os.path.exists(tracker_file_src):
         mx.abort("File '{}' is missing but required.".format(tracker_file_src))
     tracker_file_dest = join(mx.project("com.oracle.graal.python.jni").dir, "src", "ctx_tracker.c")