Commit a600f9d0 authored by Manuel Günther's avatar Manuel Günther
Browse files

Switched to new bob.extension version.

parent 91ed5673
......@@ -14,16 +14,12 @@ matrix:
- NUMPYSPEC===1.8.0
before_install:
- sudo add-apt-repository -y ppa:biometrics/bob
- sudo add-apt-repository -y ppa:biometrics/bob.preview
- sudo apt-get update -qq
- sudo apt-get install -qq --force-yes bob-dev libavcodec-dev libavformat-dev libswscale-dev
- sudo apt-get install -qq --force-yes libboost-all-dev libblitz1-dev libavcodec-dev libavformat-dev libswscale-dev
- sudo apt-get install -qq python-imaging
- if [ -n "${NUMPYSPEC}" ]; then sudo apt-get install -qq libatlas-dev libatlas-base-dev
liblapack-dev gfortran; fi
- if [ -n "${NUMPYSPEC}" ]; then sudo apt-get install -qq libatlas-dev libatlas-base-dev liblapack-dev gfortran; fi
- if [ -n "${NUMPYSPEC}" ]; then pip install --upgrade pip setuptools; fi
- if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/
--find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC sphinx nose;
fi
- if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC sphinx nose; fi
- pip install cpp-coveralls
install:
- python bootstrap.py
......
......@@ -18,6 +18,7 @@
#include <boost/version.hpp>
#include <boost/format.hpp>
#include <bob.core/config.h>
#include <bob.io.base/config.h>
extern "C" {
......@@ -120,13 +121,6 @@ static PyObject* ffmpeg_version() {
return retval;
}
/**
* bob.core c/c++ api version
*/
static PyObject* bob_core_version() {
return Py_BuildValue("{ss}", "api", BOOST_PP_STRINGIZE(BOB_CORE_API_VERSION));
}
/**
* Describes the version of Boost libraries installed
*/
......@@ -183,6 +177,13 @@ static PyObject* bob_blitz_version() {
return Py_BuildValue("{ss}", "api", BOOST_PP_STRINGIZE(BOB_BLITZ_API_VERSION));
}
/**
* bob.core c/c++ api version
*/
static PyObject* bob_core_version() {
return Py_BuildValue("{ss}", "api", BOOST_PP_STRINGIZE(BOB_CORE_API_VERSION));
}
/**
* bob.io.base c/c++ api version
*/
......@@ -204,6 +205,7 @@ static PyObject* build_version_dictionary() {
if (!dict_steal(retval, "NumPy", numpy_version())) return 0;
if (!dict_set(retval, "Blitz++", BZ_VERSION)) return 0;
if (!dict_steal(retval, "bob.blitz", bob_blitz_version())) return 0;
if (!dict_steal(retval, "bob.core", bob_blitz_version())) return 0;
if (!dict_steal(retval, "bob.io.base", bob_io_base_version())) return 0;
Py_INCREF(retval);
......
......@@ -3,8 +3,10 @@
# Andre Anjos <andre.anjos@idiap.ch>
# Mon 16 Apr 08:18:08 2012 CEST
bob_packages = ['bob.core', 'bob.io.base']
from setuptools import setup, find_packages, dist
dist.Distribution(dict(setup_requires=['bob.blitz', 'bob.core', 'bob.io.base']))
dist.Distribution(dict(setup_requires=['bob.blitz'] + bob_packages))
from bob.blitz.extension import Extension, Library, build_ext
from bob.extension import pkgconfig
......@@ -65,37 +67,37 @@ setup(
install_requires=[
'setuptools',
'bob.blitz',
'bob.core',
'bob.io.base',
] + pil_or_pillow,
namespace_packages=[
"bob",
"bob.io",
],
],
ext_modules = [
Extension("bob.io.video.version",
[
"bob/io/video/version.cpp",
],
],
packages = packages,
boost_modules = ['system'],
bob_packages = ['bob.core', 'bob.io.base'],
bob_packages = bob_packages,
version = version,
define_macros = define_macros,
),
),
Library("bob_io_video",
Library("bob.io.video.bob_io_video",
[
"bob/io/video/cpp/utils.cpp",
"bob/io/video/cpp/reader.cpp",
"bob/io/video/cpp/writer.cpp",
],
package_directory = package_dir,
target_directory = target_dir,
define_macros = define_macros,
boost_modules = ['system'],
version = version,
bob_packages = ['bob.core', 'bob.io.base'],
bob_packages = bob_packages,
packages = packages,
),
......@@ -109,14 +111,14 @@ setup(
"bob/io/video/writer.cpp",
"bob/io/video/file.cpp",
"bob/io/video/main.cpp",
],
],
packages = packages,
bob_packages = ['bob.core', 'bob.io.base'],
libraries = ['bob_io_video'],
boost_modules = ['system'],
bob_packages = bob_packages,
version = version,
define_macros = define_macros,
),
],
),
],
cmdclass = {
'build_ext': build_ext
......@@ -125,8 +127,8 @@ setup(
entry_points={
'console_scripts': [
'bob_video_test.py = bob.io.video.script.video_test:main',
],
},
],
},
classifiers = [
'Development Status :: 3 - Alpha',
......@@ -137,6 +139,6 @@ setup(
'Programming Language :: Python :: 3',
'Topic :: Software Development :: Libraries :: Python Modules',
'Environment :: Plugins',
],
],
)
)
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