More work cleaning up the BUILD files
Change-Id: I47fb18e7a12cd7e081631a5369274ef1e25f22c4
diff --git a/aos/BUILD b/aos/BUILD
new file mode 100644
index 0000000..97a033f
--- /dev/null
+++ b/aos/BUILD
@@ -0,0 +1,6 @@
+filegroup(
+ name = 'prime_binaries',
+ visibility = ['//visibility:public'],
+ srcs = [
+ ],
+)
diff --git a/aos/common/BUILD b/aos/common/BUILD
index ccb9191..06ba2c6 100644
--- a/aos/common/BUILD
+++ b/aos/common/BUILD
@@ -18,6 +18,7 @@
'queue_testutils.h',
],
deps = [
+ '//aos/testing:googletest',
'//aos/common/logging',
':once',
'//aos/linux_code/ipc_lib:shared_mem',
@@ -56,16 +57,24 @@
)
cc_library(
+ name = 'generated_queue_headers',
+ visibility = ['//aos/common/logging:__pkg__'],
+ hdrs = [
+ ':gen_queue_primitives',
+ ],
+)
+
+cc_library(
name = 'queue_types',
srcs = [
'queue_types.cc',
- ':gen_queue_primitives',
':gen_print_field',
],
hdrs = [
'queue_types.h',
],
deps = [
+ ':generated_queue_headers',
'//aos/common/logging:logging_interface',
'//aos/linux_code/ipc_lib:shared_mem',
'//aos/linux_code/ipc_lib:core_lib',
@@ -81,7 +90,7 @@
],
deps = [
':queue_types',
- '//third_party/gtest',
+ '//aos/testing:googletest',
':test_queue',
'//aos/common/logging',
':queue_testutils',
@@ -115,7 +124,7 @@
'queue_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':queue_testutils',
':test_queue',
'//aos/common/util:thread',
@@ -129,7 +138,7 @@
'type_traits_test.cpp',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
],
)
@@ -150,7 +159,7 @@
'once_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':once',
],
)
@@ -161,7 +170,7 @@
'time_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':time',
'//aos/common/logging',
'//aos/common/util:death_test_log_implementation',
@@ -187,7 +196,7 @@
'queue_testutils_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':queue_testutils',
'//aos/common/logging',
],
@@ -199,7 +208,7 @@
'mutex_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/linux_code/ipc_lib:mutex',
':die',
'//aos/common/logging',
@@ -216,8 +225,8 @@
'event_test.cc',
],
deps = [
- '//third_party/gtest',
- ':event',
+ '//aos/testing:googletest',
+ '//aos/linux_code/ipc_lib:event',
':queue_testutils',
':time',
],
@@ -229,8 +238,8 @@
'condition_test.cc',
],
deps = [
- '//third_party/gtest',
- ':condition',
+ '//aos/testing:googletest',
+ '//aos/linux_code/ipc_lib:condition',
'//aos/common/util:thread',
':time',
'//aos/linux_code/ipc_lib:mutex',
@@ -248,7 +257,7 @@
'die_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':die',
],
)
@@ -268,7 +277,7 @@
],
deps = [
':stl_mutex',
- '//third_party/gtest',
+ '//aos/testing:googletest',
':queue_testutils',
'//aos/common/util:thread',
':die',
diff --git a/aos/common/actions/BUILD b/aos/common/actions/BUILD
index 22db816..6669ef1 100644
--- a/aos/common/actions/BUILD
+++ b/aos/common/actions/BUILD
@@ -45,7 +45,7 @@
'action_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':action_lib',
':test_action_queue',
'//aos/common:queue_testutils',
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index ff8cbe2..c9e1b6a 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -44,7 +44,7 @@
'type': 'static_library',
'variables': {
'print_field_cc': '<(SHARED_INTERMEDIATE_DIR)/print_field.cc',
- 'queue_primitives_h': '<(SHARED_INTERMEDIATE_DIR)/aos_queue_primitives/aos/queue_primitives.h',
+ 'queue_primitives_h': '<(SHARED_INTERMEDIATE_DIR)/aos_queue_primitives/aos/common/queue_primitives.h',
},
'sources': [
'queue_types.cc',
diff --git a/aos/common/controls/BUILD b/aos/common/controls/BUILD
index c021714..6c0805c 100644
--- a/aos/common/controls/BUILD
+++ b/aos/common/controls/BUILD
@@ -24,7 +24,7 @@
deps = [
'//aos/common:time',
'//aos/common/messages:robot_state',
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common:queue_testutils',
],
)
@@ -33,7 +33,7 @@
name = 'polytope',
deps = [
'//third_party/eigen',
- '//third_party/libcdd',
+ '//third_party/cddlib',
],
)
diff --git a/aos/common/controls/polytope.h b/aos/common/controls/polytope.h
index e37346e..1ca1ec6 100644
--- a/aos/common/controls/polytope.h
+++ b/aos/common/controls/polytope.h
@@ -2,8 +2,13 @@
#define AOS_COMMON_CONTROLS_POLYTOPE_H_
#include "Eigen/Dense"
+#ifdef AOS_BAZEL
+#include "third_party/cddlib/lib-src/setoper.h"
+#include "third_party/cddlib/lib-src/cdd.h"
+#else
#include "libcdd-094g-prefix/include/setoper.h"
#include "libcdd-094g-prefix/include/cdd.h"
+#endif
namespace aos {
namespace controls {
diff --git a/aos/common/libc/BUILD b/aos/common/libc/BUILD
index ad88f9d..5db9257 100644
--- a/aos/common/libc/BUILD
+++ b/aos/common/libc/BUILD
@@ -20,7 +20,7 @@
],
deps = [
':aos_strsignal',
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common/logging',
],
)
@@ -42,7 +42,7 @@
],
deps = [
':dirname',
- '//third_party/gtest',
+ '//aos/testing:googletest',
],
)
@@ -63,6 +63,6 @@
],
deps = [
':aos_strerror',
- '//third_party/gtest',
+ '//aos/testing:googletest',
],
)
diff --git a/aos/common/logging/BUILD b/aos/common/logging/BUILD
index 82aaf16..8bd59b9 100644
--- a/aos/common/logging/BUILD
+++ b/aos/common/logging/BUILD
@@ -6,7 +6,7 @@
'logging_impl_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common/logging',
],
)
@@ -35,6 +35,7 @@
'matrix_logging.h',
],
deps = [
+ '//aos/common:generated_queue_headers',
'//aos/common/logging',
'//aos/common:die',
'//aos/common:queue_types',
@@ -58,7 +59,6 @@
name = 'logging',
srcs = [
'logging_impl.cc',
- 'linux_logging.cc',
],
deps = [
'//aos/linux_code/logging:linux_logging',
diff --git a/aos/common/logging/matrix_logging-tmpl.h b/aos/common/logging/matrix_logging-tmpl.h
index bfc3ce5..9e458fb 100644
--- a/aos/common/logging/matrix_logging-tmpl.h
+++ b/aos/common/logging/matrix_logging-tmpl.h
@@ -2,7 +2,7 @@
#include <functional>
-#include "aos/queue_primitives.h"
+#include "aos/common/queue_primitives.h"
namespace aos {
namespace logging {
diff --git a/aos/common/queue_types_test.cc b/aos/common/queue_types_test.cc
index 868820f..b8b5e47 100644
--- a/aos/common/queue_types_test.cc
+++ b/aos/common/queue_types_test.cc
@@ -8,7 +8,7 @@
#include "aos/common/test_queue.q.h"
#include "aos/common/byteorder.h"
-#include "aos/queue_primitives.h"
+#include "aos/common/queue_primitives.h"
#include "aos/common/logging/logging.h"
#include "aos/common/queue_testutils.h"
diff --git a/aos/common/util/BUILD b/aos/common/util/BUILD
index 2409e00..dedec24 100644
--- a/aos/common/util/BUILD
+++ b/aos/common/util/BUILD
@@ -20,7 +20,7 @@
],
deps = [
':run_command',
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common/logging',
':thread',
],
@@ -76,7 +76,7 @@
],
deps = [
':string_to_num',
- '//third_party/gtest',
+ '//aos/testing:googletest',
],
)
@@ -112,7 +112,7 @@
],
deps = [
':trapezoid_profile',
- '//third_party/gtest',
+ '//aos/testing:googletest',
],
)
@@ -133,7 +133,7 @@
],
deps = [
':wrapping_counter',
- '//third_party/gtest',
+ '//aos/testing:googletest',
],
)
@@ -143,6 +143,6 @@
'options_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
],
)
diff --git a/aos/linux_code/BUILD b/aos/linux_code/BUILD
index 63c970c..ce7b1b0 100644
--- a/aos/linux_code/BUILD
+++ b/aos/linux_code/BUILD
@@ -32,7 +32,7 @@
],
deps = [
':complex_thread_local',
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common/util:thread',
'//aos/common/logging',
],
diff --git a/aos/linux_code/ipc_lib/BUILD b/aos/linux_code/ipc_lib/BUILD
index 75e3d95..83235ee 100644
--- a/aos/linux_code/ipc_lib/BUILD
+++ b/aos/linux_code/ipc_lib/BUILD
@@ -64,7 +64,7 @@
'raw_queue_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':queue',
'//aos/common/logging',
':core_lib',
@@ -85,7 +85,7 @@
'manual',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common:time',
'//aos/common:queue_testutils',
'//aos/linux_code/ipc_lib:mutex',
diff --git a/aos/linux_code/starter/starter.cc b/aos/linux_code/starter/starter.cc
index 616bbdb..01a462a 100644
--- a/aos/linux_code/starter/starter.cc
+++ b/aos/linux_code/starter/starter.cc
@@ -27,7 +27,11 @@
#include <memory>
#include <set>
+#ifdef AOS_BAZEL
+#include "third_party/libevent/event.h"
+#else
#include <event2/event.h>
+#endif
#include "aos/common/logging/logging.h"
#include "aos/common/logging/logging_impl.h"
diff --git a/aos/testing/BUILD b/aos/testing/BUILD
new file mode 100644
index 0000000..2365bd8
--- /dev/null
+++ b/aos/testing/BUILD
@@ -0,0 +1,10 @@
+cc_library(
+ name = 'googletest',
+ visibility = ['//visibility:public'],
+ srcs = [
+ 'gtest_main.cc',
+ ],
+ deps = [
+ '//third_party/googletest',
+ ],
+)
diff --git a/frc971/control_loops/BUILD b/frc971/control_loops/BUILD
index b6e1caf..75fda32 100644
--- a/frc971/control_loops/BUILD
+++ b/frc971/control_loops/BUILD
@@ -12,7 +12,7 @@
],
deps = [
'//aos/common/network:team_number',
- '//third_party/gtest',
+ '//aos/testing:googletest',
],
)
@@ -23,7 +23,7 @@
],
deps = [
':state_feedback_loop',
- '//third_party/gtest',
+ '//aos/testing:googletest',
],
)
@@ -49,7 +49,7 @@
deps = [
':queues',
':position_sensor_sim',
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common/logging',
],
)
diff --git a/frc971/control_loops/voltage_cap/BUILD b/frc971/control_loops/voltage_cap/BUILD
index 1b9cc63..ed2181c 100644
--- a/frc971/control_loops/voltage_cap/BUILD
+++ b/frc971/control_loops/voltage_cap/BUILD
@@ -17,7 +17,7 @@
],
deps = [
':voltage_cap',
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common:queue_testutils',
],
)
diff --git a/frc971/wpilib/BUILD b/frc971/wpilib/BUILD
index a7e8697..c611d32 100644
--- a/frc971/wpilib/BUILD
+++ b/frc971/wpilib/BUILD
@@ -18,7 +18,7 @@
'encoder_and_potentiometer.h',
],
deps = [
- '//third_party/WPILib',
+ '//aos/externals:wpilib',
':dma_edge_counting',
'//aos/linux_code:init',
'//aos/common/logging',
@@ -35,7 +35,7 @@
'dma_edge_counting.h',
],
deps = [
- '//third_party/WPILib',
+ '//aos/externals:wpilib',
'//aos/common/logging',
':hall_effect',
],
@@ -50,7 +50,7 @@
'interrupt_edge_counting.h',
],
deps = [
- '//third_party/WPILib',
+ '//aos/externals:wpilib',
'//aos/common/logging',
'//aos/common:stl_mutex',
'//aos/common:time',
@@ -69,7 +69,7 @@
'buffered_pcm.h',
],
deps = [
- '//third_party/WPILib',
+ '//aos/externals:wpilib',
'//aos/common/logging',
],
)
@@ -83,7 +83,7 @@
'gyro_interface.h',
],
deps = [
- '//third_party/WPILib',
+ '//aos/externals:wpilib',
'//aos/common/logging',
],
)
@@ -134,7 +134,7 @@
'joystick_sender.h',
],
deps = [
- '//third_party/WPILib',
+ '//aos/externals:wpilib',
'//aos/common/messages:robot_state',
'//aos/linux_code:init',
'//aos/common/network:team_number',
@@ -145,6 +145,6 @@
cc_library(
name = 'hall_effect',
deps = [
- '//third_party/WPILib',
+ '//aos/externals:wpilib',
],
)
diff --git a/frc971/zeroing/BUILD b/frc971/zeroing/BUILD
index 7209886..2d03102 100644
--- a/frc971/zeroing/BUILD
+++ b/frc971/zeroing/BUILD
@@ -1,5 +1,14 @@
package(default_visibility = ['//visibility:public'])
+load('/aos/build/queues', 'queue_library')
+
+queue_library(
+ name = 'zeroing_queue',
+ srcs = [
+ 'zeroing_queue.q',
+ ],
+)
+
cc_library(
name = 'zeroing',
srcs = [
@@ -19,7 +28,7 @@
'zeroing_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common:queue_testutils',
':zeroing',
'//aos/common/util:thread',
diff --git a/vision/BUILD b/vision/BUILD
index d1f151a..1ea52ca 100644
--- a/vision/BUILD
+++ b/vision/BUILD
@@ -6,8 +6,6 @@
'OpenCVWorkTask.cpp',
'CameraProcessor.cpp',
'JPEGRoutines.cpp',
- ],
- hdrs = [
'OpenCVWorkTask.h',
'CameraProcessor.h',
'JPEGRoutines.h',
@@ -28,8 +26,6 @@
srcs = [
'GoalMaster.cpp',
'SensorProcessor.cpp',
- ],
- hdrs = [
'SensorProcessor.h',
],
deps = [
diff --git a/y2014/control_loops/claw/BUILD b/y2014/control_loops/claw/BUILD
index dced51a..0b23a71 100644
--- a/y2014/control_loops/claw/BUILD
+++ b/y2014/control_loops/claw/BUILD
@@ -53,7 +53,7 @@
'claw_lib_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':claw_queue',
':claw_lib',
'//frc971/control_loops:state_feedback_loop',
diff --git a/y2014/control_loops/drivetrain/BUILD b/y2014/control_loops/drivetrain/BUILD
index 14003b1..274c4f5 100644
--- a/y2014/control_loops/drivetrain/BUILD
+++ b/y2014/control_loops/drivetrain/BUILD
@@ -69,7 +69,7 @@
'drivetrain_lib_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':drivetrain_queue',
':drivetrain_lib',
'//aos/common/controls:control_loop_test',
diff --git a/y2014/control_loops/shooter/BUILD b/y2014/control_loops/shooter/BUILD
index aba74b9..2007973 100644
--- a/y2014/control_loops/shooter/BUILD
+++ b/y2014/control_loops/shooter/BUILD
@@ -52,7 +52,7 @@
'shooter_lib_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':shooter_queue',
':shooter_lib',
'//aos/common/controls:control_loop_test',
diff --git a/y2014/wpilib/BUILD b/y2014/wpilib/BUILD
index a80ab2d..26f1645 100644
--- a/y2014/wpilib/BUILD
+++ b/y2014/wpilib/BUILD
@@ -9,7 +9,7 @@
'//aos/linux_code:init',
'//aos/common:stl_mutex',
'//aos/common/logging',
- '//third_party/WPILib',
+ '//aos/externals:wpilib',
'//y2014:constants',
'//y2014/queues:auto_mode',
'//y2014/control_loops/drivetrain:drivetrain_queue',
diff --git a/y2015/BUILD b/y2015/BUILD
index 22a0300..6737bd9 100644
--- a/y2015/BUILD
+++ b/y2015/BUILD
@@ -14,6 +14,7 @@
'//aos/common/network:team_number',
'//frc971/control_loops:state_feedback_loop',
'//y2015/control_loops/drivetrain:polydrivetrain_plants',
+ '//y2015/autonomous:auto_queue',
],
)
@@ -34,7 +35,6 @@
'//y2015/control_loops/drivetrain:drivetrain_queue',
'//y2015/control_loops/fridge:fridge_queue',
'//y2015:constants',
- '//y2015/autonomous:auto_queue',
'//frc971/autonomous:auto_queue',
'//y2015/actors:stack_action_lib',
'//y2015/actors:stack_and_lift_action_lib',
diff --git a/y2015/actors/BUILD b/y2015/actors/BUILD
index 8500bf0..3aee02f 100644
--- a/y2015/actors/BUILD
+++ b/y2015/actors/BUILD
@@ -128,7 +128,7 @@
'score_actor_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common:queue_testutils',
'//aos/common/logging:queue_logging',
'//aos/common:queues',
@@ -405,15 +405,8 @@
],
)
-filegroup(
- name = 'stack_action_queue',
- srcs = [
- ':stack_action_queue_real',
- ],
-)
-
queue_library(
- name = 'stack_action_queue_real',
+ name = 'stack_action_queue',
srcs = [
'stack_action.q',
],
@@ -436,7 +429,7 @@
'stack_actor_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common:queue_testutils',
'//aos/common/logging:queue_logging',
'//aos/common:queues',
@@ -482,15 +475,8 @@
],
)
-filegroup(
- name = 'lift_action_queue',
- srcs = [
- ':lift_action_queue_real',
- ],
-)
-
queue_library(
- name = 'lift_action_queue_real',
+ name = 'lift_action_queue',
srcs = [
'lift_action.q',
],
diff --git a/y2015/control_loops/claw/BUILD b/y2015/control_loops/claw/BUILD
index 134ef55..e671004 100644
--- a/y2015/control_loops/claw/BUILD
+++ b/y2015/control_loops/claw/BUILD
@@ -52,7 +52,7 @@
'claw_lib_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':claw_lib',
'//frc971/control_loops:state_feedback_loop',
'//aos/common/controls:control_loop_test',
diff --git a/y2015/control_loops/drivetrain/BUILD b/y2015/control_loops/drivetrain/BUILD
index c08e4b0..bdf7ba0 100644
--- a/y2015/control_loops/drivetrain/BUILD
+++ b/y2015/control_loops/drivetrain/BUILD
@@ -69,7 +69,7 @@
'drivetrain_lib_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':drivetrain_queue',
':drivetrain_lib',
'//aos/common/controls:control_loop_test',
diff --git a/y2015/control_loops/fridge/BUILD b/y2015/control_loops/fridge/BUILD
index 1304a82..458d67b 100644
--- a/y2015/control_loops/fridge/BUILD
+++ b/y2015/control_loops/fridge/BUILD
@@ -22,7 +22,7 @@
deps = [
'//aos/common/controls:control_loop_queues',
'//frc971/control_loops:queues',
- '//frc971/zeroing:zeroing',
+ '//frc971/zeroing:zeroing_queue',
],
)
@@ -45,6 +45,7 @@
'//y2015:constants',
'//frc971/control_loops:state_feedback_loop',
'//frc971/control_loops/voltage_cap:voltage_cap',
+ '//frc971/zeroing',
],
)
@@ -53,18 +54,17 @@
srcs = [
'fridge_lib_test.cc',
'arm_motor_plant.cc',
- ],
- hdrs = [
'arm_motor_plant.h',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
':fridge_lib',
'//frc971/control_loops:state_feedback_loop',
'//aos/common/controls:control_loop_test',
'//aos/common:time',
'//frc971/control_loops:position_sensor_sim',
'//frc971/control_loops:team_number_test_environment',
+ '//y2015/util:kinematics',
],
)
diff --git a/y2015/http_status/BUILD b/y2015/http_status/BUILD
index d71574c..1bb5c8f 100644
--- a/y2015/http_status/BUILD
+++ b/y2015/http_status/BUILD
@@ -4,8 +4,6 @@
name = 'http_status',
srcs = [
'http_status.cc',
- ],
- hdrs = [
'http_status.h',
],
deps = [
diff --git a/y2015/util/BUILD b/y2015/util/BUILD
index 2a7250f..bf1d3ed 100644
--- a/y2015/util/BUILD
+++ b/y2015/util/BUILD
@@ -14,7 +14,7 @@
'kinematics_test.cc',
],
deps = [
- '//third_party/gtest',
+ '//aos/testing:googletest',
'//aos/common:queue_testutils',
'//aos/common/logging',
'//frc971/control_loops:team_number_test_environment',
diff --git a/y2015/wpilib/BUILD b/y2015/wpilib/BUILD
index 61d5c62..a9c21e3 100644
--- a/y2015/wpilib/BUILD
+++ b/y2015/wpilib/BUILD
@@ -9,12 +9,13 @@
'//aos/linux_code:init',
'//aos/common:stl_mutex',
'//aos/common/logging',
- '//third_party/WPILib',
+ '//aos/externals:wpilib',
'//y2015:constants',
'//y2015/control_loops/drivetrain:drivetrain_queue',
'//y2015/control_loops/fridge:fridge_queue',
'//y2015/control_loops/claw:claw_queue',
'//y2015/autonomous:auto_queue',
+ '//frc971/autonomous:auto_queue',
'//aos/common/controls:control_loop',
'//aos/common/util:log_interval',
'//aos/common:time',