Merge changes Ib8ee503c,I9a5f198b,Ia64b27b7,I00ec3c79
* changes:
Fix a couple of files which were relying on implicit conversions
Add missing dependency
Don't try to build fortran for the roboRIO in //y2015_bot3
Finish moving //y2014/... into its own namespace
diff --git a/y2014_bot3/BUILD b/y2014_bot3/BUILD
index 2538acc..3ec0bb5 100644
--- a/y2014_bot3/BUILD
+++ b/y2014_bot3/BUILD
@@ -1,7 +1,7 @@
load('/aos/downloader/downloader', 'aos_downloader')
cc_binary(
- name = 'joystick_reader_y2014_bot3',
+ name = 'joystick_reader',
srcs = [
'joystick_reader.cc',
],
@@ -24,11 +24,11 @@
name = 'download',
start_srcs = [
'//aos:prime_start_binaries',
- '//y2014_bot3/control_loops/drivetrain:drivetrain_y2014_bot3',
+ '//y2014_bot3/control_loops/drivetrain:drivetrain',
'//y2014_bot3/control_loops/rollers:rollers',
- '//y2014_bot3/autonomous:auto_y2014_bot3',
- ':joystick_reader_y2014_bot3',
- '//y2014_bot3/wpilib:wpilib_interface_y2014_bot3',
+ '//y2014_bot3/autonomous:auto',
+ ':joystick_reader',
+ '//y2014_bot3/wpilib:wpilib_interface',
],
srcs = [
'//aos:prime_binaries',
diff --git a/y2014_bot3/autonomous/BUILD b/y2014_bot3/autonomous/BUILD
index 698869d..f90ce74 100644
--- a/y2014_bot3/autonomous/BUILD
+++ b/y2014_bot3/autonomous/BUILD
@@ -32,7 +32,7 @@
)
cc_binary(
- name = 'auto_y2014_bot3',
+ name = 'auto',
srcs = [
'auto_main.cc',
],
diff --git a/y2014_bot3/control_loops/drivetrain/BUILD b/y2014_bot3/control_loops/drivetrain/BUILD
index c1b1433..66b8275 100644
--- a/y2014_bot3/control_loops/drivetrain/BUILD
+++ b/y2014_bot3/control_loops/drivetrain/BUILD
@@ -3,7 +3,7 @@
load('/aos/build/queues', 'queue_library')
cc_binary(
- name = 'replay_drivetrain_y2014_bot3',
+ name = 'replay_drivetrain',
srcs = [
'replay_drivetrain.cc',
],
@@ -83,7 +83,7 @@
)
cc_binary(
- name = 'drivetrain_y2014_bot3',
+ name = 'drivetrain',
srcs = [
'drivetrain_main.cc',
],
diff --git a/y2014_bot3/wpilib/BUILD b/y2014_bot3/wpilib/BUILD
index 61075c7..5c3f0d1 100644
--- a/y2014_bot3/wpilib/BUILD
+++ b/y2014_bot3/wpilib/BUILD
@@ -1,7 +1,7 @@
package(default_visibility = ['//visibility:public'])
cc_binary(
- name = 'wpilib_interface_y2014_bot3',
+ name = 'wpilib_interface',
srcs = [
'wpilib_interface.cc',
],