7 changes: 2 additions & 5 deletions mythtv/programs/mythwelcome/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,10 @@ static void showUsage(const MythCommandLineParser &cmdlineparser)

QString binname = "mythwelcome";

extern const char *myth_source_version;
extern const char *myth_source_path;

VERBOSE(VB_IMPORTANT, QString("%1 version: %2 [%3] www.mythtv.org")
.arg(binname)
.arg(myth_source_path)
.arg(myth_source_version));
.arg(MYTH_SOURCE_PATH)
.arg(MYTH_SOURCE_VERSION));

cerr << "Valid options are: " << endl <<
"-v or --verbose debug-level Use '-v help' for level info" << endl <<
Expand Down
2 changes: 1 addition & 1 deletion mythtv/version.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
# "exported" is reported as the revision. #
############################################################

SOURCES += $$PWD/version.cpp
HEADERS += $$PWD/libs/libmythbase/version.h
DEPENDPATH += $$PWD/libs/libmythbase
13 changes: 6 additions & 7 deletions mythtv/version.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,14 @@ case "${SOURCE_VERSION}" in
esac

cat > .vers.new <<EOF
#include "mythversion.h"
const char *myth_source_version = "${SOURCE_VERSION}";
const char *myth_source_path = "${BRANCH}";
const char *myth_binary_version = MYTH_BINARY_VERSION;
#ifndef MYTH_SOURCE_VERSION
#define MYTH_SOURCE_VERSION "${SOURCE_VERSION}"
#define MYTH_SOURCE_PATH "${BRANCH}"
#endif
EOF

# check if the version strings are changed and update version.pro if necessary
if ! cmp -s .vers.new version.cpp; then
mv -f .vers.new version.cpp
if ! cmp -s .vers.new libs/libmythbase/version.h; then
mv -f .vers.new libs/libmythbase/version.h
fi
rm -f .vers.new