cleaned up LOTS of build-related stuff
There were a lot of things that were relying on transitive #include
and/or gyp dependencies that I fixed.
I also got rid of all references to libaos and a lot of references to
aos/aos_core.h and its build target.
This in preparation for removing libaos completely.
diff --git a/frc971/output/CameraServer.cc b/frc971/output/CameraServer.cc
index d3c3bc8..944f417 100644
--- a/frc971/output/CameraServer.cc
+++ b/frc971/output/CameraServer.cc
@@ -1,12 +1,13 @@
#include <string.h>
-#include "aos/aos_core.h"
#include "aos/atom_code/output/HTTPServer.h"
#include "aos/atom_code/output/evhttp_ctemplate_emitter.h"
#include "aos/atom_code/output/ctemplate_cache.h"
#include "aos/common/Configuration.h"
#include "aos/common/messages/RobotState.q.h"
#include "ctemplate/template.h"
+#include "aos/atom_code/init.h"
+#include "aos/common/logging/logging.h"
#include "frc971/constants.h"
@@ -84,4 +85,9 @@
} // namespace frc971
-AOS_RUN_NRT(frc971::CameraServer)
+int main() {
+ ::aos::InitNRT();
+ ::frc971::CameraServer server;
+ server.Run();
+ ::aos::Cleanup();
+}
diff --git a/frc971/output/output.gyp b/frc971/output/output.gyp
index b872713..2a81f0a 100644
--- a/frc971/output/output.gyp
+++ b/frc971/output/output.gyp
@@ -7,10 +7,11 @@
'CameraServer.cc',
],
'dependencies': [
- '<(AOS)/build/aos.gyp:libaos',
'<(AOS)/atom_code/output/output.gyp:http_server',
'../frc971.gyp:common',
'<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/build/aos.gyp:logging',
+ '<(AOS)/common/messages/messages.gyp:aos_queues',
],
'copies': [
{
@@ -39,11 +40,14 @@
],
}, {
'sources': ['CRIOMotorWriter.cc'],
+ 'dependencies': [
+ '<(EXTERNALS):WPILib',
+ '<(AOS)/build/aos.gyp:aos_core',
+ ],
}
],
],
'dependencies': [
- '<(AOS)/build/aos.gyp:libaos',
'<(AOS)/common/common.gyp:controls',
'<(DEPTH)/frc971/control_loops/drivetrain/drivetrain.gyp:drivetrain_loop',
'<(DEPTH)/frc971/queues/queues.gyp:queues',