From eef624067f5ef49fd7aa656ef0f3f531ffbc94b4 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 21 Sep 2021 14:48:35 -0700 Subject: [PATCH] get rid of the java (#199) --- SConscript | 7 +------ car.capnp | 4 ---- legacy.capnp | 4 ---- log.capnp | 4 ---- maptile.capnp | 4 ---- 5 files changed, 1 insertion(+), 22 deletions(-) diff --git a/SConscript b/SConscript index 10f3ab7..df066dc 100644 --- a/SConscript +++ b/SConscript @@ -9,16 +9,11 @@ messaging_dir = Dir('messaging') # Build cereal schema_files = ['log.capnp', 'car.capnp', 'legacy.capnp'] -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/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], schema_files, f"capnpc --src-prefix={cereal_dir.path} $SOURCES -o c++:{gen_dir.path}/cpp/") -if shutil.which('capnpc-java'): - env.Command(['gen/java/Car.java', 'gen/java/Log.java'], - schema_files, - f"capnpc $SOURCES --src-prefix={cereal_dir.path} -o java:{gen_dir.path}/java/") - # TODO: remove non shared cereal and messaging cereal_objects = env.SharedObject([f'gen/cpp/{s}.c++' for s in schema_files]) diff --git a/car.capnp b/car.capnp index 37d98ab..7eac031 100644 --- a/car.capnp +++ b/car.capnp @@ -1,10 +1,6 @@ using Cxx = import "./include/c++.capnp"; $Cxx.namespace("cereal"); -using Java = import "./include/java.capnp"; -$Java.package("ai.comma.openpilot.cereal"); -$Java.outerClassname("Car"); - @0x8e2af1e708af8b8d; # ******* events causing controls state machine transition ******* diff --git a/legacy.capnp b/legacy.capnp index 0534dab..9a48916 100644 --- a/legacy.capnp +++ b/legacy.capnp @@ -1,10 +1,6 @@ using Cxx = import "./include/c++.capnp"; $Cxx.namespace("cereal"); -using Java = import "./include/java.capnp"; -$Java.package("ai.comma.openpilot.cereal"); -$Java.outerClassname("Legacy"); - @0x80ef1ec4889c2a63; # legacy.capnp: a home for deprecated structs diff --git a/log.capnp b/log.capnp index 41f7251..b830100 100644 --- a/log.capnp +++ b/log.capnp @@ -1,10 +1,6 @@ using Cxx = import "./include/c++.capnp"; $Cxx.namespace("cereal"); -using Java = import "./include/java.capnp"; -$Java.package("ai.comma.openpilot.cereal"); -$Java.outerClassname("Log"); - using Car = import "car.capnp"; using Legacy = import "legacy.capnp"; diff --git a/maptile.capnp b/maptile.capnp index 3369013..c8a23a1 100644 --- a/maptile.capnp +++ b/maptile.capnp @@ -1,10 +1,6 @@ using Cxx = import "./include/c++.capnp"; $Cxx.namespace("cereal"); -using Java = import "./include/java.capnp"; -$Java.package("ai.comma.openpilot.cereal"); -$Java.outerClassname("Map"); - @0xa086df597ef5d7a0; # Geometry