Skip to content
This repository was archived by the owner on Apr 14, 2024. It is now read-only.

Commit 6edc28d

Browse files
committed
Added delta_apply.h file to make more native use of python's build system, which should hopefully fix the easy_install trouble
1 parent 5d91a53 commit 6edc28d

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

MANIFEST.in

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ include AUTHORS
55
include README
66

77
include _fun.c
8+
include _delta_apply.c
9+
include _delta_apply.h
810

911
graft test
1012

_delta_apply.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
#include <Python.h>
1+
#include "_delta_apply.h"
22
#include <stdint.h>
33
#include <assert.h>
44
#include <stdio.h>
55
#include <math.h>
66
#include <string.h>
77

8+
9+
810
typedef unsigned long long ull;
911
typedef unsigned int uint;
1012
typedef unsigned char uchar;

_delta_apply.h

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include <Python.h>
2+
3+
static PyObject* connect_deltas(PyObject *self, PyObject *dstreams);
4+
static PyObject* apply_delta(PyObject* self, PyObject* args);
5+
6+
static PyTypeObject DeltaChunkListType;

_fun.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <Python.h>
2-
#include "_delta_apply.c"
2+
#include "_delta_apply.h"
33

44
static PyObject *PackIndexFile_sha_to_index(PyObject *self, PyObject *args)
55
{

setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ def run(self):
2323
except Exception:
2424
print "Ignored failure when building extensions, pure python modules will be used instead"
2525
# END ignore errors
26+
2627

2728
def get_data_files(self):
2829
"""Can you feel the pain ? So, in python2.5 and python2.4 coming with maya,
@@ -77,7 +78,7 @@ def get_data_files(self):
7778
package_data={'gitdb' : ['AUTHORS', 'README'],
7879
'gitdb.test' : ['fixtures/packs/*', 'fixtures/objects/7b/*']},
7980
package_dir = {'gitdb':''},
80-
ext_modules=[Extension('gitdb._perf', ['_fun.c', '_delta_apply.c'])],
81+
ext_modules=[Extension('gitdb._perf', ['_fun.c', '_delta_apply.c'], include_dirs=['.'])],
8182
license = "BSD License",
8283
requires=('async (>=0.6.1)',),
8384
install_requires='async >= 0.6.1',

0 commit comments

Comments
 (0)