From ed8e3743d5a58d85babd4b73ed1f09c0e129444d Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 31 Dec 2018 11:17:26 +0100 Subject: [PATCH] version_hal.cpp/h: add methodes to get package data --- Makefile.am | 4 +-- common/Makefile.am | 3 ++- common/version_hal.cpp | 55 ++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 +- include/version_hal.h | 16 ++++++++++++ 5 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 common/version_hal.cpp create mode 100644 include/version_hal.h diff --git a/Makefile.am b/Makefile.am index 7798a2c..9c1bf3b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,5 +59,5 @@ pkginclude_HEADERS = \ include/playback_hal.h \ include/pwrmngr.h \ include/record_hal.h \ - include/video_cs.h \ - include/video_hal.h + include/version_hal.h \ + include/video_cs.h diff --git a/common/Makefile.am b/common/Makefile.am index 5001eff..9fad911 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -9,4 +9,5 @@ libcommon_la_SOURCES = \ ca.cpp \ lt_debug.c \ proc_tools.c \ - pwrmngr.cpp + pwrmngr.cpp \ + version_hal.cpp diff --git a/common/version_hal.cpp b/common/version_hal.cpp new file mode 100644 index 0000000..a1542d3 --- /dev/null +++ b/common/version_hal.cpp @@ -0,0 +1,55 @@ +/* + * (C) 2018 Thilo Graf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include + +#include + + +std::string getPackageVersion() +{ + return PACKAGE_VERSION; +} + +int getPackageVersionMajor() +{ + return PACKAGE_VERSION_MAJOR; +} + +int getPackageVersionMinor() +{ + return PACKAGE_VERSION_MINOR; +} + +int getPackageVersionMicro() +{ + return PACKAGE_VERSION_MICRO; +} + +std::string getPackagenName() +{ + return PACKAGE_NAME; +} + +std::string getPackageString() +{ + return PACKAGE_STRING; +} + +std::string getPackageVersionGit() +{ + return PACKAGE_VERSION_GIT; +} diff --git a/configure.ac b/configure.ac index 39f117b..0c38332 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # explicit defines for separate revision handling define(ver_major, 0) define(ver_minor, 2) -define(ver_micro, 0) +define(ver_micro, 1) # sync with current git define(ver_git, m4_esyscmd([ diff --git a/include/version_hal.h b/include/version_hal.h new file mode 100644 index 0000000..d0eda52 --- /dev/null +++ b/include/version_hal.h @@ -0,0 +1,16 @@ +#ifndef __VERSION_HAL_H__ +#define __VERSION_HAL_H__ + +#include + +std::string getPackageVersion(); +int getPackageVersionMajor(); +int getPackageVersionMinor(); +int getPackageVersionMicro(); +std::string getPackagenName(); +std::string getPackageString(); +std::string getPackageVersionGit(); + + +#endif //__VERSION_HAL_H__ +