aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2026-04-20 12:50:39 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2026-04-21 12:22:04 -0400
commit7f4918f1f17b0ddde6d1a8435e63f5f94c6dd065 (patch)
tree2981bfd281eaeb91e631fe037767decd72a85aab
parente05702d1818088439fd017786a036103062db358 (diff)
downloadstasis-7f4918f1f17b0ddde6d1a8435e63f5f94c6dd065.tar.gz
Generate version string based on repository information
-rw-r--r--CMakeLists.txt8
-rw-r--r--cmake/GitVersion.cmake43
-rw-r--r--include/version.h.in6
-rw-r--r--src/cli/stasis/stasis_main.c45
-rw-r--r--src/lib/core/globals.c10
-rw-r--r--src/lib/core/include/core.h2
6 files changed, 108 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc403ca..73f5555 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,14 @@
cmake_minimum_required(VERSION 3.15)
project(STASIS C)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
include(GNUInstallDirs)
+include(GitVersion)
+get_version_from_git()
+configure_file(
+ ${CMAKE_SOURCE_DIR}/include/version.h.in
+ ${CMAKE_BINARY_DIR}/include/version.h
+)
set(nix_cflags -Wall -Wextra -fPIC -D_GNU_SOURCE)
set(win_cflags /Wall)
diff --git a/cmake/GitVersion.cmake b/cmake/GitVersion.cmake
new file mode 100644
index 0000000..7280510
--- /dev/null
+++ b/cmake/GitVersion.cmake
@@ -0,0 +1,43 @@
+function(get_version_from_git)
+ find_package(Git QUIET)
+ if(NOT Git_FOUND)
+ message(WARNING "Git not found. Setting fallback version.")
+ set(PROJECT_VERSION "0.0.0")
+ set(PROJECT_VERSION ${PROJECT_VERSION} PARENT_SCOPE)
+ set(PROJECT_VERSION_BRANCH "unknown")
+ set(PROJECT_VERSION_BRANCH ${PROJECT_VERSION_BRANCH} PARENT_SCOPE)
+ return()
+ endif()
+
+ execute_process(
+ COMMAND ${GIT_EXECUTABLE} describe --first-parent --long --dirty --tags --always
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ OUTPUT_VARIABLE GIT_TAG
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ RESULT_VARIABLE GIT_RESULT
+ )
+ if(NOT GIT_RESULT EQUAL 0)
+ message(WARNING "Failed to get git describe info")
+ return()
+ endif()
+ message(${GIT_TAG})
+
+ execute_process(
+ COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ OUTPUT_VARIABLE GIT_BRANCH
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ RESULT_VARIABLE GIT_RESULT
+ )
+ if(NOT GIT_RESULT EQUAL 0)
+ message(WARNING "Failed to get git branch")
+ return()
+ endif()
+ message(${GIT_BRANCH})
+
+ string(REGEX REPLACE "^v" "" CLEAN_TAG "${GIT_TAG}")
+ set(PROJECT_VERSION ${CLEAN_TAG})
+ set(PROJECT_VERSION ${CLEAN_TAG} PARENT_SCOPE)
+ set(PROJECT_VERSION_BRANCH ${GIT_BRANCH})
+ set(PROJECT_VERSION_BRANCH ${GIT_BRANCH} PARENT_SCOPE)
+endfunction() \ No newline at end of file
diff --git a/include/version.h.in b/include/version.h.in
new file mode 100644
index 0000000..b33d7c7
--- /dev/null
+++ b/include/version.h.in
@@ -0,0 +1,6 @@
+#ifndef STASIS_VERSION_H
+
+#define STASIS_VERSION "@PROJECT_VERSION@"
+#define STASIS_VERSION_BRANCH "@PROJECT_VERSION_BRANCH@"
+
+#endif // STASIS_VERSION_H \ No newline at end of file
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 <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