Finish up more of the GYP->Bazel conversion
Change-Id: Iaea1ed7395689b34b6c8f83ff76f1cc9818fcebd
diff --git a/aos/BUILD b/aos/BUILD
index 97a033f..4b7fe3a 100644
--- a/aos/BUILD
+++ b/aos/BUILD
@@ -2,5 +2,10 @@
name = 'prime_binaries',
visibility = ['//visibility:public'],
srcs = [
+ '//aos/linux_code:core',
+ '//aos/linux_code/logging:binary_log_writer',
+ '//aos/linux_code/logging:log_streamer',
+ '//aos/linux_code/logging:log_displayer',
+ '//aos/linux_code/starter',
],
)
diff --git a/aos/linux_code/starter/BUILD b/aos/linux_code/starter/BUILD
index 2e5a80c..bccb7f5 100644
--- a/aos/linux_code/starter/BUILD
+++ b/aos/linux_code/starter/BUILD
@@ -1,4 +1,12 @@
-package(default_visibility = ['//visibility:public'])
+# This target is everything which should get deployed to the robot.
+filegroup(
+ name = 'starter',
+ visibility = ['//visibility:public'],
+ srcs = [
+ 'starter_exe',
+ 'starter.sh',
+ ],
+)
cc_binary(
name = 'starter_exe',
diff --git a/doc/TODO.bazel b/doc/TODO.bazel
index e7d3020..0a31b1c 100644
--- a/doc/TODO.bazel
+++ b/doc/TODO.bazel
@@ -1,12 +1,4 @@
//y2014/prime:All needs to conditionally have //y2014/wpilib:wpilib_interface.
-//y2014/prime:All needs to copy start_list.txt.
y2015 too
-//y2015:http_status needs to be finished.
-
-Actually write //aos:prime_binaries.
- Contents come from aos/build/aos_all.gyp.
-
-//aos/linux_code/starter needs to copy starter.sh.
-
Need to get tcmalloc hooked in.
diff --git a/third_party/libevent/BUILD b/third_party/libevent/BUILD
index ec0771d..97c4fe2 100644
--- a/third_party/libevent/BUILD
+++ b/third_party/libevent/BUILD
@@ -134,14 +134,6 @@
'_EVENT_HAVE_UNISTD_H=1',
'_EVENT_HAVE_UNSETENV=1',
'_EVENT_HAVE_VASPRINTF=1',
- #'-D_EVENT_LT_OBJDIR=".libs/"',
- #'-D_EVENT_PACKAGE="libevent"',
- #'-D_EVENT_PACKAGE_BUGREPORT=""',
- #'-D_EVENT_PACKAGE_NAME=""',
- #'-D_EVENT_PACKAGE_STRING=""',
- #'-D_EVENT_PACKAGE_TARNAME=""',
- #'-D_EVENT_PACKAGE_URL=""',
- #'-D_EVENT_PACKAGE_VERSION=""',
'_EVENT_SIZEOF_INT=4',
'_EVENT_SIZEOF_LONG=8',
'_EVENT_SIZEOF_SHORT=2',
diff --git a/y2014/prime/BUILD b/y2014/prime/BUILD
index 0690d43..ab0c8a9 100644
--- a/y2014/prime/BUILD
+++ b/y2014/prime/BUILD
@@ -7,19 +7,13 @@
srcs = [
'//aos:prime_binaries',
'//y2014/control_loops/drivetrain:drivetrain',
- '//y2014/control_loops/drivetrain:drivetrain_lib_test',
- '//y2014/control_loops/drivetrain:replay_drivetrain',
'//y2014/control_loops/claw:claw',
- '//y2014/control_loops/claw:claw_calibration',
- '//y2014/control_loops/claw:claw_lib_test',
- '//y2014/control_loops/claw:replay_claw',
'//y2014/control_loops/shooter:shooter',
- '//y2014/control_loops/shooter:shooter_lib_test',
- '//y2014/control_loops/shooter:replay_shooter',
'//y2014/autonomous:auto',
'//y2014:joystick_reader',
'//y2014/actors:binaries',
':hot_goal_reader',
+ ':start_list.txt',
],
)
diff --git a/y2015/actors/BUILD b/y2015/actors/BUILD
index 28c4af3..92c7c83 100644
--- a/y2015/actors/BUILD
+++ b/y2015/actors/BUILD
@@ -7,7 +7,6 @@
srcs = [
':drivetrain_action',
':score_action',
- ':score_action_test',
':pickup_action',
':stack_action',
':stack_and_lift_action',
@@ -16,7 +15,6 @@
':can_pickup_action',
':horizontal_can_pickup_action',
':lift_action',
- ':stack_action_test',
],
)
diff --git a/y2015/prime/BUILD b/y2015/prime/BUILD
index 78a8280..ac34fd2 100644
--- a/y2015/prime/BUILD
+++ b/y2015/prime/BUILD
@@ -1,22 +1,18 @@
package(default_visibility = ['//visibility:public'])
-filegroup(
- name = 'All',
+load('/aos/prime/downloader/downloader', 'aos_downloader')
+
+aos_downloader(
+ name = 'download',
srcs = [
'//aos:prime_binaries',
'//y2015/control_loops/drivetrain:drivetrain',
- '//y2015/control_loops/drivetrain:drivetrain_lib_test',
- '//y2015/control_loops/drivetrain:replay_drivetrain',
'//y2015/control_loops/fridge:fridge',
- '//y2015/control_loops/fridge:fridge_lib_test',
- '//y2015/control_loops/fridge:replay_fridge',
'//y2015/control_loops/claw:claw',
- '//y2015/control_loops/claw:claw_lib_test',
- '//y2015/control_loops/claw:replay_claw',
'//y2015/autonomous:auto',
'//y2015:joystick_reader',
'//y2015/http_status:http_status',
- '//y2015/util:kinematics_test',
'//y2015/actors:binaries',
+ ':start_list.txt',
],
)