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

Switched to new bob.extension version

parent 21ef00f2
......@@ -14,16 +14,11 @@ 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 libjpeg8-dev libnetpbm10-dev libpng12-dev
libtiff4-dev libgif-dev
- if [ -n "${NUMPYSPEC}" ]; then sudo apt-get install -qq libatlas-dev libatlas-base-dev
liblapack-dev gfortran; fi
- sudo apt-get install -qq --force-yes libboost-all-dev libjpeg8-dev libnetpbm10-dev libpng12-dev libtiff4-dev libgif-dev
- 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" {
......@@ -106,13 +107,6 @@ static PyObject* giflib_version() {
#endif
}
/**
* 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
*/
......@@ -169,6 +163,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
*/
......@@ -194,6 +195,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_core_version())) return 0;
if (!dict_steal(retval, "bob.io.base", bob_io_base_version())) return 0;
Py_INCREF(retval);
......
......@@ -3,9 +3,11 @@
# Andre Anjos <andre.anjos@idiap.ch>
# Mon 16 Apr 08:18:08 2012 CEST
bob_packages = ['bob.core', 'bob.io.base']
import os
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.extension.utils import egrep, find_header, find_library
from bob.blitz.extension import Extension
......@@ -377,11 +379,11 @@ tiff_pkg = tiff()
gif_pkg = gif()
netpbm_pkg = netpbm()
extra_compile_args = [
'-isystem', jpeg_pkg.include_directory,
'-isystem', tiff_pkg.include_directory,
'-isystem', gif_pkg.include_directory,
'-isystem', netpbm_pkg.include_directory,
system_include_dirs = [
jpeg_pkg.include_directory,
tiff_pkg.include_directory,
gif_pkg.include_directory,
netpbm_pkg.include_directory,
]
library_dirs = [
......@@ -437,9 +439,9 @@ setup(
],
packages = packages,
boost_modules = ['system'],
bob_packages = ['bob.core', 'bob.io.base'],
bob_packages = bob_packages,
version = version,
extra_compile_args = extra_compile_args,
system_include_dirs = system_include_dirs,
library_dirs = library_dirs,
libraries = libraries,
define_macros = define_macros,
......@@ -456,9 +458,9 @@ setup(
],
packages = packages,
boost_modules = ['filesystem'],
bob_packages = ['bob.core', 'bob.io.base'],
bob_packages = bob_packages,
version = version,
extra_compile_args = extra_compile_args,
system_include_dirs = system_include_dirs,
library_dirs = library_dirs,
libraries = libraries,
define_macros = define_macros,
......
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