experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New version string on the form: 7.1.0-1+11+g2b25294

Browse source
This commit is contained in:
Olof hagsand 2024-10-18 17:25:47 +02:00
parent 3cad374f33
commit 0a37cf31ab
15 changed files with 66 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/clixon/clixon.h.in
View file

@ -60,7 +60,6 @@ extern "C" {
/*
* CLIXON version macros, set in configure and resolved when expanding to
* clixon.h
* XXX: use github versioning: CLIXON_GITHASH[] instead
*/
#undef CLIXON_VERSION_MAJOR
#undef CLIXON_VERSION_MINOR
@ -123,7 +122,6 @@ extern "C" {
* Global variables generated by Makefile
*/
extern const char CLIXON_BUILDSTR[];
extern const char CLIXON_GITHASH[];
extern const char CLIXON_VERSION[];
#ifdef __cplusplus

2
lib/clixon/clixon_plugin.h
View file

@ -340,7 +340,7 @@ typedef int (errmsg_t)(clixon_handle h, const char *fn, const int line,
*
* A plugin can customize a version (or banner) output on stdout.
* Several version strings can be printed if there are multiple callbacks.
* If no registered plugins exist, clixon prints CLIXON_GITHASH
* If no registered plugins exist, clixon prints CLIXON_VERSION
* Typically invoked by command-line option -V
* @param[in] h Clixon handle
* @param[in] f Output file

1
lib/src/Makefile.in
View file

@ -299,7 +299,6 @@ DATELEN = $(shell date +"%Y.%m.%d %H:%M by `whoami` on `hostname`XXXX"|wc -c)
build.c:
echo "/* This file is generated from the Clixon Makefile */" > $@;
date +"const char CLIXON_BUILDSTR[$(DATELEN)]=\"%Y.%m.%d %H:%M by `whoami` on `hostname`"\"\; >> $@;
echo "const char CLIXON_GITHASH[64]=\"$(shell git log --pretty="format:%(describe) %ci" -n1)\""\; >> $@;
echo "const char CLIXON_VERSION[64]=\"$(CLIXON_VERSION)\""\; >> $@;
# Note: will always be remade since GENOBS is date dependent