From dfc38629724eb4f6718cb73ff3de108871e377bd Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Sun, 10 May 2026 15:19:44 -0400 Subject: Fix up includes --- src/cli/stasis/stasis_main.c | 1 + src/cli/stasis_indexer/helpers.c | 2 ++ src/cli/stasis_indexer/include/helpers.h | 1 + src/cli/stasis_indexer/junitxml_report.c | 2 ++ src/lib/core/include/str.h | 3 ++- src/lib/core/include/utils.h | 1 + src/lib/delivery/delivery.c | 1 + src/lib/delivery/delivery_build.c | 4 ++++ src/lib/delivery/delivery_conda.c | 1 + src/lib/delivery/delivery_export.c | 1 + src/lib/delivery/delivery_init.c | 3 +++ src/lib/delivery/delivery_install.c | 3 +++ src/lib/delivery/delivery_postprocess.c | 2 ++ src/lib/delivery/include/delivery.h | 12 ------------ tests/test_wheel.c | 1 + 15 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/cli/stasis/stasis_main.c b/src/cli/stasis/stasis_main.c index 2bc2d4b..4b8a9f2 100644 --- a/src/cli/stasis/stasis_main.c +++ b/src/cli/stasis/stasis_main.c @@ -7,6 +7,7 @@ // local includes #include "args.h" +#include "conda.h" #include "system_requirements.h" #include "tpl.h" diff --git a/src/cli/stasis_indexer/helpers.c b/src/cli/stasis_indexer/helpers.c index 425d209..a4999a6 100644 --- a/src/cli/stasis_indexer/helpers.c +++ b/src/cli/stasis_indexer/helpers.c @@ -2,6 +2,8 @@ // Created by jhunk on 11/15/24. // +#include + #include "core.h" #include "helpers.h" diff --git a/src/cli/stasis_indexer/include/helpers.h b/src/cli/stasis_indexer/include/helpers.h index 6e2f93c..4a51f8f 100644 --- a/src/cli/stasis_indexer/include/helpers.h +++ b/src/cli/stasis_indexer/include/helpers.h @@ -2,6 +2,7 @@ #define HELPERS_H #include "delivery.h" +#include "conda.h" #define ARRAY_COUNT_DYNAMIC(X, COUNTER) \ do { \ diff --git a/src/cli/stasis_indexer/junitxml_report.c b/src/cli/stasis_indexer/junitxml_report.c index c6cf4b0..6740c07 100644 --- a/src/cli/stasis_indexer/junitxml_report.c +++ b/src/cli/stasis_indexer/junitxml_report.c @@ -2,6 +2,8 @@ // Created by jhunk on 11/15/24. // +#include + #include "core.h" #include "callbacks.h" #include "junitxml.h" diff --git a/src/lib/core/include/str.h b/src/lib/core/include/str.h index be497ed..5097148 100644 --- a/src/lib/core/include/str.h +++ b/src/lib/core/include/str.h @@ -9,8 +9,9 @@ #include #include #include -#include "relocation.h" #include "core.h" +#include "log.h" +#include "relocation.h" #define STASIS_SORT_ALPHA 1 << 0 #define STASIS_SORT_NUMERIC 1 << 1 diff --git a/src/lib/core/include/utils.h b/src/lib/core/include/utils.h index c1ee513..1a5e97f 100644 --- a/src/lib/core/include/utils.h +++ b/src/lib/core/include/utils.h @@ -9,6 +9,7 @@ #include #include #include "core.h" +#include "log.h" #include "copy.h" #include "system.h" #include "strlist.h" diff --git a/src/lib/delivery/delivery.c b/src/lib/delivery/delivery.c index 45b3b35..f9711f4 100644 --- a/src/lib/delivery/delivery.c +++ b/src/lib/delivery/delivery.c @@ -1,4 +1,5 @@ #include "delivery.h" +#include "conda.h" static char *strdup_maybe(const char * restrict s) { if (s != NULL) { diff --git a/src/lib/delivery/delivery_build.c b/src/lib/delivery/delivery_build.c index 49d2f5b..ad0b702 100644 --- a/src/lib/delivery/delivery_build.c +++ b/src/lib/delivery/delivery_build.c @@ -1,4 +1,8 @@ +#include + #include "delivery.h" +#include "conda.h" +#include "recipe.h" int delivery_build_recipes(struct Delivery *ctx) { for (size_t i = 0; i < ctx->tests->num_used; i++) { diff --git a/src/lib/delivery/delivery_conda.c b/src/lib/delivery/delivery_conda.c index cf61abb..6002dd0 100644 --- a/src/lib/delivery/delivery_conda.c +++ b/src/lib/delivery/delivery_conda.c @@ -1,4 +1,5 @@ #include "delivery.h" +#include "conda.h" void delivery_get_conda_installer_url(struct Delivery *ctx, char *result, size_t maxlen) { int len = 0; diff --git a/src/lib/delivery/delivery_export.c b/src/lib/delivery/delivery_export.c index e67fdfb..9a0fb01 100644 --- a/src/lib/delivery/delivery_export.c +++ b/src/lib/delivery/delivery_export.c @@ -1,4 +1,5 @@ #include "delivery.h" +#include "conda.h" static void delivery_export_configuration(const struct Delivery *ctx) { msg(STASIS_MSG_L2, "Exporting delivery configuration\n"); diff --git a/src/lib/delivery/delivery_init.c b/src/lib/delivery/delivery_init.c index 024815b..47a8f2b 100644 --- a/src/lib/delivery/delivery_init.c +++ b/src/lib/delivery/delivery_init.c @@ -1,3 +1,6 @@ +#include +#include + #include "delivery.h" int has_mount_flags(const char *mount_point, const unsigned long flags) { diff --git a/src/lib/delivery/delivery_install.c b/src/lib/delivery/delivery_install.c index 6ad9407..c073b5c 100644 --- a/src/lib/delivery/delivery_install.c +++ b/src/lib/delivery/delivery_install.c @@ -1,4 +1,7 @@ #include "delivery.h" +#include "conda.h" +#include "wheelinfo.h" +#include "version_compare.h" static struct Test *requirement_from_test(struct Delivery *ctx, const char *name) { struct Test *result = NULL; diff --git a/src/lib/delivery/delivery_postprocess.c b/src/lib/delivery/delivery_postprocess.c index 3ff1d56..6937c90 100644 --- a/src/lib/delivery/delivery_postprocess.c +++ b/src/lib/delivery/delivery_postprocess.c @@ -1,4 +1,6 @@ #include "delivery.h" +#include "log.h" +#include "conda.h" const char *release_header = "# delivery_name: %s\n" diff --git a/src/lib/delivery/include/delivery.h b/src/lib/delivery/include/delivery.h index c091182..f234750 100644 --- a/src/lib/delivery/include/delivery.h +++ b/src/lib/delivery/include/delivery.h @@ -5,23 +5,11 @@ #include #include -#include -#include -#include -#include #include "artifactory.h" -#include "conda.h" -#include "copy.h" -#include "core.h" #include "docker.h" #include "environment.h" #include "ini.h" #include "multiprocessing.h" -#include "recipe.h" -#include "wheel.h" -#include "wheelinfo.h" -#include "environment.h" -#include "version_compare.h" #define DELIVERY_PLATFORM_MAX 4 #define DELIVERY_PLATFORM_MAXLEN 65 diff --git a/tests/test_wheel.c b/tests/test_wheel.c index a1623e8..525251d 100644 --- a/tests/test_wheel.c +++ b/tests/test_wheel.c @@ -1,3 +1,4 @@ +#include "conda.h" #include "delivery.h" #include "testing.h" #include "str.h" -- cgit