Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions share/genbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
9 changes: 0 additions & 9 deletions src/clientversion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
1 change: 0 additions & 1 deletion src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 0 additions & 2 deletions src/obj/.gitignore

This file was deleted.

5 changes: 0 additions & 5 deletions src/qt/clientmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/qt/clientmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
65 changes: 21 additions & 44 deletions src/qt/forms/rpcconsole.ui
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>4</number>
<number>0</number>
</property>
<widget class="QWidget" name="tab_info">
<attribute name="title">
Expand Down Expand Up @@ -113,36 +113,13 @@
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="buildDateLabel">
<property name="text">
<string>Build date</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="buildDate">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
<string>N/A</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="startupTimeLabel">
<property name="text">
<string>Startup time</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="4" column="1">
<widget class="QLabel" name="startupTime">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
Expand All @@ -158,21 +135,21 @@
</property>
</widget>
</item>
<item row="6" column="0">
<item row="5" column="0">
<widget class="QLabel" name="dataDirLabel">
<property name="text">
<string>Data Directory</string>
</property>
</widget>
</item>
<item row="6" column="1">
<item row="5" column="1">
<widget class="QLabel" name="dataDir">
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
<item row="7" column="0">
<item row="6" column="0">
<widget class="QLabel" name="networkHeader">
<property name="font">
<font>
Expand All @@ -185,14 +162,14 @@
</property>
</widget>
</item>
<item row="8" column="0">
<item row="7" column="0">
<widget class="QLabel" name="networkNameLabel">
<property name="text">
<string>Name</string>
</property>
</widget>
</item>
<item row="8" column="1">
<item row="7" column="1">
<widget class="QLabel" name="networkName">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
Expand All @@ -208,14 +185,14 @@
</property>
</widget>
</item>
<item row="9" column="0">
<item row="8" column="0">
<widget class="QLabel" name="numberOfConnectionsLabel">
<property name="text">
<string>Number of connections</string>
</property>
</widget>
</item>
<item row="9" column="1">
<item row="8" column="1">
<widget class="QLabel" name="numberOfConnections">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
Expand All @@ -231,14 +208,14 @@
</property>
</widget>
</item>
<item row="10" column="0">
<item row="9" column="0">
<widget class="QLabel" name="masternodeCountLabel">
<property name="text">
<string>Number of Masternodes</string>
</property>
</widget>
</item>
<item row="10" column="1">
<item row="9" column="1">
<widget class="QLabel" name="masternodeCount">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
Expand All @@ -254,7 +231,7 @@
</property>
</widget>
</item>
<item row="11" column="0">
<item row="10" column="0">
<widget class="QLabel" name="blockchainHeader">
<property name="font">
<font>
Expand All @@ -267,14 +244,14 @@
</property>
</widget>
</item>
<item row="12" column="0">
<item row="11" column="0">
<widget class="QLabel" name="numberOfBlocksLabel">
<property name="text">
<string>Current number of blocks</string>
</property>
</widget>
</item>
<item row="12" column="1">
<item row="11" column="1">
<widget class="QLabel" name="numberOfBlocks">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
Expand All @@ -290,14 +267,14 @@
</property>
</widget>
</item>
<item row="13" column="0">
<item row="12" column="0">
<widget class="QLabel" name="lastBlockTimeLabel">
<property name="text">
<string>Last block time</string>
</property>
</widget>
</item>
<item row="13" column="1">
<item row="12" column="1">
<widget class="QLabel" name="lastBlockTime">
<property name="cursor">
<cursorShape>IBeamCursor</cursorShape>
Expand All @@ -313,21 +290,21 @@
</property>
</widget>
</item>
<item row="14" column="0">
<item row="13" column="0">
<widget class="QLabel" name="lastBlockHashLabel">
<property name="text">
<string>Last block hash</string>
</property>
</widget>
</item>
<item row="14" column="1">
<item row="13" column="1">
<widget class="QLabel" name="lastBlockHash">
<property name="text">
<string>N/A</string>
</property>
</widget>
</item>
<item row="15" column="0">
<item row="14" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
Expand All @@ -340,7 +317,7 @@
</property>
</spacer>
</item>
<item row="16" column="0">
<item row="15" column="0">
<widget class="QLabel" name="debugLogFileHeader">
<property name="font">
<font>
Expand All @@ -353,7 +330,7 @@
</property>
</widget>
</item>
<item row="17" column="0">
<item row="16" column="0">
<widget class="QPushButton" name="openDebugLogfileButton">
<property name="toolTip">
<string>Open the PIVX debug log file from the current data directory. This can take a few seconds for large log files.</string>
Expand Down
1 change: 0 additions & 1 deletion src/qt/rpcconsole.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/rpcdump.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down