Archives/lnav
2
0
Fork 0
mirror of https://github.com/tstack/lnav synced 2024-11-17 15:29:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #201 from sureshsundriyal/wip

Browse Source 
[build] Add the git cln to the lnav version.
This commit is contained in:
Tim Stack 2015-04-06 22:30:57 -07:00
commit e065d2b34b
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -1,4 +1,3 @@
AC_INIT([lnav],[0.7.2],[lnav@googlegroups.com],[lnav],[http://lnav.org]) AC_INIT([lnav],[0.7.2],[lnav@googlegroups.com],[lnav],[http://lnav.org])
AC_CONFIG_SRCDIR([src/lnav.cc]) AC_CONFIG_SRCDIR([src/lnav.cc])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@ -218,6 +217,17 @@ AS_CASE(["$host_os"],
]dnl ]dnl
) )
saved_location=$(pwd)
cd $srcdir
version=$(expr $(git describe --abbrev=7 --dirty --always --tags 2>/dev/null) : 'v\([[0-9]]*\.[[0-9]]*\.[[0-9]]*.*\)' 2>/dev/null)
cd $saved_location
AS_IF([test $? -eq 0],
[version=$(echo $version | tr -d '\n')
version=${version:-${PACKAGE_VERSION}}
AC_DEFINE_UNQUOTED([VCS_PACKAGE_STRING], ["$PACKAGE_NAME $version"],
[VCS package string])],
AC_DEFINE_UNQUOTED([VCS_PACKAGE_STRING], ["$PACKAGE_STRING"], [VCS package string]))
AM_CONDITIONAL(USE_INCLUDED_YAJL, test $HAVE_LOCAL_YAJL -eq 0) AM_CONDITIONAL(USE_INCLUDED_YAJL, test $HAVE_LOCAL_YAJL -eq 0)
AC_CONFIG_HEADERS([src/config.h]) AC_CONFIG_HEADERS([src/config.h])

6
src/lnav.cc
View File

@ -3055,7 +3055,7 @@ static void usage(void)
" To watch the output of make with timestamps prepended:\n" " To watch the output of make with timestamps prepended:\n"
" $ make 2>&1 | lnav -t\n" " $ make 2>&1 | lnav -t\n"
"\n" "\n"
"Version: " PACKAGE_STRING "\n"; "Version: " VCS_PACKAGE_STRING "\n";
fprintf(stderr, usage_msg, lnav_data.ld_program_name); fprintf(stderr, usage_msg, lnav_data.ld_program_name);
} }
@ -4295,7 +4295,7 @@ int main(int argc, char *argv[])
break; break;
case 'V': case 'V':
printf("%s\n", PACKAGE_STRING); printf("%s\n", VCS_PACKAGE_STRING);
exit(0); exit(0);
break; break;
@ -4596,7 +4596,7 @@ int main(int argc, char *argv[])
try { try {
rescan_files(true); rescan_files(true);
log_info("startup: %s", PACKAGE_STRING); log_info("startup: %s", VCS_PACKAGE_STRING);
log_host_info(); log_host_info();
log_info("Libraries:"); log_info("Libraries:");
#ifdef HAVE_BZLIB_H #ifdef HAVE_BZLIB_H

2
src/lnav_log.cc
View File

@ -179,7 +179,7 @@ void log_host_info(void)
getcwd(cwd, sizeof(cwd)); getcwd(cwd, sizeof(cwd));
log_info(" cwd=%s", cwd); log_info(" cwd=%s", cwd);
log_info("Executable:"); log_info("Executable:");
log_info(" version=%s", PACKAGE_STRING); log_info(" version=%s", VCS_PACKAGE_STRING);
} }
void log_msg(lnav_log_level_t level, const char *src_file, int line_number, void log_msg(lnav_log_level_t level, const char *src_file, int line_number,