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

Changed intermediate version numbers to be git-style, eg 7.0.0-39 instead of 7.1.0-PRE

Browse source 
* Changed datastore modstate to be last in file, as prior to 7.0
This commit is contained in:
Olof hagsand 2024-05-08 16:51:12 +02:00
parent 8ebfdb8168
commit ca701b0c1a
17 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -36,6 +36,7 @@ Expected: June 2024
### API changes on existing protocol/config features
Users may have to change how they access the system
* Changed intermediate version numbers to be git-style, eg `7.0.0-39` instead of `7.1.0-PRE`
* If `CLICON_XMLDB_MULTI` is set, datastores are stored in a new directory
* Previously: `CLICON_XMLDB_DIR/<db>_db`
* New: `CLICON_XMLDB_DIR/<db>d/`

2
apps/backend/backend_main.c
View file

@ -569,7 +569,7 @@ main(int argc,
help = 1;
break;
case 'V':
cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
cligen_output(stdout, "Clixon version: %s\n", CLIXON_GITHASH);
print_version++; /* plugins may also print versions w ca-version callback */
break;
case 'D' : { /* debug */

2
apps/cli/cli_main.c
View file

@ -618,7 +618,7 @@ main(int argc,
help = 1;
break;
case 'V': /* version */
cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
cligen_output(stdout, "Clixon version: %s\n", CLIXON_GITHASH);
print_version++; /* plugins may also print versions w ca-version callback */
break;
case 'D' : { /* debug */

2
apps/cli/cli_show.c
View file

@ -992,7 +992,7 @@ cli_show_version(clixon_handle h,
cvec *cvv,
cvec *argv)
{
cligen_output(stdout, "Clixon: %s\n", CLIXON_VERSION_STRING);
cligen_output(stdout, "Clixon: %s\n", CLIXON_GITHASH);
cligen_output(stdout, "CLIgen: %s\n", CLIGEN_VERSION);
return 0;
}

2
apps/netconf/netconf_main.c
View file

@ -709,7 +709,7 @@ main(int argc,
usage(h, argv[0]);
break;
case 'V': /* version */
cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
cligen_output(stdout, "Clixon version: %s\n", CLIXON_GITHASH);
print_version++; /* plugins may also print versions w ca-version callback */
break;
case 'D' : { /* debug */

2
apps/restconf/restconf_main_fcgi.c
View file

@ -345,7 +345,7 @@ main(int argc,
usage(h, argv[0]);
break;
case 'V':
cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
cligen_output(stdout, "Clixon version: %s\n", CLIXON_GITHASH);
print_version++; /* plugins may also print versions w ca-version callback */
break;
case 'D' : { /* debug */

2
apps/restconf/restconf_main_native.c
View file

@ -1176,7 +1176,7 @@ main(int argc,
usage(h, argv0);
break;
case 'V': /* version */
cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
cligen_output(stdout, "Clixon version: %s\n", CLIXON_GITHASH);
print_version++; /* plugins may also print versions w ca-version callback */
break;
case 'D' : { /* debug. Note this overrides any setting in the config */

2
apps/snmp/snmp_main.c
View file

@ -382,7 +382,7 @@ main(int argc,
usage(h, argv[0]);
break;
case 'V': /* version */
cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
cligen_output(stdout, "Clixon version: %s\n", CLIXON_GITHASH);
print_version++; /* plugins may also print versions w ca-version callback */
break;
case 'D' : { /* debug */

7
configure vendored
View file

@ -696,7 +696,6 @@ INSTALL_PROGRAM
INCLUDES
CLIXON_VERSION_MINOR
CLIXON_VERSION_MAJOR
CLIXON_VERSION_STRING
CLIXON_VERSION
target_os
target_vendor
@ -2846,9 +2845,6 @@ ac_config_headers="$ac_config_headers include/clixon_config.h lib/clixon/clixon.
printf "%s\n" "#define CLIXON_VERSION_STRING $CLIXON_VERSION" >>confdefs.h
printf "%s\n" "#define CLIXON_VERSION_MAJOR $CLIXON_VERSION_MAJOR" >>confdefs.h
@ -4014,8 +4010,7 @@ test -n "$target_alias" &&
program_prefix=${target_alias}-
# AC_SUBST(var) makes @var@ appear in makefiles.
# clixon versions spread to Makefile's (.so files) and variable in build.c
# Clixon versions is used in Makefile's (.so files) and variable in build.c

4
configure.ac
View file

@ -73,7 +73,6 @@ fi
AC_CONFIG_HEADERS([include/clixon_config.h lib/clixon/clixon.h])
AC_DEFINE_UNQUOTED(CLIXON_VERSION_STRING, $CLIXON_VERSION, [Clixon version string])
AC_DEFINE_UNQUOTED(CLIXON_VERSION_MAJOR, $CLIXON_VERSION_MAJOR, [Clixon major release])
AC_DEFINE_UNQUOTED(CLIXON_VERSION_MINOR, $CLIXON_VERSION_MINOR, [Clixon minor release])
AC_DEFINE_UNQUOTED(CLIXON_VERSION_PATCH, $CLIXON_VERSION_PATCH, [Clixon path version])
@ -84,9 +83,8 @@ AC_CHECK_LIB(m, main)
AC_CANONICAL_TARGET
# AC_SUBST(var) makes @var@ appear in makefiles.
# clixon versions spread to Makefile's (.so files) and variable in build.c
# Clixon versions is used in Makefile's (.so files) and variable in build.c
AC_SUBST(CLIXON_VERSION)
AC_SUBST(CLIXON_VERSION_STRING)
AC_SUBST(CLIXON_VERSION_MAJOR)
AC_SUBST(CLIXON_VERSION_MINOR)

2
example/main/example_cli.c
View file

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

3
include/clixon_config.h.in
View file

@ -30,9 +30,6 @@
/* Clixon path version */
#undef CLIXON_VERSION_PATCH
/* Clixon version string */
#undef CLIXON_VERSION_STRING
/* Enable YANG patch, RFC 8072 */
#undef CLIXON_YANG_PATCH

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

@ -60,8 +60,8 @@ 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_STRING
#undef CLIXON_VERSION_MAJOR
#undef CLIXON_VERSION_MINOR
#undef CLIXON_VERSION_PATCH
@ -122,6 +122,7 @@ 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 not registered plugins exist, clixon prints CLIXON_VERSION_STRING
* If no registered plugins exist, clixon prints CLIXON_GITHASH
* 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,6 +299,7 @@ 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

3
test/config.sh.in
View file

@ -64,9 +64,6 @@ CC=@CC@
# Top src dir
TOP_SRCDIR=@top_srcdir@
# Clixon version
CLIXON_VERSION=@CLIXON_VERSION@
CLICON_USER=@CLICON_USER@
CLICON_GROUP=@CLICON_GROUP@

3
test/lib.sh
View file

@ -41,6 +41,9 @@ if [ -f ./config.sh ]; then
fi
fi
# Note that this relies on git being present in shell
CLIXON_VERSION="$(git log --pretty="format:%(describe) %ci" -n1)"
# Test number from start
: ${testnr:=0}