fixup! Fix the packaging?

Author: mundya

.gitignore

@@ -1,4 +1,5 @@
 *.pyc
+.eggs/
 .coverage
 .cache/*
 build/*

include/routing_table.h

@@ -58,37 +58,5 @@ typedef struct _table_t
   entry_t *entries;   // Entries in the table
 } table_t;
 
-
-// Table management methods (mostly here for the CFFI wrapper)
-static table_t *new_table(unsigned int size)
-{
-  // Malloc space for the table and associated entries
-  table_t *table = MALLOC(sizeof(table_t));
-  table->size = 0;
-  table->entries = NULL;
-
-  if (table != NULL)
-  {
-    table->entries = MALLOC(sizeof(entry_t) * size);
-
-    if (table->entries != NULL)
-    {
-      table->size = size;
-      return table;
-    }
-  }
-
-  return NULL;
-}
-
-static void free_table(table_t *table)
-{
-  // Free the entries and then the table
-  FREE(table->entries);
-  table->entries = NULL;
-  table->size = 0;
-  FREE(table);
-}
-
 #define __ROUTING_TABLE_H__
 #endif  // __ROUTING_TABLE_H__

rig_routing_tables/__init__.py

@@ -1,5 +1,4 @@
 """Faster C implementation of common routing table minimisers."""
 from rig_routing_tables.version import __version__
 
-from rig_routing_tables._rig_routing_tables import ffi, lib
 from rig_routing_tables import utils

rig_routing_tables/cffi_compile.py

@@ -12,8 +12,10 @@
         #include "mtrie.h"
         #include "routing_table.h"
         #include "ordered_covering.h"
+        #include "cffi_utils.h"
     """,
-    include_dirs=[include_dir]
+    include_dirs=[include_dir, os.path.dirname(__file__)],
+    sources=[os.path.join(os.path.dirname(__file__), "cffi_utils.c")],
 )
 
 ffi.cdef("""

rig_routing_tables/cffi_utils.c

@@ -0,0 +1,33 @@
+#include <stdlib.h>
+#include <stddef.h>
+#include "cffi_utils.h"
+
+table_t *new_table(unsigned int size)
+{
+  // Malloc space for the table and associated entries
+  table_t *table = malloc(sizeof(table_t));
+  table->size = 0;
+  table->entries = NULL;
+
+  if (table != NULL)
+  {
+    table->entries = malloc(sizeof(entry_t) * size);
+
+    if (table->entries != NULL)
+    {
+      table->size = size;
+      return table;
+    }
+  }
+
+  return NULL;
+}
+
+void free_table(table_t *table)
+{
+  // Free the entries and then the table
+  free(table->entries);
+  table->entries = NULL;
+  table->size = 0;
+  free(table);
+}

rig_routing_tables/cffi_utils.h

@@ -0,0 +1,5 @@
+#include "routing_table.h"
+
+// Table management methods (mostly here for the CFFI wrapper)
+table_t *new_table(unsigned int size);
+void free_table(table_t *table);

rig_routing_tables/mtrie.py

@@ -1,6 +1,6 @@
 from rig.routing_table import MinimisationFailedError
 from rig_routing_tables.utils import rig_to_c_table, c_to_rig_table
-from rig_routing_tables._rig_routing_tables import lib
+from _rig_routing_tables import lib
 
 
 def minimise(table, target_length):

rig_routing_tables/ordered_covering.py

@@ -1,6 +1,6 @@
 from rig.routing_table import MinimisationFailedError
 from rig_routing_tables.utils import rig_to_c_table, c_to_rig_table
-from rig_routing_tables._rig_routing_tables import lib
+from _rig_routing_tables import lib
 
 
 def minimise(table, target_length, no_raise=False):

rig_routing_tables/utils.py

@@ -1,6 +1,6 @@
 """Utilities for converting routing tables between different formats."""
 from rig.routing_table import RoutingTableEntry, Routes
-from rig_routing_tables import ffi, lib
+from _rig_routing_tables import ffi, lib
 
 
 def rig_to_c_table(table):

setup.py

@@ -9,7 +9,11 @@
     packages=find_packages(),
 
     # Files required by CFFI wrapper
-    package_data={'rig_routing_tables': ['../include/*.h']},
+    package_data={
+        'rig_routing_tables': ['../include/*.h',
+                               'rig_routing_tables/cffi_utils.c',
+                               'rig_routing_tables/cffi_utils.h']
+    },
 
     # Metadata for PyPi
     url="https://github.com/project-rig/rig_routing_tables",