diff --git a/.gitignore b/.gitignore index 2e216c844a65..693e30eaba66 100644 --- a/.gitignore +++ b/.gitignore @@ -64,6 +64,7 @@ libtool src/config/pivx-config.h src/config/pivx-config.h.in src/config/stamp-h1 +src/obj share/setup.nsi share/qt/Info.plist contrib/devtools/split-debug.sh diff --git a/share/genbuild.sh b/share/genbuild.sh index 519cc6e8f13f..38c9ba176cf8 100755 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -24,7 +24,6 @@ git_check_in_repo() { DESC="" SUFFIX="" -LAST_COMMIT_DATE="" if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo share/genbuild.sh; then # clean 'dirty' status of touched files that haven't been modified git diff >/dev/null 2>/dev/null @@ -38,9 +37,6 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$( # otherwise generate suffix from git, i.e. string like "59887e8-dirty" SUFFIX=$(git rev-parse --short HEAD) git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty" - - # get a string like "2012-04-10 16:27:19 +0200" - LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")" fi if [ -n "$DESC" ]; then @@ -54,7 +50,4 @@ fi # only update build.h if necessary if [ "$INFO" != "$NEWINFO" ]; then echo "$NEWINFO" >"$FILE" - if [ -n "$LAST_COMMIT_DATE" ]; then - echo "#define BUILD_DATE \"$LAST_COMMIT_DATE\"" >> "$FILE" - fi fi diff --git a/src/clientversion.cpp b/src/clientversion.cpp index 1ae69828d06a..ee9b35272d57 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -67,16 +67,7 @@ const std::string CLIENT_NAME("PIVX Core"); #endif #endif -#ifndef BUILD_DATE -#ifdef GIT_COMMIT_DATE -#define BUILD_DATE GIT_COMMIT_DATE -#else -#define BUILD_DATE __DATE__ ", " __TIME__ -#endif -#endif - const std::string CLIENT_BUILD(BUILD_DESC CLIENT_VERSION_SUFFIX); -const std::string CLIENT_DATE(BUILD_DATE); static std::string FormatVersion(int nVersion) { diff --git a/src/clientversion.h b/src/clientversion.h index d797f844e025..105c7b343dbb 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -44,7 +44,6 @@ static const int CLIENT_VERSION = extern const std::string CLIENT_NAME; extern const std::string CLIENT_BUILD; -extern const std::string CLIENT_DATE; std::string FormatFullVersion(); diff --git a/src/init.cpp b/src/init.cpp index 67daf9dc7b3e..b9670dbcd5ac 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1026,7 +1026,7 @@ void InitLogging() #else version_string += " (release build)"; #endif - LogPrintf("PIVX version %s (%s)\n", version_string, CLIENT_DATE); + LogPrintf("PIVX version %s\n", version_string); } bool AppInitParameterInteraction() diff --git a/src/obj/.gitignore b/src/obj/.gitignore deleted file mode 100644 index d6b7ef32c847..000000000000 --- a/src/obj/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 785983ffaa5b..89c4bf2b63e7 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -253,11 +253,6 @@ QString ClientModel::formatFullVersion() const return QString::fromStdString(FormatFullVersion()); } -QString ClientModel::formatBuildDate() const -{ - return QString::fromStdString(CLIENT_DATE); -} - bool ClientModel::isReleaseVersion() const { return CLIENT_VERSION_IS_RELEASE; diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index d5237c1e5ccc..0cf9f5ad5d61 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -82,7 +82,6 @@ class ClientModel : public QObject QString getStatusBarWarnings() const; QString formatFullVersion() const; - QString formatBuildDate() const; bool isReleaseVersion() const; QString clientName() const; QString formatClientStartupTime() const; diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui index 6ea75dba4d39..e08f85068330 100644 --- a/src/qt/forms/rpcconsole.ui +++ b/src/qt/forms/rpcconsole.ui @@ -17,7 +17,7 @@ - 4 + 0 @@ -113,36 +113,13 @@ - - - Build date - - - - - - - IBeamCursor - - - N/A - - - Qt::PlainText - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - Startup time - + IBeamCursor @@ -158,21 +135,21 @@ - + Data Directory - + N/A - + @@ -185,14 +162,14 @@ - + Name - + IBeamCursor @@ -208,14 +185,14 @@ - + Number of connections - + IBeamCursor @@ -231,14 +208,14 @@ - + Number of Masternodes - + IBeamCursor @@ -254,7 +231,7 @@ - + @@ -267,14 +244,14 @@ - + Current number of blocks - + IBeamCursor @@ -290,14 +267,14 @@ - + Last block time - + IBeamCursor @@ -313,21 +290,21 @@ - + Last block hash - + N/A - + Qt::Vertical @@ -340,7 +317,7 @@ - + @@ -353,7 +330,7 @@ - + Open the PIVX debug log file from the current data directory. This can take a few seconds for large log files. diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 2c4e5e2af741..267649912f65 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -259,7 +259,6 @@ void RPCConsole::setClientModel(ClientModel* model) // Provide initial values ui->clientVersion->setText(model->formatFullVersion()); ui->clientName->setText(model->clientName()); - ui->buildDate->setText(model->formatBuildDate()); ui->dataDir->setText(model->dataDir()); ui->startupTime->setText(model->formatClientStartupTime()); ui->networkName->setText(QString::fromStdString(Params().NetworkIDString())); diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index ed2d05219bb1..4e8e55d54207 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -567,7 +567,7 @@ UniValue dumpwallet(const JSONRPCRequest& request) CBlockIndex* tip = chainActive.Tip(); // produce output - file << strprintf("# Wallet dump created by PIVX %s (%s)\n", CLIENT_BUILD, CLIENT_DATE); + file << strprintf("# Wallet dump created by PIVX %s\n", CLIENT_BUILD); file << strprintf("# * Created on %s\n", FormatISO8601DateTime(GetTime())); if (tip) { file << strprintf("# * Best block at time of backup was %i (%s),\n", tip->nHeight,