Reorganization: split out utilities; mapping methods

[catacomb-python] / setup.py

diff --git a/setup.py b/setup.py
index ad7577600498a7f4713b3c8ad2947c4bc52dd39f..6d287c07c338729f7bf126be38adc660d5ee3dcc 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -40,10 +40,8 @@ def uniquify(l):
       u[i] = 1
   return o
 
       u[i] = 1
   return o
 

-cflags = []
-libs = []
-libconfig('mLib', '2.0.3')

 libconfig('catacomb', '2.1.0')
 libconfig('catacomb', '2.1.0')

+libconfig('mLib', '2.0.3')

 
 class SubprocessFailure (Exception):
   def __init__(me, file, rc):
 
 class SubprocessFailure (Exception):
   def __init__(me, file, rc):


@@ -94,20 +92,21 @@ for g in ['algorithms.h']:
     rename(fnew, fout)
 
 cat = Extension('catacomb._base',
     rename(fnew, fout)
 
 cat = Extension('catacomb._base',

-                ['catacomb.c', 'bytestring.c',
+                ['catacomb.c', 'bytestring.c', 'buffer.c',

                  'rand.c', 'algorithms.c', 'pubkey.c', 'pgen.c',
                  'rand.c', 'algorithms.c', 'pubkey.c', 'pgen.c',

-                 'mp.c', 'field.c', 'ec.c', 'group.c', 'passphrase.c'],
+                 'mp.c', 'field.c', 'ec.c', 'group.c', 'passphrase.c',
+                 'share.c', 'key.c', 'util.c'],

                 ##extra_compile_args = ['-O0'],
                 include_dirs = uniquify(incdirs),
                 library_dirs = uniquify(libdirs),
                 libraries = uniquify(libs))
 
                 ##extra_compile_args = ['-O0'],
                 include_dirs = uniquify(incdirs),
                 library_dirs = uniquify(libdirs),
                 libraries = uniquify(libs))
 

-setup(name = 'Catacomb',
-      version = '2.1.0',
+setup(name = 'catacomb-python',
+      version = '1.0.0',

       description = 'Interface to Catacomb cryptographic library',
       description = 'Interface to Catacomb cryptographic library',

-      url = 'http://tux.nsict.org/~mdw/Catacomb-2.1.0',
+      url = 'http://www.distorted.org.uk/~mdw/Catacomb-2.1.0',

       author = 'Straylight/Edgeware',
       author = 'Straylight/Edgeware',

-      author_email = 'mdw@nsict.org',
+      author_email = 'mdw@distorted.org.uk',

       license = 'GNU General Public License',
       packages = ['catacomb'],
       scripts = ['pwsafe'],
       license = 'GNU General Public License',
       packages = ['catacomb'],
       scripts = ['pwsafe'],