Skip to content
Snippets Groups Projects
Commit 0c8484df authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

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

parent 9565d357
Branches cpp-abi
No related tags found
No related merge requests found
Pipeline #32753 failed
# import our own Library
import bob.extension import bob.extension
bob.extension.load_bob_library('bob.core', __file__)
from ._convert import convert from ._convert import convert
from . import log from . import log
......
...@@ -5,13 +5,17 @@ ...@@ -5,13 +5,17 @@
from setuptools import setup, find_packages, dist from setuptools import setup, find_packages, dist
dist.Distribution(dict(setup_requires=['bob.extension', 'bob.blitz'])) 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 from bob.extension.utils import load_requirements
build_requires = load_requirements() build_requires = load_requirements()
# Define package version # Define package version
version = open("version.txt").read().rstrip() 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'] packages = ['blitz >= 0.10', 'boost']
...@@ -43,16 +47,8 @@ setup( ...@@ -43,16 +47,8 @@ setup(
], ],
version = version, version = version,
packages = packages, packages = packages,
boost_modules = ['system'] boost_modules = ['system'],
), include_dirs=[include_dir],
Library("bob.core.bob_core",
[
"bob/core/cpp/logging.cpp",
],
version = version,
packages = packages,
boost_modules = ['system', 'iostreams', 'filesystem'],
), ),
Extension("bob.core._convert", Extension("bob.core._convert",
...@@ -61,6 +57,7 @@ setup( ...@@ -61,6 +57,7 @@ setup(
], ],
version = version, version = version,
packages = packages, packages = packages,
include_dirs=[include_dir],
), ),
Extension("bob.core._logging", Extension("bob.core._logging",
...@@ -70,6 +67,7 @@ setup( ...@@ -70,6 +67,7 @@ setup(
version = version, version = version,
packages = packages, packages = packages,
boost_modules = ['system', 'iostreams', 'filesystem'], boost_modules = ['system', 'iostreams', 'filesystem'],
include_dirs=[include_dir],
), ),
Extension("bob.core.random._library", Extension("bob.core.random._library",
...@@ -82,10 +80,14 @@ setup( ...@@ -82,10 +80,14 @@ setup(
"bob/core/random/binomial.cpp", "bob/core/random/binomial.cpp",
"bob/core/random/discrete.cpp", "bob/core/random/discrete.cpp",
"bob/core/random/main.cpp", "bob/core/random/main.cpp",
# old Library components
"bob/core/cpp/logging.cpp",
], ],
version = version, version = version,
packages = packages, packages = packages,
boost_modules = ['system', 'iostreams', 'filesystem'], boost_modules = ['system', 'iostreams', 'filesystem'],
include_dirs=[include_dir],
), ),
Extension("bob.core._test", [ Extension("bob.core._test", [
...@@ -94,6 +96,7 @@ setup( ...@@ -94,6 +96,7 @@ setup(
version = version, version = version,
packages = packages, packages = packages,
boost_modules = ['system', 'iostreams', 'filesystem'], boost_modules = ['system', 'iostreams', 'filesystem'],
include_dirs=[include_dir],
), ),
], ],
...@@ -103,7 +106,7 @@ setup( ...@@ -103,7 +106,7 @@ setup(
classifiers = [ classifiers = [
'Framework :: Bob', 'Framework :: Bob',
'Development Status :: 4 - Beta', 'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License', 'License :: OSI Approved :: BSD License',
'Natural Language :: English', 'Natural Language :: English',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment