From a5b87ab7c4a6834acc7587ffc4a769854b9d48b4 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 30 Mar 2018 14:19:35 -0700 Subject: mpm: cmake: Add git hash and version info to Python module Reviewed-by: Brent Stapleton --- mpm/python/usrp_hwd.py | 4 ++++ mpm/python/usrp_mpm/__init__.py | 3 +++ mpm/python/usrp_mpm/periph_manager/__init__.py.in | 3 +++ 3 files changed, 10 insertions(+) (limited to 'mpm/python') diff --git a/mpm/python/usrp_hwd.py b/mpm/python/usrp_hwd.py index 0b2cd1ecb..d04d04927 100755 --- a/mpm/python/usrp_hwd.py +++ b/mpm/python/usrp_hwd.py @@ -170,6 +170,10 @@ def main(): log = mpm.get_main_logger( log_default_delta=args.verbose-args.quiet ).getChild('main') + version_string = mpm.__version__ + if len(mpm.__githash__): + version_string += "-g" + mpm.__githash__ + log.info("Launching USRP/MPM, version: %s", version_string) if args.override_db_pids is not None: log.warning('Overriding daughterboard PIDs!') args.default_args['override_db_pids'] = args.override_db_pids diff --git a/mpm/python/usrp_mpm/__init__.py b/mpm/python/usrp_mpm/__init__.py index 00cbcc987..6b6b86d08 100644 --- a/mpm/python/usrp_mpm/__init__.py +++ b/mpm/python/usrp_mpm/__init__.py @@ -18,3 +18,6 @@ from . import cores from . import chips from . import gpsd_iface from .mpmlog import get_main_logger + +__version__ = periph_manager.__version__ +__githash__ = periph_manager.__githash__ diff --git a/mpm/python/usrp_mpm/periph_manager/__init__.py.in b/mpm/python/usrp_mpm/periph_manager/__init__.py.in index f507a6808..1a84ca3a4 100644 --- a/mpm/python/usrp_mpm/periph_manager/__init__.py.in +++ b/mpm/python/usrp_mpm/periph_manager/__init__.py.in @@ -7,6 +7,9 @@ periph_manager __init__.py """ +__version__ = "${MPM_VERSION_MAJOR}.${MPM_VERSION_API}.${MPM_VERSION_ABI}.${MPM_VERSION_PATCH}" +__githash__ = "${MPM_GIT_HASH_RAW}" + from .base import PeriphManagerBase # This is where the import magic happens -- cgit v1.2.3