Skip to content

Commit 1515ee0

Browse files
committed
Fix: incorrect import of HPy's version.py
1 parent c246e1b commit 1515ee0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2819,15 +2819,16 @@ def exclude_files(*files):
28192819
SUITE.vc.git_command(SUITE.dir, ["reset", "--hard"])
28202820
SUITE.vc.git_command(SUITE.dir, ["checkout", "-"])
28212821
mx.abort("File 'version.py' is not available. Did you forget to run 'setup.py build' ?")
2822+
import_file(src_version_file, dest_version_file)
28222823

28232824
# 'abitag.py' goes to 'lib-graalpython/module/hpy/devel/'
2824-
dest_version_file = join(_get_core_home(), "modules", "hpy", "devel", "abitag.py")
2825-
src_version_file = join(hpy_repo_path, "hpy", "devel", "abitag.py")
2826-
if not os.path.exists(src_version_file):
2825+
dest_abitag_file = join(_get_core_home(), "modules", "hpy", "devel", "abitag.py")
2826+
src_abitag_file = join(hpy_repo_path, "hpy", "devel", "abitag.py")
2827+
if not os.path.exists(src_abitag_file):
28272828
SUITE.vc.git_command(SUITE.dir, ["reset", "--hard"])
28282829
SUITE.vc.git_command(SUITE.dir, ["checkout", "-"])
28292830
mx.abort("File 'abitag.py' is not available. Did you forget to run 'setup.py build' ?")
2830-
import_file(src_version_file, dest_version_file)
2831+
import_file(src_abitag_file, dest_abitag_file)
28312832

28322833
# copy headers from .../hpy/hpy/devel/include' to 'header_dest'
28332834
# but exclude subdir 'cpython' (since that's only for CPython)

0 commit comments

Comments
 (0)