From 10113a35177b039828c0d13d7d787245f1e056ba Mon Sep 17 00:00:00 2001 From: Cedric Roux Date: Mon, 10 Apr 2017 10:29:09 +0200 Subject: [PATCH] integration fix: change the way to print the version Using "system" to call "git log" is too error-prone. In the test setup, lte-softmodem was blocked because "git log" uses a pager ("less") and the pager was waiting for the user to press enter. We could pass "--no-pager" to "git log" but then what if someone runs the softmodem out of the source tree? cmake defines PACKAGE_VERSION, we can use that instead, as is done in openair-cn. --- targets/RT/USER/lte-softmodem.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c index e09c32cde4..68fcbc49d5 100644 --- a/targets/RT/USER/lte-softmodem.c +++ b/targets/RT/USER/lte-softmodem.c @@ -1388,11 +1388,6 @@ int main( int argc, char **argv ) { memset(tx_max_power,0,sizeof(int)*MAX_NUM_CCs); - char command_line[500]; - sprintf(command_line,"git log -1"); - if (background_system(command_line) != 0) - printf("ERROR failed command '%s'", command_line); - set_latency_target(); // set default parameters @@ -1524,6 +1519,12 @@ int main( int argc, char **argv ) { check_clock(); +#ifndef PACKAGE_VERSION +# define PACKAGE_VERSION "UNKNOWN-EXPERIMENTAL" +#endif + + LOG_I(HW, "Version: %s\n", PACKAGE_VERSION); + // init the parameters for (CC_id=0; CC_id