From d18f875c0e708a78f834a157675336e95929d66b Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 25 Jun 2025 22:18:43 +1200 Subject: [PATCH] docs: Update 4 files --- bb64/CMakeLists.txt | 5 ++++- bb64/publish.sh | 19 +++++-------------- bb64/src/bb64.cpp | 2 +- bb64/src/version.h | 1 - bb64/src/version.hpp.in | 1 + 5 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 bb64/src/version.h create mode 100644 bb64/src/version.hpp.in diff --git a/bb64/CMakeLists.txt b/bb64/CMakeLists.txt index de6859a..5267058 100644 --- a/bb64/CMakeLists.txt +++ b/bb64/CMakeLists.txt @@ -5,7 +5,8 @@ if(NOT DEFINED PROJECT_NAME) message(FATAL_ERROR "PROJECT_NAME is not defined. Pass it via -DPROJECT_NAME=") endif() -project(${PROJECT_NAME}) +string(TIMESTAMP PROJECT_VERSION "%Y.%m%d.%H%M") +project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES CXX) # Build configuration set(CMAKE_CXX_STANDARD 23) @@ -21,6 +22,8 @@ add_executable(${PROJECT_NAME} src/b64ed.cpp ) +# Configure version.hpp +configure_file("src/version.hpp.in" "src/autogen/version.hpp" @ONLY) # Include directories target_include_directories(${PROJECT_NAME} PRIVATE diff --git a/bb64/publish.sh b/bb64/publish.sh index bcbc67e..625f175 100755 --- a/bb64/publish.sh +++ b/bb64/publish.sh @@ -12,19 +12,10 @@ if [ "$ARCH" = "aarch64" ]; then ARCH_ALIAS="arm64" fi -# Increment version -VERSION_FILE="${SCRIPT_DIR}/src/version.h" -if [ ! -f "${VERSION_FILE}" ]; then - echo "${VERSION_FILE} not found!" >&2 - exit 1 -else - v=$(cat "${VERSION_FILE}" | grep -o 'static const char \*VERSION = "[0-9.]*";' | cut -d'"' -f2) - oldv=$v - v=$((v+1)) - echo "Incrementing version from $oldv to $v" >&2 - echo "static const char *VERSION = \"$v\";" > "${VERSION_FILE}" -fi -TAG="v$v" +# Get version from CMake timestamp +VERSION=$(date +"%Y.%m%d.%H%M") +TAG="v$VERSION" +echo "Building version $VERSION" >&2 # build release version export CMAKE_BUILD_TYPE="Release" @@ -149,7 +140,7 @@ for FILE in ${PROJECT}.${ARCH_ALIAS} ${PROJECT}.${ARCH} install.sh; do fi done -echo "Published bb64 version $v to $REPO_URL (tag $TAG) with binaries for $ARCH_ALIAS / $ARCH." +echo "Published bb64 version $VERSION to $REPO_URL (tag $TAG) with binaries for $ARCH_ALIAS / $ARCH." #-------------------------------------------------------------------------------- diff --git a/bb64/src/bb64.cpp b/bb64/src/bb64.cpp index 1f0061f..8ca6a7e 100644 --- a/bb64/src/bb64.cpp +++ b/bb64/src/bb64.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "version.h" +#include "version.hpp" #include "b64ed.hpp" // Recursively decode and print if nested bb64 command is found diff --git a/bb64/src/version.h b/bb64/src/version.h deleted file mode 100644 index 46f56b4..0000000 --- a/bb64/src/version.h +++ /dev/null @@ -1 +0,0 @@ -static const char *VERSION = "39"; diff --git a/bb64/src/version.hpp.in b/bb64/src/version.hpp.in new file mode 100644 index 0000000..d0617bd --- /dev/null +++ b/bb64/src/version.hpp.in @@ -0,0 +1 @@ +static const char *VERSION = "@PROJECT_VERSION@"; \ No newline at end of file