cereal: remove unused shared library creation (#33363)
clear cereal/SConscript
old-commit-hash: 1a4ff8272b
pull/33386/head
parent
965aea8eab
commit
2bfbc779b3
1 changed files with 3 additions and 14 deletions
@ -1,31 +1,20 @@ |
|||||||
Import('env', 'envCython', 'arch', 'common', 'msgq') |
Import('env', 'common', 'msgq') |
||||||
|
|
||||||
import shutil |
|
||||||
|
|
||||||
cereal_dir = Dir('.') |
cereal_dir = Dir('.') |
||||||
gen_dir = Dir('gen') |
gen_dir = Dir('gen') |
||||||
other_dir = Dir('#msgq') |
|
||||||
|
|
||||||
# Build cereal |
# Build cereal |
||||||
schema_files = ['log.capnp', 'car.capnp', 'legacy.capnp', 'custom.capnp'] |
schema_files = ['log.capnp', 'car.capnp', 'legacy.capnp', 'custom.capnp'] |
||||||
env.Command(["gen/c/include/c++.capnp.h"], [], "mkdir -p " + gen_dir.path + "/c/include && touch $TARGETS") |
|
||||||
env.Command([f'gen/cpp/{s}.c++' for s in schema_files] + [f'gen/cpp/{s}.h' for s in schema_files], |
env.Command([f'gen/cpp/{s}.c++' for s in schema_files] + [f'gen/cpp/{s}.h' for s in schema_files], |
||||||
schema_files, |
schema_files, |
||||||
f"capnpc --src-prefix={cereal_dir.path} $SOURCES -o c++:{gen_dir.path}/cpp/") |
f"capnpc --src-prefix={cereal_dir.path} $SOURCES -o c++:{gen_dir.path}/cpp/") |
||||||
|
|
||||||
# TODO: remove non shared cereal and messaging |
cereal = env.Library('cereal', [f'gen/cpp/{s}.c++' for s in schema_files]) |
||||||
cereal_objects = env.SharedObject([f'gen/cpp/{s}.c++' for s in schema_files]) |
|
||||||
|
|
||||||
cereal = env.Library('cereal', cereal_objects) |
|
||||||
env.SharedLibrary('cereal_shared', cereal_objects) |
|
||||||
|
|
||||||
# Build messaging |
# Build messaging |
||||||
|
|
||||||
services_h = env.Command(['services.h'], ['services.py'], 'python3 ' + cereal_dir.path + '/services.py > $TARGET') |
services_h = env.Command(['services.h'], ['services.py'], 'python3 ' + cereal_dir.path + '/services.py > $TARGET') |
||||||
env.Program('messaging/bridge', ['messaging/bridge.cc'], LIBS=[msgq, common]) |
env.Program('messaging/bridge', ['messaging/bridge.cc'], LIBS=[msgq, common]) |
||||||
|
|
||||||
|
socketmaster = env.Library('socketmaster', ['messaging/socketmaster.cc']) |
||||||
socketmaster = env.SharedObject(['messaging/socketmaster.cc']) |
|
||||||
socketmaster = env.Library('socketmaster', socketmaster) |
|
||||||
|
|
||||||
Export('cereal', 'socketmaster') |
Export('cereal', 'socketmaster') |
||||||
|
Loading…
Reference in new issue