Rename config.json to aos_config.json
Plenty of other things are called config.json, so let's pick a more
unique name.
Change-Id: I6510a172ec62674dd1b11bd71cef9aac2480c612
Signed-off-by: Austin Schuh <austin.linux@gmail.com>
diff --git a/aos/actions/BUILD b/aos/actions/BUILD
index 1905e9c..a76dc3f 100644
--- a/aos/actions/BUILD
+++ b/aos/actions/BUILD
@@ -54,7 +54,7 @@
],
target_compatible_with = ["@platforms//os:linux"],
deps = [
- "//aos/events:config",
+ "//aos/events:aos_config",
],
)
diff --git a/aos/aos_cli_utils.cc b/aos/aos_cli_utils.cc
index 84ba1e4..f71ed2a 100644
--- a/aos/aos_cli_utils.cc
+++ b/aos/aos_cli_utils.cc
@@ -6,7 +6,7 @@
#include <iostream>
-DEFINE_string(config, "./config.json", "File path of aos configuration");
+DEFINE_string(config, "./aos_config.json", "File path of aos configuration");
DEFINE_bool(
_bash_autocomplete, false,
diff --git a/aos/aos_graph_nodes.cc b/aos/aos_graph_nodes.cc
index 90778d1..cf7bc11 100644
--- a/aos/aos_graph_nodes.cc
+++ b/aos/aos_graph_nodes.cc
@@ -10,7 +10,7 @@
DEFINE_bool(all, false,
"If true, print out the channels for all nodes in the config file, "
"not just the channels which are visible on this node.");
-DEFINE_string(config, "./config.json", "File path of aos configuration");
+DEFINE_string(config, "./aos_config.json", "File path of aos configuration");
DEFINE_bool(short_types, true,
"Whether to show a shortened version of the type name");
diff --git a/aos/configuration.h b/aos/configuration.h
index 9cb1132..c0e2715 100644
--- a/aos/configuration.h
+++ b/aos/configuration.h
@@ -40,8 +40,8 @@
FlatbufferDetachedBuffer<Configuration> MergeWithConfig(
const Configuration *config, const Flatbuffer<Configuration> &addition);
-// Adds the list of schemas to the provide config json. This should mostly be
-// used for testing and in conjunction with MergeWithConfig.
+// Adds the list of schemas to the provide aos_config.json. This should mostly
+// be used for testing and in conjunction with MergeWithConfig.
FlatbufferDetachedBuffer<aos::Configuration> AddSchema(
std::string_view json,
const std::vector<FlatbufferVector<reflection::Schema>> &schemas);
diff --git a/aos/events/BUILD b/aos/events/BUILD
index f36da1e..e53be2f 100644
--- a/aos/events/BUILD
+++ b/aos/events/BUILD
@@ -142,7 +142,7 @@
)
aos_config(
- name = "config",
+ name = "aos_config",
src = "aos.json",
flatbuffers = [
":event_loop_fbs",
@@ -161,7 +161,7 @@
":pong_fbs",
],
target_compatible_with = ["@platforms//os:linux"],
- deps = [":config"],
+ deps = [":aos_config"],
)
[
@@ -177,7 +177,7 @@
"//aos/network:message_bridge_server_fbs",
],
target_compatible_with = ["@platforms//os:linux"],
- deps = [":config"],
+ deps = [":aos_config"],
)
for config in [
"multinode_pingpong_test_split",
@@ -448,7 +448,7 @@
"glib_main_loop_test.cc",
],
data = [
- ":config",
+ ":aos_config",
],
deps = [
":glib_main_loop",
diff --git a/aos/events/glib_main_loop_test.cc b/aos/events/glib_main_loop_test.cc
index b857b0b..9f72e54 100644
--- a/aos/events/glib_main_loop_test.cc
+++ b/aos/events/glib_main_loop_test.cc
@@ -15,7 +15,7 @@
const FlatbufferDetachedBuffer<Configuration> &Config() {
static const FlatbufferDetachedBuffer<Configuration> result =
- configuration::ReadConfig(ArtifactPath("aos/events/config.json"));
+ configuration::ReadConfig(ArtifactPath("aos/events/aos_config.json"));
return result;
}
diff --git a/aos/events/logging/BUILD b/aos/events/logging/BUILD
index ec13f92..272bee4 100644
--- a/aos/events/logging/BUILD
+++ b/aos/events/logging/BUILD
@@ -383,7 +383,7 @@
"//aos/network:timestamp_fbs",
],
target_compatible_with = ["@platforms//os:linux"],
- deps = ["//aos/events:config"],
+ deps = ["//aos/events:aos_config"],
)
aos_config(
@@ -398,7 +398,7 @@
"//aos/network:timestamp_fbs",
],
target_compatible_with = ["@platforms//os:linux"],
- deps = ["//aos/events:config"],
+ deps = ["//aos/events:aos_config"],
)
aos_config(
@@ -413,7 +413,7 @@
"//aos/network:timestamp_fbs",
],
target_compatible_with = ["@platforms//os:linux"],
- deps = ["//aos/events:config"],
+ deps = ["//aos/events:aos_config"],
)
cc_test(
diff --git a/aos/events/logging/logger_main.cc b/aos/events/logging/logger_main.cc
index 4874c77..aa6f25b 100644
--- a/aos/events/logging/logger_main.cc
+++ b/aos/events/logging/logger_main.cc
@@ -10,7 +10,7 @@
#include "gflags/gflags.h"
#include "glog/logging.h"
-DEFINE_string(config, "config.json", "Config file to use.");
+DEFINE_string(config, "aos_config.json", "Config file to use.");
DEFINE_bool(skip_renicing, false,
"If true, skip renicing the logger. This leaves it lower priority "
diff --git a/aos/network/BUILD b/aos/network/BUILD
index 323a334..bc68c90 100644
--- a/aos/network/BUILD
+++ b/aos/network/BUILD
@@ -354,7 +354,7 @@
"//aos/network:timestamp_fbs",
],
target_compatible_with = ["@platforms//os:linux"],
- deps = ["//aos/events:config"],
+ deps = ["//aos/events:aos_config"],
)
aos_config(
@@ -369,7 +369,7 @@
"//aos/network:timestamp_fbs",
],
target_compatible_with = ["@platforms//os:linux"],
- deps = ["//aos/events:config"],
+ deps = ["//aos/events:aos_config"],
)
cc_test(
diff --git a/aos/network/message_bridge_client.cc b/aos/network/message_bridge_client.cc
index 61a7271..301dfd9 100644
--- a/aos/network/message_bridge_client.cc
+++ b/aos/network/message_bridge_client.cc
@@ -3,7 +3,7 @@
#include "aos/events/shm_event_loop.h"
#include "aos/init.h"
-DEFINE_string(config, "config.json", "Path to the config.");
+DEFINE_string(config, "aos_config.json", "Path to the config.");
DEFINE_int32(rt_priority, -1, "If > 0, run as this RT priority");
namespace aos {
diff --git a/aos/network/message_bridge_server.cc b/aos/network/message_bridge_server.cc
index 9f336c0..fc1425d 100644
--- a/aos/network/message_bridge_server.cc
+++ b/aos/network/message_bridge_server.cc
@@ -4,7 +4,7 @@
#include "gflags/gflags.h"
#include "glog/logging.h"
-DEFINE_string(config, "config.json", "Path to the config.");
+DEFINE_string(config, "aos_config.json", "Path to the config.");
DEFINE_int32(rt_priority, -1, "If > 0, run as this RT priority");
namespace aos {
diff --git a/aos/network/web_proxy_main.cc b/aos/network/web_proxy_main.cc
index f3ad926..4482ad0 100644
--- a/aos/network/web_proxy_main.cc
+++ b/aos/network/web_proxy_main.cc
@@ -4,7 +4,7 @@
#include "aos/network/web_proxy.h"
#include "gflags/gflags.h"
-DEFINE_string(config, "./config.json", "File path of aos configuration");
+DEFINE_string(config, "./aos_config.json", "File path of aos configuration");
DEFINE_string(data_dir, "www", "Directory to serve data files from");
DEFINE_int32(buffer_size, 1000000,
"-1 if infinite, in bytes / channel. If there are no active "
diff --git a/aos/network/www/BUILD b/aos/network/www/BUILD
index f62ed67..1b00af7 100644
--- a/aos/network/www/BUILD
+++ b/aos/network/www/BUILD
@@ -158,7 +158,7 @@
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//visibility:public"],
deps = [
- "//aos/events:config",
+ "//aos/events:aos_config",
],
)
@@ -179,7 +179,7 @@
":reflection_test_bundle.min.js",
":test_config",
"//aos/network:web_proxy_main",
- "//y2020:config",
+ "//y2020:aos_config",
],
target_compatible_with = ["@platforms//os:linux"],
)
diff --git a/aos/starter/starter_cmd.cc b/aos/starter/starter_cmd.cc
index 65861e1..b4d80d8 100644
--- a/aos/starter/starter_cmd.cc
+++ b/aos/starter/starter_cmd.cc
@@ -13,7 +13,7 @@
#include "gflags/gflags.h"
#include "starter_rpc_lib.h"
-DEFINE_string(config, "./config.json", "File path of aos configuration");
+DEFINE_string(config, "./aos_config.json", "File path of aos configuration");
// TODO(james): Bash autocompletion for node names.
DEFINE_string(
node, "",
diff --git a/aos/starter/starterd.cc b/aos/starter/starterd.cc
index a5a340a..941f5df 100644
--- a/aos/starter/starterd.cc
+++ b/aos/starter/starterd.cc
@@ -5,7 +5,7 @@
#include "gflags/gflags.h"
#include "starterd_lib.h"
-DEFINE_string(config, "./config.json", "File path of aos configuration");
+DEFINE_string(config, "./aos_config.json", "File path of aos configuration");
DEFINE_string(user, "",
"Starter runs as though this user ran a SUID binary if set.");