diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/core/globals.c | 10 | ||||
| -rw-r--r-- | src/lib/core/include/core.h | 2 | ||||
| -rw-r--r-- | src/lib/delivery/delivery_postprocess.c | 6 |
3 files changed, 13 insertions, 5 deletions
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 <unistd.h> #include <time.h> #include <sys/statvfs.h> +#include "version.h" +#define STASIS_BANNER_HEADER "------------------------------------------------------------------------" #define STASIS_BUFSIZ 8192 #define STASIS_NAME_MAX 255 #define STASIS_DIRSTACK_MAX 1024 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); |