Improve rig_get_version and hamlib_version2 information to include commit information

https://github.com/Hamlib/Hamlib/issues/617
pull/649/head
Michael Black W9MDB 2021-03-19 22:56:18 -05:00
rodzic dee6bd6524
commit 6eee309b56
13 zmienionych plików z 19 dodań i 22 usunięć

Wyświetl plik

@ -72,6 +72,7 @@
#include "gpio.h"
#include "misc.h"
#include "sprintflst.h"
#include "../tests/hamlibdatetime.h"
/**
* \brief Hamlib release number
@ -86,7 +87,7 @@
const char *hamlib_license = "LGPL";
//! @cond Doxygen_Suppress
const char hamlib_version[21] = "Hamlib " PACKAGE_VERSION;
const char *hamlib_version2 = "Hamlib " PACKAGE_VERSION;
const char *hamlib_version2 = "Hamlib " PACKAGE_VERSION " " HAMLIBDATETIME;
//! @endcond
struct rig_caps caps_test;

Wyświetl plik

@ -278,8 +278,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "ampctl %s\nLast commit was %s\n", hamlib_version,
HAMLIBDATETIME);
rig_debug(RIG_DEBUG_VERBOSE, "ampctl %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");

Wyświetl plik

@ -1436,7 +1436,7 @@ int ampctl_parse(AMP *my_amp, FILE *fin, FILE *fout, char *argv[], int argc)
void version()
{
printf("ampctl(d), %s\n\n", hamlib_version);
printf("ampctl(d), %s\n\n", hamlib_version2);
printf("%s\n", hamlib_copyright);
}

Wyświetl plik

@ -309,7 +309,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "ampctld, %s\n", hamlib_version);
rig_debug(RIG_DEBUG_VERBOSE, "ampctld, %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");

Wyświetl plik

@ -177,7 +177,7 @@ int main(int argc, char *argv[])
exit(0);
case 'V':
printf("rigctl %s\nLast commit was %s\n", hamlib_version, HAMLIBDATETIME);
printf("rigctl %s\n", hamlib_version2);
exit(0);
case 'm':
@ -433,8 +433,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "rigctl %s\nLast commit was %s\n", hamlib_version,
HAMLIBDATETIME);
rig_debug(RIG_DEBUG_VERBOSE, "rigctl %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");

Wyświetl plik

@ -1732,7 +1732,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
void version()
{
printf("rigctl(d), %s\n\n", hamlib_version);
printf("rigctl(d), %s\n\n", hamlib_version2);
printf("%s\n", hamlib_copyright);
}

Wyświetl plik

@ -286,7 +286,7 @@ int main(int argc, char *argv[])
exit(0);
case 'V':
printf("rigctl %s\nLast commit was %s\n", hamlib_version, HAMLIBDATETIME);
printf("rigctl %s\n", hamlib_version2);
exit(0);
case 'm':
@ -556,8 +556,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "rigctld %s\nLast commit was %s\n", hamlib_version,
HAMLIBDATETIME);
rig_debug(RIG_DEBUG_VERBOSE, "rigctld %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");

Wyświetl plik

@ -233,7 +233,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose < 2 ? RIG_DEBUG_WARN : verbose);
rig_debug(RIG_DEBUG_VERBOSE, "rigmem, %s\n", hamlib_version);
rig_debug(RIG_DEBUG_VERBOSE, "rigmem, %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to "
"<hamlib-developer@lists.sourceforge.net>\n\n");
@ -406,7 +406,7 @@ int main(int argc, char *argv[])
void version()
{
printf("rigmem, %s\n\n", hamlib_version);
printf("rigmem, %s\n\n", hamlib_version2);
printf("%s\n", hamlib_copyright);
}

Wyświetl plik

@ -242,7 +242,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose < 2 ? RIG_DEBUG_WARN : verbose);
rig_debug(RIG_DEBUG_VERBOSE, "rigsmtr, %s\n", hamlib_version);
rig_debug(RIG_DEBUG_VERBOSE, "rigsmtr, %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
@ -409,7 +409,7 @@ int main(int argc, char *argv[])
void version()
{
printf("rigsmtr, %s\n\n", hamlib_version);
printf("rigsmtr, %s\n\n", hamlib_version2);
printf("%s\n", hamlib_copyright);
}

Wyświetl plik

@ -231,7 +231,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose < 2 ? RIG_DEBUG_WARN : verbose);
rig_debug(RIG_DEBUG_VERBOSE, "rigswr, %s\n", hamlib_version);
rig_debug(RIG_DEBUG_VERBOSE, "rigswr, %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
@ -351,7 +351,7 @@ int main(int argc, char *argv[])
void version()
{
printf("rigswr, %s\n\n", hamlib_version);
printf("rigswr, %s\n\n", hamlib_version2);
printf("%s\n", hamlib_copyright);
}

Wyświetl plik

@ -305,8 +305,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "rotctl %s\nLast commit was %s\n", hamlib_version,
HAMLIBDATETIME);
rig_debug(RIG_DEBUG_VERBOSE, "rotctl %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");

Wyświetl plik

@ -1507,7 +1507,7 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc,
void version()
{
printf("rotctl(d), %s\n\n", hamlib_version);
printf("rotctl(d), %s\n\n", hamlib_version2);
printf("%s\n", hamlib_copyright);
}

Wyświetl plik

@ -322,7 +322,7 @@ int main(int argc, char *argv[])
rig_set_debug(verbose);
rig_debug(RIG_DEBUG_VERBOSE, "rotctld, %s\n", hamlib_version);
rig_debug(RIG_DEBUG_VERBOSE, "rotctld, %s\n", hamlib_version2);
rig_debug(RIG_DEBUG_VERBOSE, "%s",
"Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");