X-Git-Url: https://git.distorted.org.uk/~mdw/mLib-python/blobdiff_plain/a510e264770430077bb4dbacd104c6aae19bcdd6..81f68b64afdb80f8ee34e1294ecc5fb452a3e58b:/setup.py

diff --git a/setup.py b/setup.py
index 34ea95f..55fe09c 100755
--- a/setup.py
+++ b/setup.py
@@ -1,30 +1,25 @@
 #! /usr/bin/python
 
 import distutils.core as DC
-import Pyrex.Distutils as PXD
 import mdwsetup as MS
 
-MS.pkg_config('catacomb', '2.1.0')
-MS.pkg_config('mLib', '2.1.0')
+MS.pkg_config('mLib', '2.2.2.1')
 
-MS.derive('base64.pyx', 'codec.pyx.in',
-          {'CLASS': 'Base64', 'PREFIX': 'base64'})
-MS.derive('base32.pyx', 'codec.pyx.in',
-          {'CLASS': 'Base32', 'PREFIX': 'base32'})
-MS.derive('hex.pyx', 'codec.pyx.in',
-          {'CLASS': 'Hex', 'PREFIX': 'hex'})
-
-mLib = DC.Extension('mLib', ['mLib.pyx', 'atom-base.c', 'array.c'],
+mLib = DC.Extension('mLib._base',
+                    ['mLib.c', 'atom.c', 'sys.c', 'ui.c',
+                     'pyke/pyke.c', 'pyke/mapping.c'],
                     ##extra_compile_args = ['-O0'],
                     include_dirs = MS.uniquify(MS.INCLUDEDIRS),
                     library_dirs = MS.uniquify(MS.LIBDIRS),
                     libraries = MS.uniquify(MS.LIBS))
 
-DC.setup(name = 'mLib-python',
-         version = MS.auto_version(),
+MS.setup(name = 'mLib-python',
          description = 'Python interface to mLib utilities library',
+         url = 'https://git.distorted.org.uk/~mdw/mLib-python/',
          author = 'Straylight/Edgeware',
          author_email = 'mdw@distorted.org.uk',
          license = 'GNU General Public License',
-         ext_modules = [mLib],
-         cmdclass = { 'build_ext': PXD.build_ext })
+         packages = ['mLib'],
+         unittest_dir = "t",
+         unittests = ["t-misc", "t-atom", "t-ui"],
+         ext_modules = [mLib])