summaryrefslogtreecommitdiff
path: root/AudioManagerDaemon
diff options
context:
space:
mode:
authorJens Lorenz <jlorenz@de.adit-jv.com>2018-02-12 17:45:56 +0100
committerJens Lorenz <jlorenz@de.adit-jv.com>2018-02-13 11:05:45 +0100
commit5b8411277e44e92eea3b8e9469af003415c02a6f (patch)
tree1ef22847112e596d79de199ce5de1c500c86f8cd /AudioManagerDaemon
parenta4e8cdcef0ebf57b23ea6676a54c39e256e906eb (diff)
downloadaudiomanager-5b8411277e44e92eea3b8e9469af003415c02a6f.tar.gz
CMake: Implement VCS agnostic versioning
Versioning should not strictly depend on Version Control System (e.g. git). Best approach is to have a dedicated VERSION file exposing with format <Major>.<Minor>.<Revision>. Target is that maintainer will manually release the version once patches/fixes are merged e.g. to a stabilization branch. In order to have an OEM specific meta information exposed with the version information EXTRAVERSIONINFO can be specified by CMAKE flag. Signed-off-by: Guerra Mattia <mguerra@de.adit-jv.com>
Diffstat (limited to 'AudioManagerDaemon')
-rwxr-xr-xAudioManagerDaemon/src/main.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp
index 8271db4..171d6ef 100755
--- a/AudioManagerDaemon/src/main.cpp
+++ b/AudioManagerDaemon/src/main.cpp
@@ -162,7 +162,7 @@ void daemonize()
void printCmdInformation()
{
printf("\n\n\nCurrent settings:\n\n");
- printf("\tAudioManagerDaemon Version:\t\t%s\n", DAEMONVERSION);
+ printf("\tAudioManagerDaemon Version:\t\t%s\n", DAEMONVERSION EXTRAVERSIONINFO);
printf("\tControllerPlugin: \t\t\t%s\n", controllerPlugin.getValue().c_str());
printf("\tDirectories of CommandPlugins: \t\t\n");
std::vector<std::string>::const_iterator dirIter = listCommandPluginDirs.begin();
@@ -219,19 +219,19 @@ void mainProgram(int argc, char *argv[])
//initialize the commandline parser, and add all neccessary commands
try
{
- TCLAP::CmdLine* cmd(CAmCommandLineSingleton::instanciateOnce("The team of the AudioManager wishes you a nice day!",' ',DAEMONVERSION,true));
- cmd->add(controllerPlugin);
- cmd->add(additionalCommandPluginDirs);
- cmd->add(commandPluginDir);
- cmd->add(additionalRoutingPluginDirs);
- cmd->add(routingPluginDir);
- cmd->add(currentSettings);
- cmd->add(daemonizeAM);
- cmd->add(dltEnable);
- cmd->add(dltLogFilename);
- cmd->add(dltOutput);
+ TCLAP::CmdLine* cmd(CAmCommandLineSingleton::instanciateOnce("The team of the AudioManager wishes you a nice day!",' ', DAEMONVERSION EXTRAVERSIONINFO,true));
+ cmd->add(controllerPlugin);
+ cmd->add(additionalCommandPluginDirs);
+ cmd->add(commandPluginDir);
+ cmd->add(additionalRoutingPluginDirs);
+ cmd->add(routingPluginDir);
+ cmd->add(currentSettings);
+ cmd->add(daemonizeAM);
+ cmd->add(dltEnable);
+ cmd->add(dltLogFilename);
+ cmd->add(dltOutput);
#ifdef WITH_DBUS_WRAPPER
- cmd->add(dbusWrapperTypeBool);
+ cmd->add(dbusWrapperTypeBool);
#endif
}
catch (TCLAP::ArgException &e) // catch any exceptions
@@ -330,7 +330,7 @@ void mainProgram(int argc, char *argv[])
{ std::cerr << "error: " << e.error() << " for arg " << e.argId() << std::endl; }
logInfo("The Audiomanager is started");
- logInfo("The version of the Audiomanager", DAEMONVERSION);
+ logInfo("The version of the Audiomanager", DAEMONVERSION EXTRAVERSIONINFO);
#ifdef WITH_CAPI_WRAPPER
//We instantiate a singleton with the current socket handler, which loads the common-api runtime.