put version.h in hpy/devel, and generate also a corresponding version.py

mattip · Sep 8, 2020 · 46f151a · 46f151a
1 parent 8a43ccd
commit 46f151a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,8 @@
 hpy/tools/autogen/autogen_pypy.txt
 
 # generated by setup.py:get_scm_config()
-hpy/universal/src/version.h
+hpy/devel/include/common/version.h
+hpy/devel/version.py
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

diff --git a/hpy/universal/src/hpymodule.c b/hpy/universal/src/hpymodule.c
@@ -10,7 +10,7 @@
 
 #include "api.h"
 #include "handles.h"
-#include "version.h"
+#include "common/version.h"
 
 typedef HPy (*InitFuncPtr)(HPyContext ctx);
 

diff --git a/setup.py b/setup.py
@@ -18,12 +18,20 @@ def get_scm_config():
     gitrev = subprocess.check_output('git describe --abbrev=7 --dirty '
                                      '--always --tags --long'.split(), encoding='utf-8')
     gitrev = gitrev.strip()
-    version_h = pathlib.Path('.').joinpath('hpy', 'universal', 'src', 'version.h')
+    version_h = pathlib.Path('.').joinpath('hpy', 'devel', 'include', 'common', 'version.h')
     version_h.write_text(textwrap.dedent(f"""
         // automatically generated by setup.py:get_scm_config()
         #define HPY_VERSION "{version}"
         #define HPY_GIT_REVISION "{gitrev}"
     """))
+
+    version_py = pathlib.Path('.').joinpath('hpy', 'devel', 'version.py')
+    version_py.write_text(textwrap.dedent(f"""
+        # automatically generated by setup.py:get_scm_config()
+        __version__ = "{version}"
+        __git_revision__ = "{gitrev}"
+    """))
+
     return {} # use the default config
 
 setup(