Use the package version as the version number compiled into the binary.

This commit is contained in:
Oliver Jowett 2014-12-10 12:25:43 +00:00
parent 890d1afbf1
commit c6077b1e6c
4 changed files with 10 additions and 4 deletions

1
debian/changelog vendored
View file

@ -4,6 +4,7 @@ dump1090-mutability (1.08.2302.14+1mu-3) UNRELEASED; urgency=medium
the interval is disabled, it makes more sense that way. the interval is disabled, it makes more sense that way.
* Be much more cautious about missing config settings so we don't explode * Be much more cautious about missing config settings so we don't explode
so badly if something is omitted. so badly if something is omitted.
* Use the package version as the version number compiled into the binary.
-- Oliver Jowett <oliver@mutability.co.uk> Wed, 10 Dec 2014 02:01:27 +0000 -- Oliver Jowett <oliver@mutability.co.uk> Wed, 10 Dec 2014 02:01:27 +0000

4
debian/rules vendored
View file

@ -14,8 +14,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1 DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk include /usr/share/dpkg/buildflags.mk
VER=$(shell dpkg-parsechangelog -SVersion)
override_dh_auto_build: override_dh_auto_build:
dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mutability/html\"' dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mutability/html\" -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 Ver : " MODES_DUMP1090_VERSION " |\n" "| dump1090 ModeS Receiver %30s |\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"
@ -457,7 +457,8 @@ void showHelp(void) {
" C = Log frames with good CRC\n" " C = Log frames with good CRC\n"
" 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
); );
} }

View file

@ -37,7 +37,9 @@
// MinorVer changes when additional features are added, but not for bug fixes (range 00-99) // MinorVer changes when additional features are added, but not for bug fixes (range 00-99)
// 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
# define MODES_DUMP1090_VERSION "1.10.3010.14" # define MODES_DUMP1090_VERSION "1.10.3010.14"
#endif
// ============================= Include files ========================== // ============================= Include files ==========================