From 7844307638c4666c0fc4a330b7d536722fc13460 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Mon, 24 Jun 2019 18:58:30 +0200
Subject: python: add version.py, check it in configure.

---
 python/libghdl/__init__.py |  2 +-
 python/libghdl/version.py  |  1 +
 python/setup.py            | 22 ++--------------------
 3 files changed, 4 insertions(+), 21 deletions(-)
 create mode 100644 python/libghdl/version.py

(limited to 'python')

diff --git a/python/libghdl/__init__.py b/python/libghdl/__init__.py
index a733cd1a8..3050a82da 100644
--- a/python/libghdl/__init__.py
+++ b/python/libghdl/__init__.py
@@ -2,7 +2,7 @@ import ctypes
 import os
 from os.path import dirname, join, exists
 from shutil import which
-from libghdl.config import __version__
+from libghdl.version import __version__
 
 
 def _get_libghdl_name():
diff --git a/python/libghdl/version.py b/python/libghdl/version.py
new file mode 100644
index 000000000..0a51c80f3
--- /dev/null
+++ b/python/libghdl/version.py
@@ -0,0 +1 @@
+__version__ = '0.37-dev'
diff --git a/python/setup.py b/python/setup.py
index 4d9dc5c41..479b9f5af 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -5,35 +5,20 @@ from distutils.core import setup
 import re
 
 def get_version():
-    # Try from config.py.  Reads it to avoid to load the shared library.
+    # Try from version.py.  Reads it to avoid to load the shared library.
     r = re.compile("^__version__ = '(.*)'\n")
     try:
-        l = open('libghdl/config.py').read()
+        l = open('libghdl/version.py').read()
         m = r.match(l)
         if m:
             return m.group(1)
     except:
         pass
-    # Try to extract from configure
-    r = re.compile('^ghdl_version="(.*)"')
-    try:
-        for l in open('../configure').readlines():
-            m = r.match(l)
-            if m:
-                return m.group(1)
-    except:
-        pass
     raise Exception("Cannot find version")
 
 # Extract the version now, as setup() may change the current directory.
 version=get_version()
 
-class MyBuildPy(distutils.command.build_py.build_py):
-    def run(self):
-        with open('libghdl/config.py', 'w') as f:
-            f.write("__version__ = '{}'\n".format(version))
-        super(MyBuildPy, self).run()
-
 setup(
     name='libghdl',
     version=version,
@@ -46,9 +31,6 @@ write tools like linters.
     author_email='tgingold@free.fr',
     url='http://github.com/ghdl/ghdl',
     license='GPL-2.0-or-later',
-    cmdclass={
-        'build_py': MyBuildPy
-    },
     package_dir={
         'libghdl': './libghdl'
     },
-- 
cgit v1.2.3