Commit 0c8484df authored by Amir MOHAMMADI's avatar Amir MOHAMMADI

Do not build a library to avoid C++ API incompatibilities

parent 9565d357
Pipeline #32753 failed with stage
in 17 minutes and 32 seconds
# import our own Library
import bob.extension
bob.extension.load_bob_library('bob.core', __file__)
from ._convert import convert
from . import log
......
......@@ -5,13 +5,17 @@
from setuptools import setup, find_packages, dist
dist.Distribution(dict(setup_requires=['bob.extension', 'bob.blitz']))
from bob.blitz.extension import Extension, Library, build_ext
from bob.blitz.extension import Extension, build_ext
from bob.extension.utils import load_requirements
build_requires = load_requirements()
# Define package version
version = open("version.txt").read().rstrip()
# Local include directory
import os
package_dir = os.path.dirname(os.path.realpath(__file__))
include_dir = os.path.join(package_dir, 'bob', 'core', 'include')
packages = ['blitz >= 0.10', 'boost']
......@@ -43,16 +47,8 @@ setup(
],
version = version,
packages = packages,
boost_modules = ['system']
),
Library("bob.core.bob_core",
[
"bob/core/cpp/logging.cpp",
],
version = version,
packages = packages,
boost_modules = ['system', 'iostreams', 'filesystem'],
boost_modules = ['system'],
include_dirs=[include_dir],
),
Extension("bob.core._convert",
......@@ -61,6 +57,7 @@ setup(
],
version = version,
packages = packages,
include_dirs=[include_dir],
),
Extension("bob.core._logging",
......@@ -70,6 +67,7 @@ setup(
version = version,
packages = packages,
boost_modules = ['system', 'iostreams', 'filesystem'],
include_dirs=[include_dir],
),
Extension("bob.core.random._library",
......@@ -82,10 +80,14 @@ setup(
"bob/core/random/binomial.cpp",
"bob/core/random/discrete.cpp",
"bob/core/random/main.cpp",
# old Library components
"bob/core/cpp/logging.cpp",
],
version = version,
packages = packages,
boost_modules = ['system', 'iostreams', 'filesystem'],
include_dirs=[include_dir],
),
Extension("bob.core._test", [
......@@ -94,6 +96,7 @@ setup(
version = version,
packages = packages,
boost_modules = ['system', 'iostreams', 'filesystem'],
include_dirs=[include_dir],
),
],
......@@ -103,7 +106,7 @@ setup(
classifiers = [
'Framework :: Bob',
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Natural Language :: English',
......
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