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

* 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

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 */

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 */

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;
}

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 */

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 */

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 */

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 */