From 7f4918f1f17b0ddde6d1a8435e63f5f94c6dd065 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Mon, 20 Apr 2026 12:50:39 -0400 Subject: Generate version string based on repository information --- src/cli/stasis/stasis_main.c | 45 +++++++++++++++++++++++++++++++++++++++++++- src/lib/core/globals.c | 10 +++++----- src/lib/core/include/core.h | 2 ++ 3 files changed, 51 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/cli/stasis/stasis_main.c b/src/cli/stasis/stasis_main.c index 328d825..697791a 100644 --- a/src/cli/stasis/stasis_main.c +++ b/src/cli/stasis/stasis_main.c @@ -487,6 +487,39 @@ static void transfer_artifacts(struct Delivery *ctx) { } } +static char *center_text(const char *s, const size_t maxwidth) { + if (maxwidth < 2) { + SYSERROR("%s", "maximum width must be greater than 0"); + return NULL; + } + + if (maxwidth % 2 != 0) { + SYSERROR("maximum width (%zu) must be even", maxwidth); + return NULL; + } + + const size_t s_len = strlen(s); + if (s_len + 1 > maxwidth) { + SYSERROR("length of input string (%zu) exceeds maximum width (%zu)", s_len, maxwidth); + return NULL; + } + + char *result = calloc(maxwidth + 1, sizeof(*result)); + if (!result) { + SYSERROR("%s", "unable to allocate bytes for centered text string"); + return NULL; + } + const size_t middle = (maxwidth / 2) - s_len / 2; + size_t i = 0; + for (; i < middle; i++) { + result[i] = ' '; + } + result[i++] = 'v'; + strncpy(&result[i], s, maxwidth - middle - 1); + return result; +} + + int main(int argc, char *argv[]) { struct Delivery ctx; struct Process proc = { @@ -634,7 +667,17 @@ int main(int argc, char *argv[]) { exit(1); } - printf(BANNER, VERSION, AUTHOR); + char *version = center_text(VERSION, strlen(STASIS_BANNER_HEADER)); + if (!version) { + SYSERROR("%s", "version too long?"); + version = strdup(VERSION); + if (!version) { + SYSERROR("%s", "unable to allocate uncentered fallback version string"); + exit(1); + } + } + printf(BANNER, version, AUTHOR); + guard_free(version); setup_python_version_override(&ctx, python_override_version); configure_stasis_ini(&ctx, &config_input); diff --git a/src/lib/core/globals.c b/src/lib/core/globals.c index 63555a2..b84213e 100644 --- a/src/lib/core/globals.c +++ b/src/lib/core/globals.c @@ -3,10 +3,10 @@ #include "core.h" #include "envctl.h" -const char *VERSION = "1.0.0"; +const char *VERSION = STASIS_VERSION " (" STASIS_VERSION_BRANCH ")"; const char *AUTHOR = "Joseph Hunkeler"; const char *BANNER = - "------------------------------------------------------------------------\n" + STASIS_BANNER_HEADER "\n" #if defined(STASIS_DUMB_TERMINAL) " STASIS \n" #else @@ -18,10 +18,10 @@ const char *BANNER = " |_____/ |_/_/ \\_\\_____/|_____|_____/ \n" "\n" #endif - "------------------------------------------------------------------------\n" + STASIS_BANNER_HEADER "\n" " Delivery Generator \n" - " v%s \n" - "------------------------------------------------------------------------\n" + "%s\n" + STASIS_BANNER_HEADER "\n" "Copyright (C) 2023-2025 %s,\n" "Association of Universities for Research in Astronomy (AURA)\n"; diff --git a/src/lib/core/include/core.h b/src/lib/core/include/core.h index c895267..9a2007c 100644 --- a/src/lib/core/include/core.h +++ b/src/lib/core/include/core.h @@ -10,7 +10,9 @@ #include #include #include +#include "version.h" +#define STASIS_BANNER_HEADER "------------------------------------------------------------------------" #define STASIS_BUFSIZ 8192 #define STASIS_NAME_MAX 255 #define STASIS_DIRSTACK_MAX 1024 -- cgit From 7bd80c314dc4db2296b8a15c2f276dc9afe63fd1 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 21 Apr 2026 10:49:28 -0400 Subject: Emit stasis version --- src/cli/stasis_indexer/helpers.c | 14 +++++++++++++- src/lib/delivery/delivery_postprocess.c | 6 ++++++ 2 files changed, 19 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/cli/stasis_indexer/helpers.c b/src/cli/stasis_indexer/helpers.c index 0debfe4..23e4f5a 100644 --- a/src/cli/stasis_indexer/helpers.c +++ b/src/cli/stasis_indexer/helpers.c @@ -313,13 +313,22 @@ int load_metadata(struct Delivery *ctx, const char *filename) { return -1; } + // Reserved for future use. + // i.e. adjust values based on the version of the software that produced the input + char *stasis_version = NULL; + char *stasis_version_branch = NULL; + while (fgets(line, sizeof(line) - 1, fp) != NULL) { char **parts = split(line, " ", 1); const char *name = parts[0]; char *value = parts[1]; strip(value); - if (!strcmp(name, "name")) { + if (!strcmp(name, "stasis_version")) { + stasis_version = strdup(value); + } else if (!strcmp(name, "stasis_version_branch")) { + stasis_version_branch = strdup(value); + } else if (!strcmp(name, "name")) { ctx->meta.name = strdup(value); } else if (!strcmp(name, "version")) { ctx->meta.version = strdup(value); @@ -364,6 +373,9 @@ int load_metadata(struct Delivery *ctx, const char *filename) { } guard_array_free(parts); } + + guard_free(stasis_version); + guard_free(stasis_version_branch); fclose(fp); return 0; diff --git a/src/lib/delivery/delivery_postprocess.c b/src/lib/delivery/delivery_postprocess.c index 8cb4e65..95bcc0a 100644 --- a/src/lib/delivery/delivery_postprocess.c +++ b/src/lib/delivery/delivery_postprocess.c @@ -3,6 +3,8 @@ const char *release_header = "# delivery_name: %s\n" "# delivery_fmt: %s\n" + "# stasis_version: %s\n" + "# stasis_branch: %s\n" "# creation_time: %s\n" "# conda_ident: %s\n" "# conda_build_ident: %s\n"; @@ -14,6 +16,8 @@ char *delivery_get_release_header(struct Delivery *ctx) { snprintf(output, sizeof(output), release_header, ctx->info.release_name, ctx->rules.release_fmt, + STASIS_VERSION, + STASIS_VERSION_BRANCH, stamp, ctx->conda.tool_version, ctx->conda.tool_build_version); @@ -30,6 +34,8 @@ int delivery_dump_metadata(struct Delivery *ctx) { if (globals.verbose) { msg(STASIS_MSG_L2, "%s\n", filename); } + fprintf(fp, "stasis_version %s\n", STASIS_VERSION); + fprintf(fp, "stasis_version_branch %s\n", STASIS_VERSION_BRANCH); fprintf(fp, "name %s\n", ctx->meta.name); fprintf(fp, "version %s\n", ctx->meta.version); fprintf(fp, "rc %d\n", ctx->meta.rc); -- cgit