Commit dbd6a518 authored by André Anjos's avatar André Anjos 💬

FrameExtractor is now cleanly building

parent 757dcda3
include LICENSE README.rst bootstrap.py buildout.cfg include LICENSE README.rst bootstrap.py buildout.cfg
recursive-include doc conf.py *.rst recursive-include doc conf.py *.rst
recursive-include xbob *.cpp recursive-include xbob *.cpp
recursive-include xbob/ap/data *.wav
...@@ -3,29 +3,35 @@ ...@@ -3,29 +3,35 @@
; Mon 16 Apr 08:29:18 2012 CEST ; Mon 16 Apr 08:29:18 2012 CEST
[buildout] [buildout]
parts = xbob.blitz xbob.ap scripts parts = xbob.blitz xbob.io xbob.ap scripts
eggs = xbob.ap eggs = xbob.ap
ipdb ipdb
extensions = mr.developer extensions = mr.developer
auto-checkout = * auto-checkout = *
;prefixes = /idiap/group/torch5apro/nightlies/last/install/linux-x86_64-release prefixes = /idiap/group/torch5spro/nightlies/last/install/linux-x86_64-release
prefixes = /Users/andre/work/bob/b/dbg ;prefixes = /Users/andre/work/bob/b/dbg
debug = true debug = true
verbose = true verbose = true
[sources] [sources]
xbob.buildout = git git@github.com:bioidiap/xbob.buildout xbob.buildout = git git@github.com:bioidiap/xbob.buildout
xbob.extension = git git@github.com:bioidiap/xbob.extension branch=xbob xbob.extension = git git@github.com:bioidiap/xbob.extension branch=xbob
xbob.blitz = git git@github.com:anjos/xbob.blitz egg=false xbob.blitz = git git@github.com:bioidiap/xbob.blitz egg=false
xbob.io = git git@github.com:bioidiap/xbob.io egg=false
[xbob.blitz] [xbob.blitz]
recipe = xbob.buildout:develop recipe = xbob.buildout:develop
setup = src/xbob.blitz setup = src/xbob.blitz
eggs = xbob.buildout xbob.extension eggs = xbob.buildout xbob.extension
[xbob.ap] [xbob.io]
recipe = xbob.buildout:develop recipe = xbob.buildout:develop
setup = src/xbob.io
eggs = xbob.blitz eggs = xbob.blitz
[xbob.ap]
recipe = xbob.buildout:develop
eggs = xbob.blitz xbob.io
[scripts] [scripts]
recipe = xbob.buildout:scripts recipe = xbob.buildout:scripts
...@@ -38,6 +38,7 @@ setup( ...@@ -38,6 +38,7 @@ setup(
ext_modules = [ ext_modules = [
Extension("xbob.ap._library", Extension("xbob.ap._library",
[ [
"xbob/ap/frame_extractor.cpp",
"xbob/ap/main.cpp", "xbob/ap/main.cpp",
], ],
packages = packages, packages = packages,
......
from ._library import __version__
from ._library import *
This diff is collapsed.
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#include <xbob.blitz/capi.h> #include <xbob.blitz/capi.h>
#include <xbob.blitz/cleanup.h> #include <xbob.blitz/cleanup.h>
extern PyTypeObject PyBobApFrameExtractor_Type;
static PyMethodDef module_methods[] = { static PyMethodDef module_methods[] = {
{0} /* Sentinel */ {0} /* Sentinel */
}; };
...@@ -23,13 +25,16 @@ static PyModuleDef module_definition = { ...@@ -23,13 +25,16 @@ static PyModuleDef module_definition = {
XBOB_EXT_MODULE_NAME, XBOB_EXT_MODULE_NAME,
module_docstr, module_docstr,
-1, -1,
module_methods, module_methods,
0, 0, 0, 0 0, 0, 0, 0
}; };
#endif #endif
static PyObject* create_module (void) { static PyObject* create_module (void) {
PyBobApFrameExtractor_Type.tp_new = PyType_GenericNew;
if (PyType_Ready(&PyBobApFrameExtractor_Type) < 0) return 0;
# if PY_VERSION_HEX >= 0x03000000 # if PY_VERSION_HEX >= 0x03000000
PyObject* m = PyModule_Create(&module_definition); PyObject* m = PyModule_Create(&module_definition);
# else # else
...@@ -42,7 +47,10 @@ static PyObject* create_module (void) { ...@@ -42,7 +47,10 @@ static PyObject* create_module (void) {
return 0; return 0;
/* register the types to python */ /* register the types to python */
Py_INCREF(&PyBobApFrameExtractor_Type);
if (PyModule_AddObject(m, "FrameExtractor", (PyObject *)&PyBobApFrameExtractor_Type) < 0) return 0;
/* imports xbob.blitz C-API + dependencies */ /* imports xbob.blitz C-API + dependencies */
if (import_xbob_blitz() < 0) return 0; if (import_xbob_blitz() < 0) return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment