From 12aad06e12f249e57abda1664fb0c85e484a0c5d Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Thu, 7 May 2020 21:06:32 -0700 Subject: [PATCH] no more c capnp --- SConscript | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/SConscript b/SConscript index e0c1b2b52c16a4..ed63c1717b797f 100644 --- a/SConscript +++ b/SConscript @@ -5,10 +5,6 @@ messaging_dir = Dir('messaging') # TODO: remove src-prefix and cereal from command string. can we set working directory? env.Command(["gen/c/include/c++.capnp.h", "gen/c/include/java.capnp.h"], [], "mkdir -p " + gen_dir.path + "/c/include && touch $TARGETS") -env.Command( - ['gen/c/car.capnp.c', 'gen/c/log.capnp.c', 'gen/c/car.capnp.h', 'gen/c/log.capnp.h'], - ['car.capnp', 'log.capnp'], - 'capnpc $SOURCES --src-prefix=cereal -o c:' + gen_dir.path + '/c/') env.Command( ['gen/cpp/car.capnp.c++', 'gen/cpp/log.capnp.c++', 'gen/cpp/car.capnp.h', 'gen/cpp/log.capnp.h'], ['car.capnp', 'log.capnp'], @@ -22,14 +18,12 @@ if shutil.which('capnpc-java'): # TODO: remove non shared cereal and messaging cereal_objects = env.SharedObject([ - 'gen/c/car.capnp.c', - 'gen/c/log.capnp.c', 'gen/cpp/car.capnp.c++', 'gen/cpp/log.capnp.c++', ]) env.Library('cereal', cereal_objects) -env.SharedLibrary('cereal_shared', cereal_objects, LIBS=["capnp_c"]) +env.SharedLibrary('cereal_shared', cereal_objects) cereal_dir = Dir('.') services_h = env.Command(