More version reporting tweaks.

This commit is contained in:
Oliver Jowett 2014-12-10 12:44:00 +00:00
parent c6077b1e6c
commit f707f2cdce
4 changed files with 12 additions and 6 deletions

3
debian/rules vendored
View file

@ -15,9 +15,10 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk include /usr/share/dpkg/buildflags.mk
VER=$(shell dpkg-parsechangelog -SVersion) VER=$(shell dpkg-parsechangelog -SVersion)
SRCNAME=$(shell dpkg-parsechangelog -SSource)
override_dh_auto_build: override_dh_auto_build:
dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mutability/html\" -DMODES_DUMP1090_VERSION=\"$(VER)\"' dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mutability/html\" -DMODES_DUMP1090_VARIANT=\"$(SRCNAME)\" -DMODES_DUMP1090_VERSION=\"$(VER)\"'
override_dh_install: override_dh_install:
dh_install dh_install

View file

@ -403,7 +403,7 @@ void snipMode(int level) {
void showHelp(void) { void showHelp(void) {
printf( printf(
"-----------------------------------------------------------------------------\n" "-----------------------------------------------------------------------------\n"
"| dump1090 ModeS Receiver %30s |\n" "| dump1090 ModeS Receiver %45s |\n"
"-----------------------------------------------------------------------------\n" "-----------------------------------------------------------------------------\n"
"--device-index <index> Select RTL device (default: 0)\n" "--device-index <index> Select RTL device (default: 0)\n"
"--gain <db> Set gain (default: max gain. Use -10 for auto-gain)\n" "--gain <db> Set gain (default: max gain. Use -10 for auto-gain)\n"
@ -458,7 +458,7 @@ void showHelp(void) {
" p = Log frames with bad preamble\n" " p = Log frames with bad preamble\n"
" n = Log network debugging info\n" " n = Log network debugging info\n"
" j = Log frames to frames.js, loadable by debug.html\n", " j = Log frames to frames.js, loadable by debug.html\n",
"version " MODES_DUMP1090_VERSION MODES_DUMP1090_VARIANT " " MODES_DUMP1090_VERSION
); );
} }

View file

@ -38,7 +38,11 @@
// DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update // DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update
// //
#ifndef MODES_DUMP1090_VERSION #ifndef MODES_DUMP1090_VERSION
# define MODES_DUMP1090_VERSION "1.10.3010.14" # define MODES_DUMP1090_VERSION "1.10.3010.14+mu"
#endif
#ifndef MODES_DUMP1090_VARIANT
# define MODES_DUMP1090_VARIANT "dump1090-mutability"
#endif #endif
// ============================= Include files ========================== // ============================= Include files ==========================

View file

@ -164,7 +164,7 @@ int setupConnection(struct client *c) {
void showHelp(void) { void showHelp(void) {
printf( printf(
"-----------------------------------------------------------------------------\n" "-----------------------------------------------------------------------------\n"
"| view1090 dump1090 Viewer Ver : "MODES_DUMP1090_VERSION " |\n" "| view1090 ModeS Viewer %45s |\n"
"-----------------------------------------------------------------------------\n" "-----------------------------------------------------------------------------\n"
"--interactive Interactive mode refreshing data on screen\n" "--interactive Interactive mode refreshing data on screen\n"
"--interactive-rows <num> Max number of rows in interactive mode (default: 15)\n" "--interactive-rows <num> Max number of rows in interactive mode (default: 15)\n"
@ -180,7 +180,8 @@ void showHelp(void) {
"--fix Enable single-bits error correction using CRC\n" "--fix Enable single-bits error correction using CRC\n"
"--aggressive More CPU for more messages (two bits fixes, ...)\n" "--aggressive More CPU for more messages (two bits fixes, ...)\n"
"--metric Use metric units (meters, km/h, ...)\n" "--metric Use metric units (meters, km/h, ...)\n"
"--help Show this help\n" "--help Show this help\n",
MODES_DUMP1090_VARIANT " " MODES_DUMP1090_VERSION
); );
} }