Skip to content
Snippets Groups Projects
Commit 811a45aa authored by chrfranke's avatar chrfranke
Browse files

configure.ac: Comment out release timestamp.

Set related environment vars only if timestamp is set.
utility.cpp: Add "pre-" or "pre-release" if release
timestamp is not set.  Don't print empty timestamp.

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk@5341 4ea69e1a-61f1-4043-bf83-b5c94c648137
parent d82222cd
Branches
No related tags found
No related merge requests found
$Id$ $Id$
2022-02-29 Christian Franke <franke@computer.org>
configure.ac: Comment out release timestamp.
Set related environment vars only if timestamp is set.
utility.cpp: Add "pre-" or "pre-release" if release
timestamp is not set. Don't print empty timestamp.
2022-02-28 Douglas Gilbert <dgilbert@interlog.com> 2022-02-28 Douglas Gilbert <dgilbert@interlog.com>
utility.cpp: the previous patch bumped the version number utility.cpp: the previous patch bumped the version number
......
...@@ -9,13 +9,17 @@ AM_INIT_AUTOMAKE([1.10 foreign]) ...@@ -9,13 +9,17 @@ AM_INIT_AUTOMAKE([1.10 foreign])
# Version of drive database branch # Version of drive database branch
smartmontools_drivedb_version=7.3 smartmontools_drivedb_version=7.3
smartmontools_cvs_tag=`echo '$Id$'` # Set by 'do_release' script, commented out when release number is bumped.
smartmontools_release_date=2022-02-28 smartmontools_release_date= # 2022-02-28
smartmontools_release_time="16:33:40 UTC" smartmontools_release_time= # "16:33:40 UTC"
AC_DEFINE_UNQUOTED(SMARTMONTOOLS_CONFIGURE_ARGS, "$ac_configure_args", [smartmontools Configure Arguments]) if test -n "$smartmontools_release_date"; then
AC_DEFINE_UNQUOTED(SMARTMONTOOLS_RELEASE_DATE, "$smartmontools_release_date", [smartmontools Release Date]) AC_DEFINE_UNQUOTED(SMARTMONTOOLS_RELEASE_DATE, "$smartmontools_release_date", [smartmontools Release Date])
AC_DEFINE_UNQUOTED(SMARTMONTOOLS_RELEASE_TIME, "$smartmontools_release_time", [smartmontools Release Time]) AC_DEFINE_UNQUOTED(SMARTMONTOOLS_RELEASE_TIME, "$smartmontools_release_time", [smartmontools Release Time])
fi
smartmontools_cvs_tag=`echo '$Id$'`
AC_DEFINE_UNQUOTED(SMARTMONTOOLS_CONFIGURE_ARGS, "$ac_configure_args", [smartmontools Configure Arguments])
AC_DEFINE_UNQUOTED(CONFIG_H_CVSID, "$smartmontools_cvs_tag", [smartmontools CVS Tag]) AC_DEFINE_UNQUOTED(CONFIG_H_CVSID, "$smartmontools_cvs_tag", [smartmontools CVS Tag])
AC_DEFINE_UNQUOTED(PACKAGE_HOMEPAGE, "https://www.smartmontools.org/", [smartmontools Home Page]) AC_DEFINE_UNQUOTED(PACKAGE_HOMEPAGE, "https://www.smartmontools.org/", [smartmontools Home Page])
......
...@@ -86,7 +86,11 @@ const char * packet_types[] = { ...@@ -86,7 +86,11 @@ const char * packet_types[] = {
std::string format_version_info(const char * prog_name, bool full /*= false*/) std::string format_version_info(const char * prog_name, bool full /*= false*/)
{ {
std::string info = strprintf( std::string info = strprintf(
"%s pre-release " PACKAGE_VERSION " " "%s "
#ifndef SMARTMONTOOLS_RELEASE_DATE
"pre-"
#endif
PACKAGE_VERSION " "
#ifdef SMARTMONTOOLS_SVN_REV #ifdef SMARTMONTOOLS_SVN_REV
SMARTMONTOOLS_SVN_DATE " r" SMARTMONTOOLS_SVN_REV SMARTMONTOOLS_SVN_DATE " r" SMARTMONTOOLS_SVN_REV
#else #else
...@@ -107,8 +111,12 @@ std::string format_version_info(const char * prog_name, bool full /*= false*/) ...@@ -107,8 +111,12 @@ std::string format_version_info(const char * prog_name, bool full /*= false*/)
"version 2, or (at your option) any later version.\n" "version 2, or (at your option) any later version.\n"
"See https://www.gnu.org for further details.\n" "See https://www.gnu.org for further details.\n"
"\n" "\n"
"smartmontools pre-release " PACKAGE_VERSION #ifndef SMARTMONTOOLS_RELEASE_DATE
"smartmontools pre-release " PACKAGE_VERSION "\n"
#else
"smartmontools release " PACKAGE_VERSION
" dated " SMARTMONTOOLS_RELEASE_DATE " at " SMARTMONTOOLS_RELEASE_TIME "\n" " dated " SMARTMONTOOLS_RELEASE_DATE " at " SMARTMONTOOLS_RELEASE_TIME "\n"
#endif
#ifdef SMARTMONTOOLS_SVN_REV #ifdef SMARTMONTOOLS_SVN_REV
"smartmontools SVN rev " SMARTMONTOOLS_SVN_REV "smartmontools SVN rev " SMARTMONTOOLS_SVN_REV
" dated " SMARTMONTOOLS_SVN_DATE " at " SMARTMONTOOLS_SVN_TIME "\n" " dated " SMARTMONTOOLS_SVN_DATE " at " SMARTMONTOOLS_SVN_TIME "\n"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment