Compare commits
4 Commits
v40
...
v2025.0625
Author | SHA1 | Date | |
---|---|---|---|
ef7470dcce | |||
d18f875c0e | |||
6f525b4f6c | |||
ed13bdb5b5 |
@ -5,7 +5,8 @@ if(NOT DEFINED PROJECT_NAME)
|
|||||||
message(FATAL_ERROR "PROJECT_NAME is not defined. Pass it via -DPROJECT_NAME=<name>")
|
message(FATAL_ERROR "PROJECT_NAME is not defined. Pass it via -DPROJECT_NAME=<name>")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
project(${PROJECT_NAME})
|
string(TIMESTAMP PROJECT_VERSION "%Y.%m%d.%H%M")
|
||||||
|
project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES CXX)
|
||||||
|
|
||||||
# Build configuration
|
# Build configuration
|
||||||
set(CMAKE_CXX_STANDARD 23)
|
set(CMAKE_CXX_STANDARD 23)
|
||||||
@ -21,6 +22,8 @@ add_executable(${PROJECT_NAME}
|
|||||||
src/b64ed.cpp
|
src/b64ed.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Configure version.hpp
|
||||||
|
configure_file("src/version.hpp.in" "src/autogen/version.hpp" @ONLY)
|
||||||
|
|
||||||
# Include directories
|
# Include directories
|
||||||
target_include_directories(${PROJECT_NAME} PRIVATE
|
target_include_directories(${PROJECT_NAME} PRIVATE
|
||||||
|
@ -12,19 +12,10 @@ if [ "$ARCH" = "aarch64" ]; then
|
|||||||
ARCH_ALIAS="arm64"
|
ARCH_ALIAS="arm64"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increment version
|
# Get version from CMake timestamp
|
||||||
VERSION_FILE="${SCRIPT_DIR}/src/version.h"
|
VERSION=$(date +"%Y.%m%d.%H%M")
|
||||||
if [ ! -f "${VERSION_FILE}" ]; then
|
TAG="v$VERSION"
|
||||||
echo "${VERSION_FILE} not found!" >&2
|
echo "Building version $VERSION" >&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"
|
|
||||||
|
|
||||||
# build release version
|
# build release version
|
||||||
export CMAKE_BUILD_TYPE="Release"
|
export CMAKE_BUILD_TYPE="Release"
|
||||||
@ -77,6 +68,30 @@ if [ -z "$RELEASE_WRITE_TOKEN" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Create and push git tag
|
||||||
|
echo "Creating git tag $TAG..."
|
||||||
|
|
||||||
|
# Configure git identity if not set (for CI environments)
|
||||||
|
if ! git config user.email >/dev/null 2>&1; then
|
||||||
|
git config user.email "ci@gitea.jde.nz"
|
||||||
|
git config user.name "CI Bot"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if tag already exists
|
||||||
|
if git rev-parse "$TAG" >/dev/null 2>&1; then
|
||||||
|
echo "Tag $TAG already exists, deleting it first..."
|
||||||
|
git tag -d "$TAG"
|
||||||
|
git push origin --delete "$TAG" || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
git tag -a "$TAG" -m "Release $TAG"
|
||||||
|
if ! git push origin "$TAG"; then
|
||||||
|
echo "Failed to push tag $TAG to origin" >&2
|
||||||
|
# Try to delete local tag if push failed
|
||||||
|
git tag -d "$TAG"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Creating release $TAG on Gitea..."
|
echo "Creating release $TAG on Gitea..."
|
||||||
RELEASE_RESPONSE=$(curl -s -X POST "$API_URL/releases" \
|
RELEASE_RESPONSE=$(curl -s -X POST "$API_URL/releases" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
@ -125,7 +140,7 @@ for FILE in ${PROJECT}.${ARCH_ALIAS} ${PROJECT}.${ARCH} install.sh; do
|
|||||||
fi
|
fi
|
||||||
done
|
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."
|
||||||
|
|
||||||
|
|
||||||
#--------------------------------------------------------------------------------
|
#--------------------------------------------------------------------------------
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
#include "version.h"
|
#include "version.hpp"
|
||||||
#include "b64ed.hpp"
|
#include "b64ed.hpp"
|
||||||
|
|
||||||
// Recursively decode and print if nested bb64 command is found
|
// Recursively decode and print if nested bb64 command is found
|
||||||
|
@ -1 +0,0 @@
|
|||||||
static const char *VERSION = "39";
|
|
1
bb64/src/version.hpp.in
Normal file
1
bb64/src/version.hpp.in
Normal file
@ -0,0 +1 @@
|
|||||||
|
static const char *VERSION = "@PROJECT_VERSION@";
|
@ -17,12 +17,19 @@ Examples:
|
|||||||
dehydrate src/ output/ Creates _src.cpp and _src.hpp in output/
|
dehydrate src/ output/ Creates _src.cpp and _src.hpp in output/
|
||||||
dehydrate -u Updates dehydrate to the latest version
|
dehydrate -u Updates dehydrate to the latest version
|
||||||
dehydrate -v Shows version number
|
dehydrate -v Shows version number
|
||||||
|
dehydrate version Shows version number
|
||||||
)";
|
)";
|
||||||
|
|
||||||
Args parse_args(int argc, char* argv[]) {
|
Args parse_args(int argc, char* argv[]) {
|
||||||
Args args;
|
Args args;
|
||||||
int idx = 1;
|
int idx = 1;
|
||||||
|
|
||||||
|
// Check for "version" as first argument (no dash)
|
||||||
|
if (argc > 1 && std::string(argv[1]) == "version") {
|
||||||
|
args.version = true;
|
||||||
|
return args;
|
||||||
|
}
|
||||||
|
|
||||||
// Parse flags
|
// Parse flags
|
||||||
while (idx < argc && argv[idx][0] == '-') {
|
while (idx < argc && argv[idx][0] == '-') {
|
||||||
std::string flag = argv[idx];
|
std::string flag = argv[idx];
|
||||||
|
Reference in New Issue
Block a user