Merge branch '1.3.x' into HEAD

[catacomb-python] / setup.py

diff --git a/setup.py b/setup.py
old mode 100644 (file)
new mode 100755 (executable)
index 927d1d2..8ac72ab
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,10 @@
 #! /usr/bin/python
 
-import os as OS
-import subprocess as SUB
-
 import distutils.core as DC
 import mdwsetup as MS
 
-MS.pkg_config('catacomb', '2.1.1')
-MS.pkg_config('mLib', '2.0.4')
-
-MS.generate('algorithms.h')
+MS.pkg_config('catacomb', '2.5.0')
+MS.pkg_config('mLib', '2.4.99~')
 
 cat = DC.Extension('catacomb._base',
                    ['catacomb.c', 'bytestring.c', 'buffer.c',
@@ -21,13 +16,19 @@ cat = DC.Extension('catacomb._base',
                    library_dirs = MS.uniquify(MS.LIBDIRS),
                    libraries = MS.uniquify(MS.LIBS))
 
-DC.setup(name = 'catacomb-python',
-         version = MS.auto_version(),
+MS.setup(name = 'catacomb-python',
          description = 'Interface to Catacomb cryptographic library',
-         url = 'http://www.distorted.org.uk/~mdw/Catacomb-2.1.0',
+         url = 'https://git.distorted.org.uk/~mdw/catacomb-python/',
          author = 'Straylight/Edgeware',
          author_email = 'mdw@distorted.org.uk',
          license = 'GNU General Public License',
          packages = ['catacomb'],
-         scripts = ['pwsafe'],
+         scripts = ['pock', 'pwsafe'],
+         data_files = [('share/man/man1', ['pock.1', 'pwsafe.1'])],
+         genfiles = [MS.Generate('algorithms.h')],
+         unittest_dir = "t",
+         unittests = ["t-misc", "t-algorithms", "t-bytes", "t-buffer",
+                      "t-convert", "t-ec", "t-field", "t-group", "t-key",
+                      "t-mp", "t-passphrase", "t-pgen", "t-pubkey",
+                      "t-rand", "t-rat", "t-share"],
          ext_modules = [cat])